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

25437 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
3b188d0b72 Merge pull request #16768 from owncloud/add-missing-mime-types 
Adding mimetype x-h for header files
 2015-06-05 20:08:34 +02:00
Lukas Reschke
cbb15f3cbd Merge pull request #16767 from owncloud/webdav-preventdeleteroot 
Prevent deleting Webdav root
 2015-06-05 19:56:20 +02:00
Vincent Petry
b97be0ea02 Fix sabre directory test cases 
- rely on a mock subfolder instead of the root
- remove obsolete "Shared" limitation tests which did pass but not for the right
  reasons
- added test for the prevention of root deletion
 2015-06-05 19:04:59 +02:00
Morris Jobke
bd5aebe256 Merge pull request #16770 from owncloud/update-ocp-phpdoc 
[OCP] update PHPdoc to contain correct @since tags
 2015-06-05 18:55:45 +02:00
Morris Jobke
62ae39208a Add owner to the storage stats to enable better notifications 
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
 2015-06-05 18:21:41 +02:00
Morris Jobke
0c9604e3b2 [OCP] update PHPdoc to contain correct @since tags 2015-06-05 17:30:45 +02:00
Thomas Müller
5481a846c2 Adding mark down mime type mkd - fixes https://github.com/owncloud/files_texteditor/issues/45 2015-06-05 17:11:14 +02:00
Thomas Müller
5d93353a02 Adding mimetype x-h for header files - fixes https://github.com/owncloud/files_texteditor/issues/70 2015-06-05 16:57:01 +02:00
Vincent Petry
6ae5ae2e31 Prevent deleting Webdav root 2015-06-05 16:55:09 +02:00
Thomas Müller
9899e10a04 Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks 
Check whether the user exists before trying to set up his file system
 2015-06-05 16:22:03 +02:00
Thomas Müller
85d1ca11d4 Merge pull request #16765 from owncloud/fix-chunked-upload-jenkins 
Fix chunked upload jenkins
 2015-06-05 16:20:33 +02:00
Vincent Petry
ddd067a414 Merge pull request #16755 from owncloud/files-mkcolbackslash 
Validate path in getChild
 2015-06-05 16:12:03 +02:00
Thomas Müller
680a67712b fix unit test 2015-06-05 15:30:20 +02:00
Thomas Müller
cd82b24edd Bring back unit tests for \OC\Cache\File 2015-06-05 14:29:15 +02:00
Thomas Müller
5e60795962 Bring back OC\Cache\File - fixes #16760 2015-06-05 14:21:17 +02:00
Joas Schilling
1df95ea1ca Fix "@throws" tags on doc blocks 2015-06-05 13:55:59 +02:00
Joas Schilling
249e54e34a Add unit tests for InvalidPath Exception being thrown 2015-06-05 13:55:12 +02:00
Joas Schilling
bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Vincent Petry
06dda427f3 Validate path in getChild 2015-06-05 12:08:18 +02:00
Thomas Müller
ccbb1cce3c Merge pull request #16718 from owncloud/files-catchajaxexceptions 
Catch exceptions in files ajax calls
 2015-06-05 12:01:01 +02:00
Joas Schilling
4e24486a89 Check whether the user exists before trying to set up his file system 2015-06-05 11:31:49 +02:00
Morris Jobke
c747a58978 Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression 
port detection needs to take care of now thrown exceptions when LDAP …
 2015-06-05 11:10:37 +02:00
Jenkins for ownCloud
e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Robin McCorkell
5ea06f31b9 Merge pull request #16746 from owncloud/fix-phpdoc 
Fix typo in PHPDoc
 2015-06-04 15:36:15 +01:00
