summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add logout in share test to avoid nasty side effectsVincent Petry2015-03-271-0/+1
* Do not return shares for files outside "files"Vincent Petry2015-03-272-11/+87
* Merge pull request #15227 from owncloud/ocetag-headerVincent Petry2015-03-273-0/+90
|\
| * Copy Etag header to OC-Etag for sabre callsVincent Petry2015-03-263-0/+90
* | Merge pull request #15260 from owncloud/adjust-controls-bar-widthMorris Jobke2015-03-272-1/+61
|\ \
| * | fix scrutinizer issuesJan-Christoph Borchardt2015-03-271-6/+9
| * | adjust controls bar width to not overlay scrollbarJan-Christoph Borchardt2015-03-272-1/+58
* | | Merge pull request #15258 from owncloud/users-addtofilteredgroupMorris Jobke2015-03-271-0/+4
|\ \ \
| * | | Don't append user in a filtered list if groups don't matchVincent Petry2015-03-271-0/+4
* | | | Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-us...Morris Jobke2015-03-275-24/+38
|\ \ \ \
| * | | | Add some generic default headers as well via PHPLukas Reschke2015-03-265-24/+38
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-27632-1626/+358
| |_|/ / |/| | |
* | | | Merge pull request #15252 from owncloud/prevent-directory-characters-in-tempo...Thomas Müller2015-03-272-0/+18
|\ \ \ \
| * | | | Filter potential dangerous characters in path nameLukas Reschke2015-03-262-0/+18
* | | | | Merge pull request #15256 from owncloud/emptycontent-messagesThomas Müller2015-03-275-7/+7
|\ \ \ \ \
| * | | | | adjust shade of empty content icons, fix files icon shadeJan-Christoph Borchardt2015-03-263-5/+5
| * | | | | adjust emptycontent messages for files and files_externalJan-Christoph Borchardt2015-03-262-2/+2
| |/ / / /
* | | | | Merge pull request #15255 from owncloud/test-namespacesforrepairtestsMorris Jobke2015-03-274-4/+7
|\ \ \ \ \
| * | | | | Fix namespace for repair step testsVincent Petry2015-03-264-4/+7
| | |_|/ / | |/| | |
* | | | | Merge pull request #15245 from owncloud/fix-14864-masterThomas Müller2015-03-261-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | More elaborate command description for upgrade - fixes #14864Thomas Müller2015-03-261-1/+1
* | | | | Merge pull request #13654 from oparoz/tmpfile-with-extensionVincent Petry2015-03-263-9/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make the method compatible with all types of extensionsOlivier Paroz2015-03-192-7/+10
| * | | | Fix the office classOlivier Paroz2015-03-191-3/+7
| * | | | Keep the extension in temp filesOlivier Paroz2015-03-191-1/+1
* | | | | Merge pull request #15244 from owncloud/use_default_share_folderMorris Jobke2015-03-263-5/+20
|\ \ \ \ \
| * | | | | always fall back to default share folderBjoern Schiessle2015-03-263-5/+20
* | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |