wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15623 commits 157 branches 562 tags 714 MiB
Commit graph

15623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
4d65a80892 Remove the static dependency on OC_Util from Memcache 2014-01-06 13:11:38 +01:00
Robin Appelman
cd147bb37a Use APCIterator for Memcache\APC::clear() 2014-01-06 12:58:43 +01:00
Robin Appelman
1df1b55b66 expose memory cache in public api 2014-01-06 12:55:56 +01:00
Jenkins for ownCloud
0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Morris Jobke
ce3df44699 Merge pull request #6031 from s0taka/master 
No decimal points for Kilobyte and Byte #5371.
 2014-01-05 11:52:10 -08:00
Thomas Müller
e2d739fa21 Merge pull request #6580 from monreal/master 
Silence output of 'which' command used in smbclient detection
 2014-01-05 04:32:30 -08:00
Jenkins for ownCloud
e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
icewind1991
f016a3ead3 Merge pull request #6610 from owncloud/apcu-clear 
Fix APCIterator syntax in \OC\Memcache\APCu::clear
 2014-01-03 05:30:49 -08:00
Thomas Müller
1ce45713bd Merge pull request #6605 from owncloud/free_space_disabled 
Return SPACE_UNKNOWN if disk_free_space is disabled
 2014-01-02 08:19:52 -08:00
Thomas Müller
27d7fff580 Merge pull request #6609 from owncloud/avatar-test-user 
Make OC_Avatar unit tests independent of currently loggedin user
 2014-01-02 07:50:29 -08:00
Robin Appelman
83f968ace2 Fix APCIterator syntax in \OC\Memcache\APCU::clear 
see http://www.php.net/manual/en/apciterator.construct.php
 2014-01-02 16:12:56 +01:00
Robin Appelman
6f6c3d1e44 Make OC_Avatar unit tests independent of currently loggedin user 2014-01-02 16:08:08 +01:00
icewind1991
14e0b1b6d1 Merge pull request #6513 from owncloud/user-no-change-displayname 
Re-add the config options to remove the ability for users to change their displayname
 2014-01-02 05:04:27 -08:00
Robin Appelman
25370fcb82 Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage 2014-01-02 13:19:10 +01:00
Jenkins for ownCloud
095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Thomas Müller
25a9311e94 Merge pull request #6601 from AdamWill/pimple-include 
don't specify path to 3rdparty directory when registering Pimple autoloader
 2014-01-01 15:25:58 -08:00
Thomas Müller
ac3f83ca0d Merge pull request #6598 from lolozere/master 
Add support mimetype
 2014-01-01 15:25:28 -08:00
Adam Williamson
9b4a827e0b don't specify path to 3rdparty directory when registering Pimple autoloader 
The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
 2014-01-01 09:52:19 -08:00
lolozere
d5382ac05d Add support mimetype 
Add support mimetype for extension .sh, .bash and .sh-lib
 2014-01-01 14:09:02 +01:00
Niklas Sombert
4c179850ab Revert "Added support for extra backends (see pull request #5043)" 
This reverts commit 2d75914f2a, reversing
changes made to 760fa9ea30.
 2014-01-01 13:43:23 +01:00
