summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sync-masterMorris Jobke2016-07-07471-1177/+7650
|\
| * [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
| | |\
| * | | 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 #235 from nextcloud/fix-app-codeMarius Blüm2016-06-278-18/+0
| |\ \ \ \
| | * | | | Add app:check-code for already compatible appsMorris Jobke2016-06-278-18/+0
| * | | | | Merge pull request #59 from nextcloud/theming-appLukas Reschke2016-06-2714-0/+4041
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | 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
| | * | | | Fix indentationLukas Reschke2016-06-271-3/+3
| | * | | | Migrate logic to dynamic controllerLukas Reschke2016-06-2711-224/+955
| | * | | | add some visual feedback if the operation was succesful or notBjoern Schiessle2016-06-274-16/+82
| | * | | | write theme settings to databaseBjoern Schiessle2016-06-2712-8/+3082
| | * | | | basic information architecture for the theming appJan-Christoph Borchardt2016-06-272-3/+20
| | * | | | initial commit for the theming appBjoern Schiessle2016-06-276-0/+96
| | |/ / /
| * | | | Merge pull request #233 from nextcloud/allow-users-to-change-global-credentialsMorris Jobke2016-06-272-3/+216
| |\ \ \ \