summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-06260-535/+743
* Replace tag svg with optimized versionBugsbane2016-07-051-79/+3
* Update system tags iconBugsbane2016-07-052-3/+79
* Merge pull request #309 from Faldon/masterBjörn Schießle2016-07-051-1/+1
|\
| * 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 objec...Thomas Pulzer2016-07-041-1/+1
* | Merge pull request #306 from nextcloud/sidebar-preview-textMarius Blüm2016-07-045-87/+193
|\ \ | |/ |/|
| * 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
|\ \
| * | 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
|\
| * 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
| | * [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 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
| | * handle unavailable fed shares while testing for availability (#25277)Robin Appelman2016-06-271-2/+17
| | * 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
|/ /
* | Merge pull request #255 from nextcloud/dav-permission-checkBjörn Schießle2016-06-302-3/+49
|\ \
| * | 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
* | 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
|\ \
| * | 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 storagesVincent Petry2016-06-271-0/+4
| | * | Merge pull request #25237 from owncloud/search-filelistnextpageresultsVincent Petry2016-06-272-4/+29
| | |\ \
| | | * | Prerender file list pages to include search resultsVincent Petry2016-06-242-4/+29
| | * | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-273-16/+98
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Add explicit delete permission to link sharesVincent Petry2016-06-243-16/+98
| | * | | 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 se...Robin Appelman2016-06-231-2/+2
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-276-0/+14