Niklas Sombert
2d75914f2a Added support for extra backends (see pull request #5043) 
Somebody had forgotten "OC_User::setupBackends();"...
 2014-01-01 11:53:27 +01:00
Jenkins for ownCloud
760fa9ea30 [tx-robot] updated from transifex 2013-12-31 01:55:42 -05:00
Jenkins for ownCloud
9ea9638490 [tx-robot] updated from transifex 2013-12-30 01:55:38 -05:00
Jenkins for ownCloud
e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud
71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Michael Monreal
f52a9e5e42 Silence output of 'which' command used in smbclient detection 2013-12-27 18:10:47 +01:00
Jenkins for ownCloud
64a001edab [tx-robot] updated from transifex 2013-12-27 01:55:35 -05:00
Jenkins for ownCloud
7b2f4b08ac [tx-robot] updated from transifex 2013-12-26 01:55:34 -05:00
Jenkins for ownCloud
dbfe313a63 [tx-robot] updated from transifex 2013-12-25 01:55:35 -05:00
Thomas Müller
97031ba45c Merge pull request #6520 from owncloud/tests-testcleanuplistener 
Added test cleanup listener to detect untidy tests
 2013-12-24 14:27:39 -08:00
Thomas Müller
efdeba7416 Merge pull request #6449 from owncloud/core-appsorderfix 
Fixed apps loading order
 2013-12-24 14:26:11 -08:00
Thomas Müller
a87a18d56c Merge pull request #6561 from syncloud/master 
Made admin password field required on client side
 2013-12-24 14:25:01 -08:00
Thomas Müller
6523960de9 Merge pull request #6554 from owncloud/fix_5982 
fix preview for reshared file
 2013-12-24 04:03:20 -08:00
Jenkins for ownCloud
dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Frank Karlitschek
7b428f6009 Merge pull request #6460 from owncloud/remove-numRows 
Remove OC_DB_StatementWrapper::numRows()
 2013-12-23 03:38:56 -08:00
Vladimir Sapronov
cef39243f8 Made password field required on client side 
Fix for case described in https://github.com/syncloud/owncloud-setup/issues/19
 2013-12-22 17:43:50 -05:00
Georg Ehrke
c90e3e4f5b fix preview for reshared file 2013-12-22 20:27:38 +01:00
Jenkins for ownCloud
f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Andreas Fischer
4bc2a22317 Remove all uses of numRows(). 2013-12-21 19:56:14 +01:00
Andreas Fischer
63a2bea7ec Remove OC_DB_StatementWrapper::numRows(). 
Using this method will result in an unneccesary extra SQL query (which also may
return an incorrect result because the underlying table changed in the
meantime).

In general:

If you are performing an UPDATE, DELETE or equivalent query,
OC_DB_StatementWrapper::execute() will already give you the number of
"affected rows" via \Doctrine\DBAL\Driver\Statement::rowCount(). This will
not work for SELECT queries, however.

If you want to know whether a table contains any rows matching your condition,
use "SELECT id FROM ... WHERE ... LIMIT 1".

If you want to know whether a table contains any rows matching your condition
and you also need the data, use "SELECT ... FROM ... WHERE ...", then use
one of the fetch() methods.

If you want to count the number of rows matching your condition, use use
"SELECT COUNT(...) AS number_of_rows FROM ... WHERE ...", then use one of the
fetch() methods.
 2013-12-21 19:36:14 +01:00
Jenkins for ownCloud
cd26631a6d [tx-robot] updated from transifex 2013-12-21 01:56:13 -05:00
Vincent Petry
c6377e9125 Fixed apps loading order 
On SQLite the app order can be arbitrary and cause strange bugs.
On MySQL, the app order seems to be always alphabetical.

This fix enforces alphabetical order to make sure that all environments
behave the same and to reduce bugs related to app loading order.

Fixes #6442
 2013-12-20 17:16:57 +01:00
Robin Appelman
0ed1b64673 Pass config object in testGetHomeNotSupported 2013-12-20 13:57:22 +01:00
Frank Karlitschek
dc45141f4a Merge pull request #6262 from nickvergessen/issue/4375 
correctly mark app management active
 2013-12-20 02:27:52 -08:00
Jenkins for ownCloud
371a476eb5 [tx-robot] updated from transifex 2013-12-20 01:57:49 -05:00
Vincent Petry
1c340444a4 Added test cleanup listener to detect untidy tests 
After each test suite, detects whether there are stray datafiles, hooks
or proxies, then show a warning and clear them.
 2013-12-19 20:18:09 +01:00
Björn Schießle
6a3e38266f Merge pull request #6507 from owncloud/enc_fix_getUser 
[encryption] fix getUser Helper
 2013-12-19 11:09:41 -08:00
Bjoern Schiessle
517a55a437 tests added 2013-12-19 19:43:57 +01:00
Björn Schießle
f0da7b20c1 Merge pull request #6517 from owncloud/fix_6510 
[encryption] fix rename of shared files
 2013-12-19 10:19:09 -08:00