aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Use DI for the objects where possibleJoas Schilling2015-03-302-7/+27
* Add a filter for favorites and allow limiting the all-list to favoritesJoas Schilling2015-03-301-2/+69
* Correct the app name for sharing eventsJoas Schilling2015-03-301-12/+7
* Merge pull request #13964 from rullzer/capabilitiesMorris Jobke2015-03-303-0/+280
|\
| * Mark functions privateRoeland Jago Douma2015-03-111-2/+2
| * Slight better formattingRoeland Jago Douma2015-03-112-47/+11
| * New array syntaxRoeland Jago Douma2015-03-112-56/+56
| * Added new headerRoeland Jago Douma2015-03-112-11/+35
| * Now added enabled elementRoeland Jago Douma2015-03-112-9/+13
| * Added route againRoeland Jago Douma2015-03-111-0/+6
| * Add file_sharing info to capabilitiesRoeland Jago Douma2015-03-112-0/+282
* | Merge pull request #15239 from owncloud/see-no-evilMorris Jobke2015-03-301-14/+16
|\ \
| * | fix layout for Sharing settingsJan-Christoph Borchardt2015-03-271-13/+15
| * | Move federated cloud sharing, files externals and updater to special positionsJoas Schilling2015-03-271-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-302-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-298-4/+12
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2852-4/+104
* | | Merge pull request #13938 from owncloud/deprecate-iappconfigThomas Müller2015-03-271-5/+15
|\ \ \
| * | | fix unit testsMorris Jobke2015-03-171-5/+15
* | | | Merge pull request #15254 from owncloud/fix-14853-masterThomas Müller2015-03-272-11/+60
|\ \ \ \
| * | | | Adding a pending indicator to the files summary - fixes #14853Thomas Müller2015-03-272-11/+60
* | | | | Merge pull request #15227 from owncloud/ocetag-headerVincent Petry2015-03-271-0/+1
|\ \ \ \ \
| * | | | | Copy Etag header to OC-Etag for sabre callsVincent Petry2015-03-261-0/+1
* | | | | | Merge pull request #15260 from owncloud/adjust-controls-bar-widthMorris Jobke2015-03-271-1/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | adjust controls bar width to not overlay scrollbarJan-Christoph Borchardt2015-03-271-1/+6
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-27336-696/+24
|/ / / / /
* | | | | 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