Arthur Schiwon
6f69fab384 port detection needs to take care of now thrown exceptions when LDAP server is not available 2015-06-04 16:28:48 +02:00
Morris Jobke
ab5ecb3d22 Fix typo in PHPDoc 2015-06-04 15:19:04 +02:00
Jenkins for ownCloud
66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Arthur Schiwon
090478a95e if possible, getUserGroups should get memberships using memberOf virtual attribute 2015-06-03 17:38:27 +02:00
Joas Schilling
bb0cb0aaec Merge pull request #15895 from owncloud/dav-getremoteetag 
Get etag from remote OC server
 2015-06-03 17:20:25 +02:00
Robin Appelman
bcf13aff6f change lock back to shared before updating the cache 2015-06-03 17:18:50 +02:00
Robin Appelman
6b0874203d add proper locking to file_put_contents when using streams 2015-06-03 17:18:50 +02:00
Thomas Müller
8d860e564a Merge pull request #16730 from owncloud/LukasReschke-patch-1 
Fix unit tests
 2015-06-03 17:18:06 +02:00
Lukas Reschke
bf07eb45e2 Fix unit tests 
Regression caused by https://github.com/owncloud/core/pull/16721

Failed the unit tests as per https://ci.owncloud.org/job/server-master-linux/database=sqlite,label=SLAVE/1994/testReport/junit/(root)/Test_Encryption_ManagerTest/testGetEncryptionModuleUnknown/:
```
Test\Encryption\ManagerTest::testGetEncryptionModuleUnknown
Failed asserting that exception message 'Module with id: unknown does not exist.' contains 'Module with id: unknown does not exists.'
```
 2015-06-03 17:07:30 +02:00
Morris Jobke
5b52670a95 Merge pull request #16703 from owncloud/fix-ie8-ie9 
Fix IE8 & IE9 - setup page
 2015-06-03 16:15:03 +02:00
Morris Jobke
a90a84b0a7 Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions 
Keep versions when deleting as recipient
 2015-06-03 16:03:31 +02:00
Clark Tomlinson
00742a9d68 Merge pull request #16721 from owncloud/fix-grammar-enc-module 
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t…
 2015-06-03 09:54:50 -04:00
Arthur Schiwon
91841bb25d Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits. 2015-06-03 15:23:37 +02:00
Thomas Müller
5dc5b7f86d Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user. 2015-06-03 15:00:56 +02:00
Thomas Müller
259b6ac2c1 Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746 2015-06-03 14:56:18 +02:00
Thomas Müller
3d289a58cd Merge pull request #16719 from owncloud/fix-encryption-tests 
use not deprecated method in tests
 2015-06-03 14:36:10 +02:00
Morris Jobke
2edcce7e2a use not deprecated method in tests 2015-06-03 14:33:56 +02:00
Vincent Petry
263bb46ff8 Catch exceptions in files ajax calls 2015-06-03 14:31:58 +02:00
Thomas Müller
739c3f01aa Merge pull request #16434 from owncloud/persist-maintenance-state 
Persist the state of the maintenance after an upgrade
 2015-06-03 13:56:17 +02:00
Thomas Müller
69d1e7aaf4 Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version 
Check for redis to be 2.2.5+
 2015-06-03 13:55:26 +02:00
Lukas Reschke
3a233b8698 Merge pull request #16714 from owncloud/fix-cors-test 
Fix #16713
 2015-06-03 13:52:14 +02:00
Morris Jobke
e3440863bc Merge pull request #16708 from owncloud/enc_fix_move_to_trash 
make sure that we always use the correct owner for both source and target
 2015-06-03 13:49:46 +02:00
Lukas Reschke
9ba5081d47 Merge pull request #16710 from owncloud/move-invoke-private-to-base-class 
Move the helpful invokePrivate method to the TestCase class
 2015-06-03 13:41:32 +02:00
Thomas Müller
7de2940b42 Merge pull request #16711 from owncloud/files-invalidchar400 
Translate invalid path exception to sabre exception for files
 2015-06-03 13:40:31 +02:00
Bernhard Posselt
21ce5d034b fix #16713 2015-06-03 12:56:50 +02:00
Joas Schilling
d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00