summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix group id naming fid->gidBart Visscher2013-07-241-1/+1
* Merge pull request #4177 from owncloud/move_defaults_to_template_constructorBjörn Schießle2013-07-242-2/+6
|\
| * initialize OC_Defaults in template constructorXBjörn Schießle2013-07-242-2/+6
* | Merge pull request #3995 from owncloud/groupsicewind19912013-07-246-130/+511
|\ \ | |/ |/|
| * Merge branch 'master' into groupsThomas Müller2013-07-248-390/+502
| |\
| * \ Merge branch 'master' into groupsRobin Appelman2013-07-2358-4887/+1866
| |\ \
| * | | group: only pass backends that hold that specific group to the group constructorRobin Appelman2013-07-182-2/+8
| * | | reneme id to gidRobin Appelman2013-07-101-15/+15
| * | | more consistent namingRobin Appelman2013-07-102-6/+6
| * | | consistent namingRobin Appelman2013-07-101-6/+6
| * | | search parameter is not optionalRobin Appelman2013-07-101-2/+2
| * | | more consitency in hook namesRobin Appelman2013-07-102-9/+9
| * | | cant use private members from closure in php <5.4Robin Appelman2013-07-101-3/+3
| * | | use new group api as backend for the old apiRobin Appelman2013-07-101-127/+98
| * | | update group managementRobin Appelman2013-07-105-3/+407
* | | | Merge pull request #4171 from owncloud/fix-configMorris Jobke2013-07-241-5/+2
|\ \ \ \
| * | | | ignore config read failuresBart Visscher2013-07-231-1/+2
| * | | | Revert "fix failing master branch - Test_Config::testWriteData"Bart Visscher2013-07-231-5/+1
* | | | | Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2459-5257/+2246
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #4090 from owncloud/cleanup-some-template-functionsThomas Müller2013-07-238-390/+502
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Change to use !== and ===Bart Visscher2013-07-212-6/+6
| | * | | fixing typos, PHPDoc and missing namespace \Thomas Müller2013-07-214-10/+11
| | * | | Move basic template functions to their own classBart Visscher2013-07-213-165/+205
| | * | | Move template functions to there own fileBart Visscher2013-07-212-112/+121
| | * | | Split locating JS and CSS files to their own classBart Visscher2013-07-214-104/+166
| * | | | Merge pull request #3392 from owncloud/googledriveBart Visscher2013-07-231-2/+5
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into googledriveThomas Müller2013-07-12138-2412/+4777
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into googledriveMichael Gapczynski2013-05-3019-73/+325
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into googledriveMichael Gapczynski2013-05-2758-117/+578
| | |\ \ \ \ \ \
| | * | | | | | | Return null if file size is negative for WebDAV, fix #2013Michael Gapczynski2013-05-271-2/+5
| * | | | | | | | Merge pull request #4150 from owncloud/better-error-handlingJörn Friedrich Dreyer2013-07-236-41/+42
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed review issuesBart Visscher2013-07-223-7/+11
| | * | | | | | | | Only display call trace in debug modeBart Visscher2013-07-211-10/+17
| | * | | | | | | | In debug mode uncaught exceptions should display a nice pageBart Visscher2013-07-211-3/+7
| | * | | | | | | | DRY use OC_Template::printErrorPageBart Visscher2013-07-212-22/+10
| | * | | | | | | | Change exit calls to throwing an exceptionBart Visscher2013-07-213-6/+4
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-231-0/+7
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | need to use \OC_Image to escape OCP namespaceJörn Friedrich Dreyer2013-07-221-1/+1
| * | | | | | | Merge pull request #4154 from owncloud/return-ocl10nKondou2013-07-221-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | return result from getL10NRobin Appelman2013-07-221-1/+1
| | |/ / / / / /
| * | | | | | | Merge branch 'master' into fix_return_value_search_principalsGeorg Ehrke2013-07-2244-4716/+1468
| |\| | | | | |
| | * | | | | | Merge pull request #4131 from owncloud/scanner-splitBart Visscher2013-07-214-4/+111
| | |\ \ \ \ \ \
| | | * | | | | | Split scanning logic from ajax fileRobin Appelman2013-07-192-1/+90
| | | * | | | | | add option to get the mountmanager from the filesystemRobin Appelman2013-07-191-1/+8
| | | * | | | | | Make Cache\Scanner an emitterRobin Appelman2013-07-191-2/+13
| | * | | | | | | Merge pull request #4092 from owncloud/base-better-errorsBart Visscher2013-07-214-24/+17
| | |\ \ \ \ \ \ \
| | | * | | | | | | Result of && if not the partBart Visscher2013-07-191-1/+1
| | | * | | | | | | Display the exception error backtrace preformattedBart Visscher2013-07-161-0/+3
| | | * | | | | | | Early errors (in base.php) don't have session availableBart Visscher2013-07-162-2/+5
| | | * | | | | | | Cleanup error generation in base.phpBart Visscher2013-07-161-20/+8