summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Properly quote file names in listFiles query for GDrive"Lukas Reschke2015-03-311-2/+2
|
* Merge pull request #15215 from owncloud/ext-gdrivelistfilequotingFrank Karlitschek2015-03-311-2/+2
|\ | | | | Properly quote file names in listFiles query for GDrive
| * Added rawurlencode for other params in GDrive storageVincent Petry2015-03-261-2/+2
| |
| * Properly quote file names in listFiles query for GDriveVincent Petry2015-03-261-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-3114-36/+62
| |
* | Merge pull request #15312 from owncloud/activity-fix-compilationLukas Reschke2015-03-301-12/+7
|\ \ | | | | | | Correct the app name for sharing events
| * | Correct the app name for sharing eventsJoas Schilling2015-03-301-12/+7
| | |
* | | Merge pull request #15076 from owncloud/fix-smb-oc-adminRobin McCorkell2015-03-301-4/+11
|\ \ \ | |/ / |/| | Support constructing an SMB_OC without saved session credentials
| * | Support constructing an SMB_OC without saved session credentialsRobin McCorkell2015-03-201-4/+11
| | |
* | | Merge pull request #13964 from rullzer/capabilitiesMorris Jobke2015-03-303-0/+280
|\ \ \ | | | | | | | | Add OCS sharing info to capabilities - take 2
| * | | 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
| | | | | | | | | | | | | | | | This change allows for more generic parsing for the capabilities.
| * | | Added route againRoeland Jago Douma2015-03-111-0/+6
| | | |
| * | | Add file_sharing info to capabilitiesRoeland Jago Douma2015-03-112-0/+282
| | | | | | | | | | | | | | | | | | | | Display the capabilities regarding file sharing in the capabilities API. This will allow the clients to provide users a better experince.
* | | | Merge pull request #15239 from owncloud/see-no-evilMorris Jobke2015-03-301-14/+16
|\ \ \ \ | | | | | | | | | | Move federated cloud sharing, files externals and updater to special pos...
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig
| * | | | | 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
| * | | | | | 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 calls
| * | | | | | | 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 scrollbar
| * | | | | | | 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 folder
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Mount options GUI for external storage
| * | | | | | | Make sure mountOptions keep their data typeVincent Petry2015-03-262-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | str_replace for $user substitution was converting the data type of mountOptions to string. This fix prevents this to happen by making sure only strings are processed by substitution. Also added a int conversion when reading the watcher policy
| * | | | | | | Added ext storage mount options GUIVincent Petry2015-03-264-21/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option to disable autoscan of external storages Mount option file system scan is now an int Move priority field to avoid undefined field in storage options All input elements inside the storage options block get parsed into storage options. Moving the priority field outside prevents it to appear in the storage config, as expected. It is still parsed by special code.
* | | | | | | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-263-20/+208
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix share permission checks
| * | | | | | | Fix share permission related unit testsVincent Petry2015-03-201-9/+13
| | | | | | | |
| * | | | | | | Rename must be possible with update-only permissionVincent Petry2015-03-191-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and this as long as the rename is done within the same folder.
| * | | | | | | Reenable trashbin after failed renameVincent Petry2015-03-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a failed rename, the post_rename hook is not called. This quickfix makes sure the trashbin storage logic is reenabled also after a failed rename.
| * | | | | | | 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 a hook
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | core part of encryption 2.0
| * | | | | | | | | implement basic encryption functionallity in core to enable multiple ↵Bjoern Schiessle2015-03-264-0/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption modules
* | | | | | | | | | Merge pull request #15237 from owncloud/remove-ide-autocomplete-failThomas Müller2015-03-261-1/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove IDE autocomplete fail
| * | | | | | | | | | Remove IDE autocomplete failLukas Reschke2015-03-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :see_no_evil: *cough* *cough*