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

15597 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Bjoern Schiessle
552d0a6feb check if the old owner and the old path is available 2013-12-19 18:40:40 +01:00
Andreas Fischer
526e873073 Merge pull request #6219 from leo-b/fix_router_deprecation 
Symfonys addCollection() with multiple arguments is deprecated

* leo-b/fix_router_deprecation:
  Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
 2013-12-19 17:38:37 +01:00
Bjoern Schiessle
165542f27d fix rename of shared files 2013-12-19 17:29:38 +01:00
Vincent Petry
06dec2632f Merge pull request #6512 from owncloud/master-failingoracletests 
Removed numRows usage from encryption app
 2013-12-19 08:22:44 -08:00
Björn Schießle
079f1a6f41 Merge pull request #6495 from owncloud/enc_fseek_fallback 
Added fseek fallback to the encryption app
 2013-12-19 07:09:07 -08:00
Bjoern Schiessle
fe7fb66ef8 we can also have a path user/cache/... 2013-12-19 15:58:10 +01:00
Vincent Petry
963ee31efb Removed numRows usage from encryption app 
numRows on Oracle always seem to return 0.

This fix removes numRows usage from the encryption and sharing app.

This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
 2013-12-19 15:51:24 +01:00
Thomas Müller
ae3df84e20 Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json 
only walk an array
 2013-12-19 03:25:58 -08:00
icewind1991
3ea01e2152 Merge pull request #6492 from owncloud/appconfig-cache 
Fetch all appconfig values for an app at once and cache the results
 2013-12-19 03:25:20 -08:00
Thomas Müller
9b18a4fd87 Merge pull request #4378 from owncloud/fixing-3417-master 
Don't use xcache in case admin auth is enabled
 2013-12-19 03:24:37 -08:00
Vincent Petry
684e331b5b Merge pull request #6503 from owncloud/finally-kill-mdb2-master 
Finally kill mdb2 master
 2013-12-19 02:56:46 -08:00
Frank Karlitschek
748d90592a Merge pull request #6502 from owncloud/core-extramimetypes 
Added missing mime types
 2013-12-18 23:41:36 -08:00
Jenkins for ownCloud
37cdbc3be0 [tx-robot] updated from transifex 2013-12-19 01:57:03 -05:00
Thomas Müller
aa17a896ac fix return statement 2013-12-19 00:33:29 +01:00
Thomas Müller
5eae75eeca kill MDB2 in PHPDoc 2013-12-19 00:32:46 +01:00
Thomas Müller
6c2a425686 Updating to latest master of 3rdparty - once more :-( 2013-12-19 00:26:41 +01:00
Thomas Müller
62fdc2b0dc Merge pull request #6476 from ogasser/dbal_precision_scale 
DB: Support DECIMAL(precision,scale) syntax in XML
 2013-12-18 15:15:26 -08:00
Oliver Gasser
cacb66480b Add unit tests for decimal type usage 2013-12-18 23:40:11 +01:00
Vincent Petry
b109d411d8 Added missing mime types 
This is mostly to fix acceptance tests that have a .cc file.

Also fixed typo in python mime type.
 2013-12-18 22:40:58 +01:00
Bjoern Schiessle
df0c1fe7f3 add test for the stream wrapper to read encrypted files from the system folder /tmp 2013-12-18 17:07:35 +01:00
Bjoern Schiessle
f9ec3a7124 test for isEncryptedPath() 2013-12-18 16:39:34 +01:00