summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* adjust emptycontent messages for files and files_externalJan-Christoph Borchardt2015-03-262-2/+2
* 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-266-27/+345
|\ \
| * | Make sure mountOptions keep their data typeVincent Petry2015-03-262-6/+62
| * | Added ext storage mount options GUIVincent Petry2015-03-264-21/+283
* | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-263-20/+208
|\ \ \ | |_|/ |/| |
| * | Fix share permission related unit testsVincent Petry2015-03-201-9/+13
| * | Rename must be possible with update-only permissionVincent Petry2015-03-191-17/+23
| * | Reenable trashbin after failed renameVincent Petry2015-03-181-0/+16
| * | Fix shared storage permission checksVincent Petry2015-03-182-4/+166
* | | 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-264-0/+172
|\ \ \ \
| * | | | implement basic encryption functionallity in core to enable multiple encrypti...Bjoern Schiessle2015-03-264-0/+172
* | | | | 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 #15129 from owncloud/version-command-busLukas Reschke2015-03-263-6/+92
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | teardown after we're doneRobin Appelman2015-03-261-0/+1
| * | | | save uid instead of user object in commandRobin Appelman2015-03-262-5/+5
| * | | | Setup the filesystem in the expire commandRobin Appelman2015-03-263-4/+24
| * | | | expire versions in a background commandRobin Appelman2015-03-262-5/+70
* | | | | Merge pull request #14958 from owncloud/dropdown-styleJan-Christoph Borchardt2015-03-261-3/+4
|\ \ \ \ \
| * | | | | adjust animations of Share, Versions and others to OC.menuSpeedJan-Christoph Borchardt2015-03-261-3/+4
* | | | | | Merge pull request #14495 from owncloud/update-mailmap-01Thomas Müller2015-03-26288-2474/+5364
|\ \ \ \ \ \
| * | | | | | Update license headersJenkins for ownCloud2015-03-26288-2474/+5364
| | |_|/ / / | |/| | | |
* | | | | | Revert "add https:// placeholder for From Link feature. closes #13255"Robin McCorkell2015-03-261-1/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #15206 from owncloud/mark-dot-files-grayThomas Müller2015-03-262-1/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Show hidden files (dot files) in grayMorris Jobke2015-03-262-1/+24
* | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-264-29/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add wrapper for GuzzleLukas Reschke2015-03-254-29/+17
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-268-4/+32
| |/ / / |/| | |
* | | | Merge pull request #15170 from owncloud/middleclickbreadcrumbMorris Jobke2015-03-262-4/+4
|\ \ \ \
| * | | | Fix breadcrumb click JS unit testVincent Petry2015-03-251-2/+2
| * | | | Fix middle click on breadcrumbVincent Petry2015-03-241-2/+2
* | | | | Merge pull request #15185 from owncloud/fix-14775-masterVincent Petry2015-03-251-0/+1
|\ \ \ \ \
| * | | | | tearDown the file system before reinitializing - fixes #14775Thomas Müller2015-03-251-0/+1
* | | | | | Merge pull request #15180 from owncloud/ext-tabbingMorris Jobke2015-03-251-30/+21
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use individual timers for separate config rowsRobin McCorkell2015-03-241-30/+21
* | | | | | Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldeleteVincent Petry2015-03-251-0/+2
|\ \ \ \ \ \
| * | | | | | Recreate trashbin folder after full deletionVincent Petry2015-03-241-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #14970 from owncloud/sidebar-enhancementsJan-Christoph Borchardt2015-03-251-2/+8
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | double padding to account for Deleted files entry, issue with FirefoxJan-Christoph Borchardt2015-03-241-0/+4
| * | | | | fix position of 'Deleted files' sidebar entry, fix #10815Jan-Christoph Borchardt2015-03-181-2/+4
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2514-2/+22
| |_|/ / / |/| | | |
* | | | | Merge pull request #15055 from owncloud/share-activity-groupingMorris Jobke2015-03-241-0/+14
|\ \ \ \ \
| * | | | | Group sharing activities by user/group and file respectivelyJoas Schilling2015-03-201-0/+14
| | |_|_|/ | |/| | |