summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #275 from nextcloud/master-sync-upstreamBjörn Schießle2016-07-0145-19/+290
|\ | | | | [Master] Sync upstream
| * Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-0145-19/+290
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-07-012-0/+2
| | |
| | * Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading the next page of search results, make sure that the loop can end if there are no more elements in case the total doesn't match. Also added a check to avoid recomputing the search results whenever the setFilter() is called with the same value. This happens when navigating away to another folder, the search field gets cleared automatically and it calls FileList.setFilter('').
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-304-0/+18
| | |
| | * Merge pull request #25288 from owncloud/fix-versionrevertpermsVincent Petry2016-06-294-2/+78
| | |\ | | | | | | | | Hide revert button when no permission to revert
| | | * Hide revert button when no permission to revertVincent Petry2016-06-284-2/+78
| | | |
| | * | get only vcards which match both the address book id and the vcard uri (#25294)Björn Schießle2016-06-292-1/+5
| | | |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2912-2/+34
| | |/
| | * [tx-robot] updated from transifexJenkins for ownCloud2016-06-2820-2/+120
| | |
| | * Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-271-1/+1
| | | | | | | | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage
| | * handle unavailable fed shares while testing for availability (#25277)Robin Appelman2016-06-271-2/+17
| | | | | | | | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability
| | * fix a ImageExportPlugin Test (#25215)Georg Ehrke2016-06-272-8/+15
| | |
* | | Match on 405Lukas Reschke2016-07-012-1/+6
| | |
* | | Match for /../Lukas Reschke2016-07-012-1/+5
| | |
* | | Do not allow directory traversal using "../"Lukas Reschke2016-07-012-1/+5
|/ / | | | | | | | | | | | | | | We should not allow directory traversals using "../" here. To test access the following URL once with and then without this patch: http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
* | Merge pull request #255 from nextcloud/dav-permission-checkBjörn Schießle2016-06-302-3/+49
|\ \ | | | | | | add some additonal permission checks to the webdav backend
| * | fix error messageBjoern Schiessle2016-06-301-1/+1
| | |
| * | Fix testsLukas Reschke2016-06-301-0/+20
| | |
| * | Add proper throws PHP docsLukas Reschke2016-06-301-2/+13
| | |
| * | Add required $message parameterLukas Reschke2016-06-301-2/+2
| | |
| * | add some additonal permission checks to the webdav backendBjoern Schiessle2016-06-301-1/+16
| | |
* | | check permissions before rollbackBjoern Schiessle2016-06-301-5/+11
|/ /
* | Fix update notification textMorris Jobke2016-06-291-1/+3
| | | | | | | | * thanks to ungesundes_halbwissen @ transifex
* | get only vcard which match both the address book id and the vcard uriBjoern Schiessle2016-06-282-1/+6
| |
* | Merge pull request #236 from nextcloud/master-sync-upstreamMorris Jobke2016-06-2813-23/+147
|\ \ | | | | | | [Master] sync upstream
| * | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2713-23/+147
| |\|
| | * Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyloadVincent Petry2016-06-271-0/+4
| | |\ | | | | | | | | Quickfix: do not lazy load auth mechanisms for ext storages
| | | * Quickfix: do not lazy load auth mechanisms for ext storagesVincent Petry2016-06-271-0/+4
| | | | | | | | | | | | | | | | | | | | Some auth mechanisms like SessionCredentials need to register hooks early, so they cannot be lazy loaded.
| | * | Merge pull request #25237 from owncloud/search-filelistnextpageresultsVincent Petry2016-06-272-4/+29
| | |\ \ | | | | | | | | | | Prerender file list pages to include search results
| | | * | Prerender file list pages to include search resultsVincent Petry2016-06-242-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering the file list, if a result is on an unrendered page, make sure to call _nextPage() to prerender the pages in order to display all matching results.
| | * | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-273-16/+98
| | |\ \ \ | | | |_|/ | | |/| | Add explicit delete permission to link shares
| | | * | Add explicit delete permission to link sharesVincent Petry2016-06-243-16/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15.
| | * | | Merge pull request #25247 from owncloud/fed-unshare-failVincent Petry2016-06-271-2/+2
| | |\ \ \ | | | | | | | | | | | | Remove a fed share from the local table before trying to notify the remote server
| | | * | | Remove a fed share from the local table before trying to notify the remote ↵Robin Appelman2016-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | server
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-276-0/+14
| | | | | |
* | | | | | Merge pull request #235 from nextcloud/fix-app-codeMarius Blüm2016-06-278-18/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add app:check-code for already compatible apps
| * | | | | | Add app:check-code for already compatible appsMorris Jobke2016-06-278-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * admin_audit, comments, federation * removed not needed call to OC_Util::checkAdminUser() (is already done by the request handler before)
* | | | | | | Merge pull request #59 from nextcloud/theming-appLukas Reschke2016-06-2714-0/+4041
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Theming app
| * | | | | | Only save when value changed or enter is pressedLukas Reschke2016-06-271-9/+15
| | | | | | |
| * | | | | | Add tooltipLukas Reschke2016-06-272-6/+7
| | | | | | |
| * | | | | | Add comment to "getMailHeaderColor"Lukas Reschke2016-06-271-0/+5
| | | | | | |
| * | | | | | Use stream instead of renameLukas Reschke2016-06-272-14/+45
| | | | | | |
| * | | | | | Replace OC_Defaults with \OC::$server->getThemingDefaults()Lukas Reschke2016-06-271-6/+1
| | | | | | |
| * | | | | | design and layout fixes for Theming appJan-Christoph Borchardt2016-06-272-15/+29
| | | | | | |
| * | | | | | make sure that the preview gets updated every time a new image gets uploadedBjoern Schiessle2016-06-271-2/+3
| | | | | | |
| * | | | | | scale preview imageBjoern Schiessle2016-06-271-3/+5
| | | | | | |
| * | | | | | Disable drop zoneLukas Reschke2016-06-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise dropping something somewhere can by mistake upload the file and make it available
| * | | | | | Fix indentationLukas Reschke2016-06-271-3/+3
| | | | | | |
| * | | | | | Migrate logic to dynamic controllerLukas Reschke2016-06-2711-224/+955
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds support for having custom login backgrounds