Commit Graph

14239 Commits

Author SHA1 Message Date
Arthur Schiwon 5090ca3eb4 LDAP: add phpdoc 2013-09-27 13:34:15 +02:00
Arthur Schiwon 6e850e0bee LDAP: establish wrapper interface to allow proper mocking 2013-09-27 13:34:15 +02:00
Arthur Schiwon 52454e39b7 LDAP: move is_resource check to ldap wrapper to make it mockable 2013-09-27 13:34:15 +02:00
Arthur Schiwon d34fbf3a86 LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation and mock testing 2013-09-27 13:34:15 +02:00
Arthur Schiwon 1a020e0696 Resolve merge conflict 2013-09-27 13:34:15 +02:00
Thomas Müller 1ec7dff2fe remove unused setUp() 2013-09-27 13:30:09 +02:00
Morris Jobke f47ff13abf Merge pull request #5001 from owncloud/fixing-user-external-backends-master
prelogin apps have to be loaded within setupBackend() otherwise required...
2013-09-27 02:34:59 -07:00
Georg Ehrke 4e9296a484 rename testTxtBlacklist to txtBlacklist 2013-09-27 11:33:37 +02:00
Georg Ehrke 1b13101096 move fileView object initialization to testIsTransparent 2013-09-27 11:01:47 +02:00
Georg Ehrke aa8a145ba8 use dataProvider for txt blacklist test 2013-09-27 09:59:04 +02:00
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Bjoern Schiessle 7e54e8831e set rememberlogin to false for the encryption app 2013-09-26 19:34:50 +02:00
Bjoern Schiessle 9bb244cc59 check every enabled app if the remember login feature needs to be disabled 2013-09-26 19:34:28 +02:00
Andreas Fischer 1a398fba67 phpunit.xml: Port code coverage excludes from autotest to dist. 2013-09-26 19:05:47 +02:00
Bjoern Schiessle 62b8c36a40 check if encryption app is enabled before trying to calculate file size 2013-09-26 16:27:14 +02:00
Morris Jobke 3dd19c7758 Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
run unit tests for apps as well
2013-09-26 07:09:32 -07:00
Thomas Müller f8933eaf92 Remove $RUNTIME_NOAPPS - setting to false was not enough 2013-09-26 14:03:04 +02:00
Thomas Müller e515509a81 prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded 2013-09-26 13:34:47 +02:00
blizzz b9d582caa2 Merge pull request #4990 from owncloud/user_fix_manager
manager checkPassword now returns User object, adjust internal user clas...
2013-09-26 04:03:20 -07:00
Bjoern Schiessle b9d6539d76 Merge branch 'master' into ocs_share_api 2013-09-26 13:02:39 +02:00
Björn Schießle 6b1d70f148 Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
2013-09-26 03:16:15 -07:00
Thomas Müller 2334f96906 Merge pull request #4991 from owncloud/enc_fix_warning
check if key exists before reading it
2013-09-26 03:15:14 -07:00
Thomas Müller d1b5d65622 run unit tests for apps as well 2013-09-26 12:02:06 +02:00
Thomas Müller a86c10984a catching NotPermittedException and throw it to the dav client as 403 2013-09-26 11:50:46 +02:00
Bjoern Schiessle 663009f895 fix check if app is enabled 2013-09-26 11:08:02 +02:00
Bjoern Schiessle 4d2dfa98c0 check if key exists before reading it 2013-09-26 11:06:58 +02:00
Thomas Müller b11d8799c1 adding unit tests for ObjectTree::move() 2013-09-26 10:50:15 +02:00
Thomas Müller 469b309b21 Merge pull request #4892 from owncloud/vcategories_public
OC_VCategories => OC\Tags. Public interface and getter in server container
2013-09-25 14:24:37 -07:00
Bjoern Schiessle 0b98427536 fix check if app is enabled 2013-09-25 19:23:07 +02:00
Arthur Schiwon b5ac672864 Missing Test for the previous commit 2013-09-25 19:15:27 +02:00
Morris Jobke 70dccd28ef Merge pull request #4987 from owncloud/different_color_placeholder
Make it possible to have a different color than the username for placeholder
2013-09-25 10:11:52 -07:00
Bjoern Schiessle 71bbb2ea8b check if key exists before reading it 2013-09-25 17:44:05 +02:00
Thomas Müller 46e47be782 Merge branch 'master' into move-aborted-upload-detection-into-plugin-master 2013-09-25 17:43:25 +02:00
Thomas Müller 826c6bec8f expect unlinkto be called 2013-09-25 17:41:16 +02:00
Thomas Müller 3fa5271f10 adding unit tests 2013-09-25 17:34:28 +02:00
Thomas Müller 0c44cdd4ea remove unneccessary code 2013-09-25 17:28:45 +02:00
kondou 5e7a7b3f61 Shorten optional text-argument processing 2013-09-25 17:19:38 +02:00
Thomas Müller 5e27ac4b1a $path already contains the full path to the file 2013-09-25 17:17:29 +02:00
Thomas Müller 09b64535a9 fixing copyright and add class documentation 2013-09-25 17:05:14 +02:00
Thomas Müller 2feb753b84 Merge pull request #4989 from owncloud/coverage-for-all-master
collect coverage for all databases again - ci.owncloud.org has more RAM ...
2013-09-25 07:46:49 -07:00
Bjoern Schiessle 4077ed6ddb add some additional assertions to the tests 2013-09-25 15:05:23 +02:00
Arthur Schiwon 1c976a7c9b manager checkPassword now returns User object, adjust internal user class accordingly. 2013-09-25 15:03:22 +02:00
Thomas Müller 0486dc24ad collect coverage for all databases again - ci.owncloud.org has more RAM available 2013-09-25 14:41:13 +02:00
Thomas Müller 68bfcfbf77 Merge pull request #4968 from owncloud/user_checkpwd
User: move checkPassword from User to Manager to not break API
2013-09-25 05:28:42 -07:00
kondou 24eb41548e Make it possible to have a different color than the username for placeholder 2013-09-25 12:57:41 +02:00
Bjoern Schiessle acd3c11e47 use OC_DB::executeAudited 2013-09-25 12:18:29 +02:00
Bjoern Schiessle 5a9e473a79 use OC_DB::executeAudited 2013-09-25 12:15:46 +02:00
Bjoern Schiessle 3cd0caa643 set default value for expire parameter 2013-09-25 12:15:30 +02:00
Bjoern Schiessle 883d1c0df3 use template for txt and html mails to send notification mails 2013-09-25 11:51:28 +02:00
Thomas Müller 30286c06ab stripos return value check 2013-09-25 11:05:59 +02:00