mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,797 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

13797 Commits

Author SHA1 Message Date
Thomas Müller 6979fd343b Merge branch 'master' into appframework-master 2013-09-28 20:39:19 +02:00
Morris Jobke 1097c3ce63 Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname 
Base defaultavatar text on displayname
 2013-09-28 08:52:22 -07:00
kondou 24d092c4ba Have uniform (wrong) indention 2013-09-28 17:49:07 +02:00
kondou 4907685405 Base defaultavatar text on displayname 
Fix #4876
 2013-09-28 16:46:53 +02:00
Morris Jobke cb565a5f60 Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes 
phpunit.xml: Port code coverage excludes from autotest to dist.
 2013-09-28 06:50:34 -07:00
Thomas Müller 57f37c876b delay middleware registrations 2013-09-27 17:15:26 +02:00
Thomas Müller adff34cb8a fixing error in initialization of TagManager 2013-09-27 17:08:48 +02:00
Thomas Müller 687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Thomas Müller 735608f513 Merge pull request #4207 from owncloud/search_shared_files 
add initial search in shared files
 2013-09-27 05:18:12 -07: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
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Andreas Fischer 1a398fba67 phpunit.xml: Port code coverage excludes from autotest to dist. 2013-09-26 19:05:47 +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
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 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
kondou 5e7a7b3f61 Shorten optional text-argument processing 2013-09-25 17:19:38 +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
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
Thomas Müller 30286c06ab stripos return value check 2013-09-25 11:05:59 +02:00
Thomas Müller b168d5aa3b class API decommissioning part 1 2013-09-25 11:05:24 +02:00
Thomas Müller b2ef978d10 AppFramework: 
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
 2013-09-25 10:30:48 +02:00
Thomas Müller db39fede97 Merge branch 'master' into appframework-master 
Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
 2013-09-25 09:52:12 +02:00
Jenkins for ownCloud 2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Thomas Tanghus aaed871cee Add factory class for the server container. 2013-09-24 17:10:01 +02:00
Arthur Schiwon 14a160e176 Adjust Tests and satisfy them 2013-09-24 17:10:01 +02:00
Thomas Müller 843f15f348 Merge pull request #4898 from owncloud/server_folder_methods 
Server folder methods
 2013-09-24 06:58:47 -07:00
Arthur Schiwon 63324e2347 Fix doc 2013-09-24 14:12:44 +02:00
Arthur Schiwon 0a7ee7c3f7 Fix return value from User object to User ID 2013-09-24 14:11:47 +02:00
Arthur Schiwon fe88a62d6e === not == 2013-09-24 13:51:33 +02:00
Arthur Schiwon d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Christopher e41ef97ac0 Merge pull request #4963 from cyberb/patch-1 
fixing typo
 2013-09-24 04:45:13 -07:00
Thomas Müller cd2421c7ee adding PHPDoc comments to getBackend 
ensure getChildren() is called on an instance of Share_Backend_Collection
 2013-09-24 10:37:58 +02:00
Thomas Müller 40871bab88 Merge pull request #4930 from owncloud/fix-apps-settings 
Fix the apps enabling/disabling in settings
 2013-09-24 01:02:50 -07:00
Thomas Müller 759f732aaa Merge pull request #4917 from owncloud/scan-clear-permissions 
clear permissions cache when scanning a file
 2013-09-24 00:50:33 -07:00
Boris Rybalkin 00c998c5bb fixing typo 
Typo in comment "feature" => "future"
 2013-09-23 21:08:58 -04:00
Andreas Fischer 2129974584 Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). 2013-09-24 00:59:23 +02:00
Robin Appelman 235517f111 clear permissions cache when scanning a file 2013-09-24 00:57:58 +02:00
Thomas Tanghus 8c469394e6 Remove duplicate method definitions 2013-09-24 00:12:23 +02:00