summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename a file if it gets restored so that it no longer exists as a version. O...Björn Schießle2013-05-081-1/+1
* update etag for for the touched fileBjörn Schießle2013-05-081-1/+9
* touch file relative to users file folder, otherwise the hooks will be ignoredBjörn Schießle2013-05-081-4/+5
* Merge pull request #3271 from owncloud/fix_for_util_tearDownFSFlorinPeter2013-05-081-0/+1
|\
| * fix for tearDownFS, after filesystem::tearDown() the root is not mountedFlorin Peter2013-05-071-0/+1
* | Merge pull request #3272 from owncloud/legacy-autoloaderBart Visscher2013-05-083-62/+198
|\ \ | |/ |/|
| * Autoloader: fix loading app clases located in lib/Robin Appelman2013-05-082-15/+23
| * Autoloader: test casesRobin Appelman2013-05-071-5/+53
| * Autoloader: load the 3rdparty libraries using prefixesRobin Appelman2013-05-071-17/+16
| * check for setlocale after setting up the paths to prevent autoloader confusionRobin Appelman2013-05-071-2/+7
| * Autoloader: add support for custom namespace pathsRobin Appelman2013-05-071-1/+19
| * Autoloader: split getting the class paths and loading the classRobin Appelman2013-05-071-7/+20
| * Allow disabling the global classpath in an autoloaderRobin Appelman2013-05-071-3/+19
| * Allow the autoloader to try mutliple possible paths for each pathRobin Appelman2013-05-071-24/+17
| * Add per-autoloader classPathRobin Appelman2013-05-071-3/+24
| * Move autoloader to it's own classRobin Appelman2013-05-072-56/+71
|/
* Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-appBart Visscher2013-05-0710-42/+42
|\
| * Use !== and === in user_ldap app – Part 2kondou2013-04-205-23/+23
| * Use !== and === in user_ldap app – Part 1kondou2013-04-205-19/+19
* | Merge pull request #3044 from owncloud/backgroundwatchericewind19912013-05-074-3/+126
|\ \
| * | Cache: check one folder and one file each time the backgroundwatcher runsRobin Appelman2013-04-201-8/+39
| * | Cache: add a backgroundjob to check for external changes to the filesystemRobin Appelman2013-04-205-3/+96
* | | Merge pull request #3025 from owncloud/move-fileMichael Gapczynski2013-05-072-14/+18
|\ \ \
| * | | Cache: only look for child entires when doing a move operation when moving a ...Robin Appelman2013-04-192-15/+19
| |/ /
* | | Merge pull request #2813 from owncloud/improve-lib-checkBart Visscher2013-05-071-1/+1
|\ \ \
| * | | remove hard php-intl requirementMorris Jobke2013-05-071-5/+0
| * | | added correct check for gd and check for php-intlBernhard Posselt2013-04-091-1/+6
* | | | Merge pull request #3246 from owncloud/newfile-mimetypeMorris Jobke2013-05-072-3/+3
|\ \ \ \
| * | | | Files: set the proper mimetype when creating a new text fileRobin Appelman2013-05-062-3/+3
* | | | | allow to set quota to zero, issue #2696Björn Schießle2013-05-071-5/+1
* | | | | Merge pull request #3245 from owncloud/use-$viewLukas Reschke2013-05-061-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use $dir instead of $fullpathLukas Reschke2013-05-061-2/+1
| * | | | Use the internal ownCloud viewLukas Reschke2013-05-061-1/+1
|/ / / /
* | | | LDAP: do not reset UUID attribute setting when guid is detectedArthur Schiwon2013-05-061-1/+3
* | | | Merge pull request #3120 from owncloud/ocs_propertiesBart Visscher2013-05-051-1/+1
|\ \ \ \
| * | | | Make class properties protected instead of private to allow subclassingTom Needham2013-04-231-1/+1
* | | | | Merge pull request #3177 from owncloud/outerHTML_compatibilityThomas Tanghus2013-05-042-2/+16
|\ \ \ \ \
| * | | | | Add compatibility function for outerHTMLThomas Tanghus2013-04-292-2/+16
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-0428-130/+147
* | | | | | Merge pull request #3230 from owncloud/fix_ldap_cachekeyBart Visscher2013-05-031-1/+1
|\ \ \ \ \ \
| * | | | | | LDAP: cachekey in set method needs to match with that one from getArthur Schiwon2013-05-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #3229 from owncloud/fix_3210Bart Visscher2013-05-031-1/+1
|\ \ \ \ \ \
| * | | | | | LDAP: remove restriction from group names to be in line with core behaviour a...Arthur Schiwon2013-05-031-1/+1
* | | | | | | Merge pull request #3222 from owncloud/fix-3218Bart Visscher2013-05-034-7/+31
|\ \ \ \ \ \ \
| * | | | | | | One more mount point fixMichael Gapczynski2013-05-021-1/+4
| * | | | | | | Fix retrieving of mount points for shared storage, fix #3218Michael Gapczynski2013-05-023-6/+27
* | | | | | | | Merge pull request #3201 from owncloud/own_sorting_for_priorized_languagesBart Visscher2013-05-031-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Sort priorized languages as defined in the arraykondou2013-05-011-3/+4
* | | | | | | | | Merge pull request #2972 from AndreasErgenzinger/masterBart Visscher2013-05-031-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | additional safety checksAndreasErgenzinger2013-04-171-1/+3