summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Replace tag svg with optimized versionBugsbane2016-07-051-79/+3
| | | Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour)
* Update system tags iconBugsbane2016-07-052-3/+79
| | | Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG.
* Merge pull request #309 from Faldon/masterBjörn Schießle2016-07-051-1/+1
|\ | | | | Changed the creation of the update notification link
| * Added escaping html code when building link to documentation.Thomas Pulzer2016-07-051-1/+1
| |
| * Changed the creation of the update notification link to generate the js ↵Thomas Pulzer2016-07-041-1/+1
| | | | | | | | object from concated string.
* | Merge pull request #306 from nextcloud/sidebar-preview-textMarius Blüm2016-07-045-87/+193
|\ \ | |/ |/| Add large sidebar previews for text files
| * for text use max-height to trim whitespaceMorris Jobke2016-07-041-1/+1
| |
| * adjust padding of text previewMorris Jobke2016-07-041-2/+3
| |
| * Add large sidebar previews for text filesRobin Appelman2016-07-044-10/+83
| |
| * Factor out handling sidebar previewsRobin Appelman2016-07-043-81/+113
| |
* | Merge pull request #305 from Faldon/masterLukas Reschke2016-07-042-2/+2
|\ \ | | | | | | Changing name of default logfile
| * | Changed name of default logfile from owncloud.log to nextcloud.log.Thomas Pulzer2016-07-042-2/+2
| |/
* / we don't need to check permissions twiceBjoern Schiessle2016-07-041-4/+2
|/
* 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