summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix #3251kondou2013-05-091-2/+3
* 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
* | | | | | Merge pull request #3147 from owncloud/storage-mkdir-rootMichael Gapczynski2013-05-0110-46/+10
|\ \ \ \ \ \
| * | | | | | Dont task external storages with creating their own rootRobin Appelman2013-04-2610-46/+10
* | | | | | | Merge pull request #3202 from owncloud/swift_idFrank Karlitschek2013-05-011-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Set storage id for openstack swift backendRobin Appelman2013-05-011-0/+1
* | | | | | | | Merge pull request #3203 from qzio/patch-1Morris Jobke2013-05-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | typo fix in a comment.joel hansson2013-05-011-1/+1
|/ / / / / / / /
* | | | | | | / [tx-robot] updated from transifexJenkins for ownCloud2013-05-0156-209/+253
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_m...FlorinPeter2013-04-301-86/+309
|\ \ \ \ \ \ \
| * | | | | | | delete and restore of versions and share-keys now worksFlorin Peter2013-04-281-20/+37
| * | | | | | | added handling for share-keysFlorin Peter2013-04-281-13/+88
| * | | | | | | restore fixedFlorin Peter2013-04-281-22/+40
| * | | | | | | fixed some problems and broken codeFlorin Peter2013-04-281-42/+83
| * | | | | | | restore encryption keys from trash bin (development snapshot)Björn Schießle2013-04-281-45/+72
| * | | | | | | move encryption keys to trash binBjörn Schießle2013-04-281-31/+76
| |/ / / / / /
* | | | | | | Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cacheFlorinPeter2013-04-292-2/+2
|\ \ \ \ \ \ \
| * | | | | | | fix for infinite loop causing on files_encryption branch when testing "apps/f...Florin Peter2013-04-292-2/+2
| | |_|_|/ / / | |/| | | | |
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-30118-631/+852
|/ / / / / /
* | | | | | Merge pull request #3159 from owncloud/rewordJan-Christoph Borchardt2013-04-291-1/+1
|\ \ \ \ \ \