summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14925 from owncloud/ext-mountoptions-uiRobin McCorkell2015-03-269-28/+366
|\
| * Make sure mountOptions keep their data typeVincent Petry2015-03-263-7/+63
| * Added ext storage mount options GUIVincent Petry2015-03-266-21/+303
* | Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9Jan-Christoph Borchardt2015-03-262-1/+12
|\ \
| * | fix enforced password for share in IE8Morris Jobke2015-03-261-0/+5
| * | Don't use placeholder for password in IE8 & 9Morris Jobke2015-03-261-1/+7
* | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-265-28/+225
|\ \ \
| * | | Fix share permission related unit testsVincent Petry2015-03-202-11/+15
| * | | Rename must be possible with update-only permissionVincent Petry2015-03-191-17/+23
| * | | Fix permission checks in Sabre connectorVincent Petry2015-03-191-6/+15
| * | | Reenable trashbin after failed renameVincent Petry2015-03-181-0/+16
| * | | Fix shared storage permission checksVincent Petry2015-03-182-4/+166
* | | | Merge pull request #14488 from owncloud/enhancement/security/inline-dispositionMorris Jobke2015-03-261-0/+19
|\ \ \ \
| * | | | Remove unneeded argumentLukas Reschke2015-03-261-1/+1
| * | | | Serve all files with a Content-Disposition of 'attachment' via WebDAVLukas Reschke2015-03-261-0/+19
| | |/ / | |/| |
* | | | Merge pull request #15001 from owncloud/kill-share-proxyThomas Müller2015-03-267-79/+23
|\ \ \ \
| * | | | replace share proxy with hookRobin Appelman2015-03-267-74/+18
| * | | | rename proxy testRobin Appelman2015-03-261-7/+7
| |/ / /
* | | | Merge pull request #15234 from owncloud/encryption2_coreThomas Müller2015-03-2628-2/+2980
|\ \ \ \
| * | | | implement basic encryption functionallity in core to enable multiple encrypti...Bjoern Schiessle2015-03-2628-2/+2980
* | | | | Merge pull request #15237 from owncloud/remove-ide-autocomplete-failThomas Müller2015-03-261-1/+0
|\ \ \ \ \
| * | | | | Remove IDE autocomplete failLukas Reschke2015-03-261-1/+0
* | | | | | Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-masterMorris Jobke2015-03-261-0/+4
|\ \ \ \ \ \
| * | | | | | no php execution timeout for webdavThomas Müller2015-03-261-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #14399 from owncloud/ignore-empty-pluralsLukas Reschke2015-03-265-43/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Revert "Correctly fallback to english, if the plural case is not translated"Joas Schilling2015-02-204-41/+4
| * | | | | Ignore empty plurals just like with singularsJoas Schilling2015-02-201-2/+3
* | | | | | Merge pull request #15129 from owncloud/version-command-busLukas Reschke2015-03-267-10/+132
|\ \ \ \ \ \
| * | | | | | teardown after we're doneRobin Appelman2015-03-261-0/+1
| * | | | | | save uid instead of user object in commandRobin Appelman2015-03-262-5/+5
| * | | | | | check limit of serialized command in unit testsRobin Appelman2015-03-261-0/+3
| * | | | | | ensure commands can be serialized in unit testsRobin Appelman2015-03-261-1/+4
| * | | | | | Setup the filesystem in the expire commandRobin Appelman2015-03-263-4/+24
| * | | | | | Handle exceptions thrown during hooks when running unit testsRobin Appelman2015-03-262-0/+11
| * | | | | | Force test cases using background commands to handle setting up the filesystemRobin Appelman2015-03-263-3/+22
| * | | | | | expire versions in a background commandRobin Appelman2015-03-262-5/+70
* | | | | | | Merge pull request #15232 from owncloud/remove-arg-separator-magicLukas Reschke2015-03-261-1/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove custom `arg_separator.output`Lukas Reschke2015-03-261-1/+0
* | | | | | | Merge pull request #14665 from owncloud/fileid-incrementMorris Jobke2015-03-267-1/+218
|\ \ \ \ \ \ \
| * | | | | | | Add repair step to fix SQLite autoincrementVincent Petry2015-03-263-0/+168
| * | | | | | | Rename platformRobin Appelman2015-03-252-2/+2
| * | | | | | | triger db upgrade to set autoincrement for sqliteRobin Appelman2015-03-251-1/+1
| * | | | | | | Add custom sqlite platform to set auto incrementRobin Appelman2015-03-252-0/+36
| * | | | | | | SQLite autoincrement testVincent Petry2015-03-251-0/+13
* | | | | | | | Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricksThomas Müller2015-03-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add navigation entry for tips and tricks setionJoas Schilling2015-03-261-0/+1
* | | | | | | | | Merge pull request #15230 from owncloud/sqlite-noticeJan-Christoph Borchardt2015-03-261-11/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | move SQLite notice from warnings to tips & tricksJan-Christoph Borchardt2015-03-261-11/+10
* | | | | | | | | | Merge pull request #14958 from owncloud/dropdown-styleJan-Christoph Borchardt2015-03-2614-73/+147
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mock up missing elements in the testsJan-Christoph Borchardt2015-03-262-2/+5
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 14:31:54 +0000