summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-05-1226-84/+208
|
* rename a file if it gets restored so that it no longer exists as a version. ↵Björn Schießle2013-05-081-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 ignoredBjörn Schießle2013-05-081-4/+5
|
* Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-appBart Visscher2013-05-0710-42/+42
|\ | | | | Use === and !== in user_ldap app
| * Use !== and === in user_ldap app – Part 2kondou2013-04-205-23/+23
| |
| * Use !== and === in user_ldap app – Part 1kondou2013-04-205-19/+19
| |
* | Merge pull request #3044 from owncloud/backgroundwatchericewind19912013-05-071-1/+3
|\ \ | | | | | | Add a background job to watch for external filesystem changes
| * | Cache: add a backgroundjob to check for external changes to the filesystemRobin Appelman2013-04-201-1/+3
| | |
* | | Merge pull request #3246 from owncloud/newfile-mimetypeMorris Jobke2013-05-072-3/+3
|\ \ \ | | | | | | | | Files: set the proper mimetype when creating a new text file
| * | | Files: set the proper mimetype when creating a new text fileRobin Appelman2013-05-062-3/+3
| | | |
* | | | 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
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-042-0/+2
| | |
* | | 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-032-5/+26
|\ \ \ \ | |/ / / |/| | | Fix retrieving of mount points for shared storage, fix #3218
| * | | Fix retrieving of mount points for shared storage, fix #3218Michael Gapczynski2013-05-022-5/+26
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-032-5/+13
| | | |
* | | | 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 #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-023-0/+7
| | |
* | | 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
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-016-4/+14
| | | | |
* | | | | 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
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-303-3/+60
| | | | |
* | | | | Merge pull request #3160 from owncloud/remove-onclickMorris Jobke2013-04-292-2/+6
|\ \ \ \ \ | | | | | | | | | | | | Remove onclick
| * | | | | It's a classLukas Reschke2013-04-281-1/+1
| | | | | |
| * | | | | Remove uneeded onclick handlerLukas Reschke2013-04-281-1/+1
| | | | | |
| * | | | | Move onclick handlerLukas Reschke2013-04-282-1/+5
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-292-0/+2
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-285-2/+13
|/ / / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2013-04-27123-389/+461
|/ / /
* | | Merge pull request #3136 from owncloud/mount-cleanupicewind19912013-04-262-2/+2
|\ \ \ | | | | | | | | Separation of mount management
| * | | Further seperation of mount management logicRobin Appelman2013-04-262-2/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-266-3/+24
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-256-0/+7
| | |
* | | Merge pull request #3108 from owncloud/fileactions-orderLukas Reschke2013-04-241-7/+7
|\ \ \ | | | | | | | | Files: fix the order fileactions are computed for a file