Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix #3251 | kondou | 2013-05-09 | 1 | -2/+3 |
* | Merge pull request #3230 from owncloud/fix_ldap_cachekey | Bart Visscher | 2013-05-03 | 1 | -1/+1 |
|\ | |||||
| * | LDAP: cachekey in set method needs to match with that one from get | Arthur Schiwon | 2013-05-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3229 from owncloud/fix_3210 | Bart Visscher | 2013-05-03 | 1 | -1/+1 |
|\ | |||||
| * | LDAP: remove restriction from group names to be in line with core behaviour a... | Arthur Schiwon | 2013-05-03 | 1 | -1/+1 |
* | | Merge pull request #3222 from owncloud/fix-3218 | Bart Visscher | 2013-05-03 | 4 | -7/+31 |
|\ \ | |||||
| * | | One more mount point fix | Michael Gapczynski | 2013-05-02 | 1 | -1/+4 |
| * | | Fix retrieving of mount points for shared storage, fix #3218 | Michael Gapczynski | 2013-05-02 | 3 | -6/+27 |
* | | | Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages | Bart Visscher | 2013-05-03 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Sort priorized languages as defined in the array | kondou | 2013-05-01 | 1 | -3/+4 |
* | | | | Merge pull request #2972 from AndreasErgenzinger/master | Bart Visscher | 2013-05-03 | 1 | -1/+13 |
|\ \ \ \ | |||||
| * | | | | additional safety checks | AndreasErgenzinger | 2013-04-17 | 1 | -1/+3 |
| * | | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -9/+10 |
| * | | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -0/+9 |
* | | | | | Merge pull request #2491 from riso/xsendfile_fix_zip | Bart Visscher | 2013-05-03 | 2 | -20/+22 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | fixed xsendfile zip generation race condition | Valerio Ponte | 2013-03-20 | 2 | -20/+22 |
* | | | | | Fix retrieval of users with multiple backends | Arthur Schiwon | 2013-05-03 | 2 | -5/+16 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-03 | 19 | -43/+56 |
* | | | | | Merge pull request #3216 from owncloud/fix-api-3rdparty | Tom Needham | 2013-05-02 | 1 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | respect format output | Bernhard Posselt | 2013-05-02 | 1 | -2/+3 |
| * | | | | | logout before output to not run into header already sent problems | Bernhard Posselt | 2013-05-02 | 1 | -1/+2 |
| * | | | | | fix bug that would only return error responses for 3rdparty apps | Bernhard Posselt | 2013-05-02 | 1 | -1/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #3183 from miicha/patch-1 | Thomas Müller | 2013-05-02 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | fixing mimetype for "new" ms office formats | miicha | 2013-04-30 | 1 | -3/+3 |
* | | | | | | Merge pull request #3212 from owncloud/stop-links | Morris Jobke | 2013-05-02 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't display shared links if disabled | Michael Gapczynski | 2013-05-01 | 1 | -0/+7 |
* | | | | | | | Merge pull request #3220 from owncloud/gitignore-themes | Frank Karlitschek | 2013-05-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | don't ignore themes README | Jan-Christoph Borchardt | 2013-05-02 | 1 | -1/+2 |
| * | | | | | | ignore themes | Jan-Christoph Borchardt | 2013-05-02 | 1 | -0/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3211 from owncloud/fix-2816 | Frank Karlitschek | 2013-05-02 | 1 | -5/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix #2816 renaming shared files | Michael Gapczynski | 2013-05-01 | 1 | -5/+3 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-02 | 55 | -127/+4921 |
* | | | | | | Merge pull request #3147 from owncloud/storage-mkdir-root | Michael Gapczynski | 2013-05-01 | 10 | -46/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Dont task external storages with creating their own root | Robin Appelman | 2013-04-26 | 10 | -46/+10 |
* | | | | | | | Merge pull request #3202 from owncloud/swift_id | Frank Karlitschek | 2013-05-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Set storage id for openstack swift backend | Robin Appelman | 2013-05-01 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #3203 from qzio/patch-1 | Morris Jobke | 2013-05-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | typo fix in a comment. | joel hansson | 2013-05-01 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-01 | 56 | -209/+253 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_m... | FlorinPeter | 2013-04-30 | 1 | -86/+309 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | delete and restore of versions and share-keys now works | Florin Peter | 2013-04-28 | 1 | -20/+37 |
| * | | | | | | | added handling for share-keys | Florin Peter | 2013-04-28 | 1 | -13/+88 |
| * | | | | | | | restore fixed | Florin Peter | 2013-04-28 | 1 | -22/+40 |
| * | | | | | | | fixed some problems and broken code | Florin Peter | 2013-04-28 | 1 | -42/+83 |
| * | | | | | | | restore encryption keys from trash bin (development snapshot) | Björn Schießle | 2013-04-28 | 1 | -45/+72 |
| * | | | | | | | move encryption keys to trash bin | Björn Schießle | 2013-04-28 | 1 | -31/+76 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache | FlorinPeter | 2013-04-29 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix for infinite loop causing on files_encryption branch when testing "apps/f... | Florin Peter | 2013-04-29 | 2 | -2/+2 |
| | |_|_|/ / / | |/| | | | | | |||||
* / | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-30 | 118 | -631/+852 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3159 from owncloud/reword | Jan-Christoph Borchardt | 2013-04-29 | 1 | -1/+1 |
|\ \ \ \ \ \ |