summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LDAP: prepare settings for internal username attribute and clearing user mapp...Arthur Schiwon2013-05-072-0/+13
* LDAP: Coypright infoArthur Schiwon2013-05-071-0/+2
* 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
| * | | | | | | | merge translations with those from themeAndreasErgenzinger2013-04-171-9/+10
| * | | | | | | | merge translations with those from themeAndreasErgenzinger2013-04-171-0/+9
* | | | | | | | | Merge pull request #2491 from riso/xsendfile_fix_zipBart Visscher2013-05-032-20/+22
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | fixed xsendfile zip generation race conditionValerio Ponte2013-03-202-20/+22
* | | | | | | | | Fix retrieval of users with multiple backendsArthur Schiwon2013-05-032-5/+16
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-0319-43/+56
* | | | | | | | | Merge pull request #3216 from owncloud/fix-api-3rdpartyTom Needham2013-05-021-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | respect format outputBernhard Posselt2013-05-021-2/+3
| * | | | | | | | | logout before output to not run into header already sent problemsBernhard Posselt2013-05-021-1/+2
| * | | | | | | | | fix bug that would only return error responses for 3rdparty appsBernhard Posselt2013-05-021-1/+5
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3183 from miicha/patch-1Thomas Müller2013-05-021-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixing mimetype for "new" ms office formatsmiicha2013-04-301-3/+3
* | | | | | | | | | Merge pull request #3212 from owncloud/stop-linksMorris Jobke2013-05-021-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't display shared links if disabledMichael Gapczynski2013-05-011-0/+7
* | | | | | | | | | | Merge pull request #3220 from owncloud/gitignore-themesFrank Karlitschek2013-05-021-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | don't ignore themes READMEJan-Christoph Borchardt2013-05-021-1/+2
| * | | | | | | | | | ignore themesJan-Christoph Borchardt2013-05-021-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3211 from owncloud/fix-2816Frank Karlitschek2013-05-021-5/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix #2816 renaming shared filesMichael Gapczynski2013-05-011-5/+3
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-0255-127/+4921