summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 get
| * 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 behavi...
| * LDAP: remove restriction from group names to be in line with core behaviour ↵Arthur Schiwon2013-05-031-1/+1
| | | | | | | | again
* | Merge pull request #3222 from owncloud/fix-3218Bart Visscher2013-05-034-7/+31
|\ \ | | | | | | Fix retrieving of mount points for shared storage, fix #3218
| * | 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 array
| * | | Sort priorized languages as defined in the arraykondou2013-05-011-3/+4
| | | | | | | | | | | | | | | | Also add russian and arabic to the common languages.
* | | | Merge pull request #2972 from AndreasErgenzinger/masterBart Visscher2013-05-031-1/+13
|\ \ \ \ | | | | | | | | | | Translations for themes
| * | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | improved handling of xsendfile zip generation race condition
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | fix bug that would only return error responses for 3rdparty apps
| * | | | | 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 formats
| * | | | | fixing mimetype for "new" ms office formatsmiicha2013-04-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | right mime types for docx, pptx and xlsx with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
* | | | | | Merge pull request #3212 from owncloud/stop-linksMorris Jobke2013-05-021-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't display shared links if disabled
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | ignore themes
| * | | | | | 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 files
| * | | | | 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 root
| * | | | | | 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 backend
| * | | | | | | 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.
| * | | | | | | | 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 ↵FlorinPeter2013-04-301-86/+309
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/trashbin_for_encryption_keys_against_master Trashbin for encryption keys now against master
| * | | | | | | delete and restore of versions and share-keys now worksFlorin Peter2013-04-281-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix restore of the same file name
| * | | | | | | added handling for share-keysFlorin Peter2013-04-281-13/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180
| * | | | | | | 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
| * | | | | | | fix for infinite loop causing on files_encryption branch when testing ↵Florin Peter2013-04-292-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-30118-631/+852
|/ / / / / /
* | | | | | Merge pull request #3159 from owncloud/rewordJan-Christoph Borchardt2013-04-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reword sentence and move HTML out of translation