Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-12 | 26 | -84/+208 |
| | |||||
* | rename a file if it gets restored so that it no longer exists as a version. ↵ | Björn Schießle | 2013-05-08 | 1 | -1/+1 |
| | | | | Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file | ||||
* | touch file relative to users file folder, otherwise the hooks will be ignored | Björn Schießle | 2013-05-08 | 1 | -4/+5 |
| | |||||
* | Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app | Bart Visscher | 2013-05-07 | 10 | -42/+42 |
|\ | | | | | Use === and !== in user_ldap app | ||||
| * | Use !== and === in user_ldap app – Part 2 | kondou | 2013-04-20 | 5 | -23/+23 |
| | | |||||
| * | Use !== and === in user_ldap app – Part 1 | kondou | 2013-04-20 | 5 | -19/+19 |
| | | |||||
* | | Merge pull request #3044 from owncloud/backgroundwatcher | icewind1991 | 2013-05-07 | 1 | -1/+3 |
|\ \ | | | | | | | Add a background job to watch for external filesystem changes | ||||
| * | | Cache: add a backgroundjob to check for external changes to the filesystem | Robin Appelman | 2013-04-20 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #3246 from owncloud/newfile-mimetype | Morris Jobke | 2013-05-07 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | Files: set the proper mimetype when creating a new text file | ||||
| * | | | Files: set the proper mimetype when creating a new text file | Robin Appelman | 2013-05-06 | 2 | -3/+3 |
| | | | | |||||
* | | | | Use $dir instead of $fullpath | Lukas Reschke | 2013-05-06 | 1 | -2/+1 |
| | | | | |||||
* | | | | Use the internal ownCloud view | Lukas Reschke | 2013-05-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | LDAP: do not reset UUID attribute setting when guid is detected | Arthur Schiwon | 2013-05-06 | 1 | -1/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-04 | 2 | -0/+2 |
| | | | |||||
* | | | 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 behavi... | ||||
| * | | | LDAP: remove restriction from group names to be in line with core behaviour ↵ | Arthur Schiwon | 2013-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | again | ||||
* | | | | Merge pull request #3222 from owncloud/fix-3218 | Bart Visscher | 2013-05-03 | 2 | -5/+26 |
|\ \ \ \ | |/ / / |/| | | | Fix retrieving of mount points for shared storage, fix #3218 | ||||
| * | | | Fix retrieving of mount points for shared storage, fix #3218 | Michael Gapczynski | 2013-05-02 | 2 | -5/+26 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-03 | 2 | -5/+13 |
| | | | | |||||
* | | | | Merge pull request #3212 from owncloud/stop-links | Morris Jobke | 2013-05-02 | 1 | -0/+7 |
|\ \ \ \ | |/ / / |/| | | | Don't display shared links if disabled | ||||
| * | | | Don't display shared links if disabled | Michael Gapczynski | 2013-05-01 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #3211 from owncloud/fix-2816 | Frank Karlitschek | 2013-05-02 | 1 | -5/+3 |
|\ \ \ \ | |/ / / |/| | | | Fix #2816 renaming shared files | ||||
| * | | | Fix #2816 renaming shared files | Michael Gapczynski | 2013-05-01 | 1 | -5/+3 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-02 | 3 | -0/+7 |
| | | | |||||
* | | | 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 | ||||
| * | | | 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 | ||||
| * | | | | Set storage id for openstack swift backend | Robin Appelman | 2013-05-01 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-01 | 6 | -4/+14 |
| | | | | | |||||
* | | | | | Merge pull request #3156 from ↵ | FlorinPeter | 2013-04-30 | 1 | -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 works | Florin Peter | 2013-04-28 | 1 | -20/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | fix restore of the same file name | ||||
| * | | | | | added handling for share-keys | Florin Peter | 2013-04-28 | 1 | -13/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180 | ||||
| * | | | | | 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 |
| |/ / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-30 | 3 | -3/+60 |
| | | | | | |||||
* | | | | | Merge pull request #3160 from owncloud/remove-onclick | Morris Jobke | 2013-04-29 | 2 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove onclick | ||||
| * | | | | | It's a class | Lukas Reschke | 2013-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Remove uneeded onclick handler | Lukas Reschke | 2013-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Move onclick handler | Lukas Reschke | 2013-04-28 | 2 | -1/+5 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-29 | 2 | -0/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-28 | 5 | -2/+13 |
|/ / / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-27 | 123 | -389/+461 |
|/ / / | |||||
* | | | Merge pull request #3136 from owncloud/mount-cleanup | icewind1991 | 2013-04-26 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Separation of mount management | ||||
| * | | | Further seperation of mount management logic | Robin Appelman | 2013-04-26 | 2 | -2/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-26 | 6 | -3/+24 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-25 | 6 | -0/+7 |
| | | | |||||
* | | | Merge pull request #3108 from owncloud/fileactions-order | Lukas Reschke | 2013-04-24 | 1 | -7/+7 |
|\ \ \ | | | | | | | | | Files: fix the order fileactions are computed for a file |