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

4192 Commits

Author SHA1 Message Date
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Robin Appelman 1b50154c95 functions in OCP should be static 2013-07-25 15:25:17 +02:00
Andreas Fischer 75e93d041d Merge pull request #3887 from owncloud/apc_user_cache 
The APC User Cache doesn't return the cache_list anymore

* owncloud/apc_user_cache:
  Add ACPu memory cache
 2013-07-25 03:48:26 +02:00
Bart Visscher 25003fb213 Add ACPu memory cache 2013-07-24 21:50:15 +02:00
icewind1991 ff86b6f134 Merge pull request #4183 from owncloud/fix-group-id 
Fix group id naming fid->gid
 2013-07-24 11:09:47 -07:00
icewind1991 1986416248 Merge pull request #3898 from owncloud/sabre-objecttree 
WebDAV performance improvements
 2013-07-24 10:46:27 -07:00
Bart Visscher 4e3bfd8ddd Fix group id naming fid->gid 2013-07-24 17:54:31 +02:00
Jan-Christoph Borchardt 9b1866f1ac merge master 2013-07-24 16:31:01 +02:00
Robin Appelman ad266a4253 Merge branch 'master' into sabre-objecttree 2013-07-24 15:53:48 +02:00
Björn Schießle 651479322b Merge pull request #4177 from owncloud/move_defaults_to_template_constructor 
Move defaults to template constructor
 2013-07-24 06:42:52 -07:00
icewind1991 98858e6f00 Merge pull request #3995 from owncloud/groups 
Refactoring of group management code
 2013-07-24 06:13:05 -07:00
Björn Schießle 75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Morris Jobke 2622839fcf Merge pull request #4171 from owncloud/fix-config 
Fix config
 2013-07-24 00:48:43 -07:00
Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Thomas Müller 60ce492fac Merge branch 'master' into groups 2013-07-24 01:11:12 +02:00
Thomas Müller 5fc0535f1b Merge pull request #4090 from owncloud/cleanup-some-template-functions 
Cleanup some template functions
 2013-07-23 15:53:43 -07:00
Robin Appelman fb40d9e1e6 Merge branch 'master' into groups 2013-07-23 22:06:03 +02:00
Bart Visscher 7ad38535e5 Merge pull request #3392 from owncloud/googledrive 
Switch to using Google Drive SDK, closes #2047
 2013-07-23 12:23:08 -07:00
Jan-Christoph Borchardt 93b227d803 shorten wording on config directory errors 2013-07-23 18:41:00 +02:00
Bart Visscher 485e8ab0a5 ignore config read failures 2013-07-23 17:38:37 +02:00
Bart Visscher 5caa7576d4 Revert "fix failing master branch - Test_Config::testWriteData" 
This reverts commit 8f93490ac4.
 2013-07-23 17:36:08 +02:00
Jörn Friedrich Dreyer f7422ad132 Merge pull request #4150 from owncloud/better-error-handling 
Better error handling
 2013-07-23 08:30:02 -07:00
Jenkins for ownCloud a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Bart Visscher 179b42c56d Fixed review issues 2013-07-22 23:04:14 +02:00
Jörn Friedrich Dreyer cb4cf3e2f7 need to use \OC_Image to escape OCP namespace 2013-07-22 17:25:55 +02:00
Kondou bc86ce00cf Merge pull request #4154 from owncloud/return-ocl10n 
return result from getL10N
 2013-07-22 08:05:32 -07:00
Robin Appelman d509a0c403 return result from getL10N 2013-07-22 15:52:02 +02:00
Georg Ehrke f1e939e1a3 Merge branch 'master' into fix_return_value_search_principals 2013-07-22 15:30:57 +02:00
Bart Visscher 25e3c9cbeb Only display call trace in debug mode 2013-07-21 22:56:21 +02:00
Bart Visscher aa22194a09 In debug mode uncaught exceptions should display a nice page 2013-07-21 22:40:35 +02:00
Bart Visscher 8c5df31c49 DRY use OC_Template::printErrorPage 2013-07-21 22:30:32 +02:00
Bart Visscher df8ad46dae Change exit calls to throwing an exception 
This way the error won't be fatal in a unit test
 2013-07-21 22:29:50 +02:00
Bart Visscher 6d39e0ad6f Change to use !== and === 2013-07-21 21:42:42 +02:00
Thomas Müller 01c39cf2be fixing typos, PHPDoc and missing namespace \ 2013-07-21 21:42:42 +02:00
Bart Visscher 3de8570e35 Move basic template functions to their own class 2013-07-21 21:42:42 +02:00
Bart Visscher 2593395561 Move template functions to there own file 2013-07-21 21:37:25 +02:00
Bart Visscher 5965f3ecea Split locating JS and CSS files to their own class 2013-07-21 21:36:15 +02:00
Bart Visscher 37a731bcad Merge pull request #4131 from owncloud/scanner-split 
Remove scanner logic from ajax file and place it in it's own class
 2013-07-21 11:32:11 -07:00
Bart Visscher 639097db59 Merge pull request #4092 from owncloud/base-better-errors 
Generate better errors in base.php
 2013-07-21 11:20:30 -07:00
Bart Visscher 9bf12da750 Merge pull request #3880 from owncloud/code-checker 
Add classes replaced by the public api to the code checker
 2013-07-21 11:19:20 -07:00
Morris Jobke 8f93490ac4 fix failing master branch - Test_Config::testWriteData 2013-07-21 11:13:29 +02:00
Morris Jobke 05c83a163a add proper deprecated tag 2013-07-21 10:30:00 +02:00
Morris Jobke 647e0a0cba Merge pull request #4118 from owncloud/remove-size-experiment 
finally remove the file size obfuscation as it had more disadvantages.
 2013-07-21 01:25:39 -07:00
Jan-Christoph Borchardt 48267b6e6c add back public API function, but mark as deprecated 2013-07-20 01:15:12 +02:00
Bart Visscher 11f28d7880 Result of && if not the part 2013-07-19 17:37:42 +02:00
Bart Visscher cbe1c22b5f Correct casing of OC_User and pass through the params to getUsers 2013-07-19 17:32:31 +02:00
Robin Appelman 2b89b7c880 Split scanning logic from ajax file 2013-07-19 16:44:47 +02:00
Robin Appelman b397df2022 add option to get the mountmanager from the filesystem 2013-07-19 16:33:00 +02:00
Robin Appelman 02cdd52fb0 Make Cache\Scanner an emitter 2013-07-19 16:32:43 +02:00