summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11599 from nextcloud/feature/7136/workflow-engine-filenameMorris Jobke2018-10-083-0/+157
|\ | | | | Add FileName to Workflow engine
| * Fix typoDaniel Kesselberg2018-10-081-1/+1
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Ignore case for is and !isDaniel Kesselberg2018-10-051-4/+9
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Change placeholderDaniel Kesselberg2018-10-041-2/+2
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Remove unused importDaniel Kesselberg2018-10-041-2/+0
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Make code strictDaniel Kesselberg2018-10-031-2/+3
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Add FileName to Workflow engineDaniel Kesselberg2018-10-033-0/+153
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #11671 from nextcloud/refactor/rename-admin-security-sectionMorris Jobke2018-10-086-11/+11
|\ \ | | | | | | Rename admin security section
| * | Fix reference to template in testsChristoph Wurst2018-10-081-2/+2
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Rename admin security settings templateChristoph Wurst2018-10-082-1/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Rename admin security sectionChristoph Wurst2018-10-085-8/+8
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #10898 from ↵Morris Jobke2018-10-0827-53/+237
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/10684/default-logo-color-theme-colors Switches the default logo color depending on the primary color
| * | | Adapts the theming util to the new core logo image pathMichael Weimann2018-10-042-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | Fixes the logo testMichael Weimann2018-10-031-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | Refactors the scss svg functionsMichael Weimann2018-10-029-20/+185
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | Updates inverted logo handling to work like the app iconsMichael Weimann2018-10-025-162/+27
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | Moves the logo files to logoMichael Weimann2018-10-0219-41/+35
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | Switches the default logo color depending on the primary colorMichael Weimann2018-10-026-8/+168
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | Merge pull request #11620 from nextcloud/followup/11615Morris Jobke2018-10-086-9/+20
|\ \ \ \ | |_|/ / |/| | | Extract translated strings of compiled handlebars
| * | | Extract translated strings of compiled handlebarsRoeland Jago Douma2018-10-056-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | Follow up to #11615 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-10-082-0/+2
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-10-0724-68/+122
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-10-064-0/+34
| | | |
* | | | Merge pull request #11636 from nextcloud/deprecation/remove/publishActivityJoas Schilling2018-10-053-93/+0
|\ \ \ \ | |/ / / |/| | | Remove deprecated publishActivity function
| * | | Remove deprecated publishActivity functionRoeland Jago Douma2018-10-053-93/+0
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11624 from nextcloud/fix/11468/app-menu-scrollbarRoeland Jago Douma2018-10-051-1/+2
|\ \ \ | | | | | | | | Fixes the apps menu scrollbar
| * | | Fixes the apps menu scrollbarMichael Weimann2018-10-041-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | [tx-robot] updated from transifexNextcloud bot2018-10-05156-130/+328
|/ / /
* | | Merge pull request #11615 from nextcloud/followup/11583Roeland Jago Douma2018-10-0411-18/+17
|\ \ \ | | | | | | | | Remove leftover '
| * | | Remove leftover 'Roeland Jago Douma2018-10-0411-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | Followup to #11583 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11613 from nextcloud/add-missing-throw-statementMorris Jobke2018-10-041-1/+2
|\ \ \ \ | |/ / / |/| | | add missing throw statement to doc block
| * | | add missing throw statement to doc blockBjoern Schiessle2018-10-041-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #11611 from nextcloud/fix/10852Roeland Jago Douma2018-10-041-1/+1
|\ \ \ \ | | | | | | | | | | Allow userId to be null
| * | | | Allow userId to be nullRoeland Jago Douma2018-10-041-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #10852 A quick hack. Still ensures some type safety however now also accepts null. Else we'd need to add a whole new layer of middlewares. This can only happen when a guest user wants to access a controller that requries the user_id. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11583 from nextcloud/csp/more_moving_handlebarsMorris Jobke2018-10-0449-621/+1511
|\ \ \ \ | | | | | | | | | | Csp/more moving handlebars
| * | | | Move newfilemenu to compiled handlebarsRoeland Jago Douma2018-10-044-26/+52
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move files_versions to compiled handlebars templatesRoeland Jago Douma2018-10-047-46/+93
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move OC.Share to compiled handlebarsRoeland Jago Douma2018-10-0415-348/+927
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move sharetabview to compiled handlebarsRoeland Jago Douma2018-10-041-4/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move mainfileinfodetailsview to commpiled handlebarsRoeland Jago Douma2018-10-043-27/+69
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move fileactions to compiled handlebarsRoeland Jago Douma2018-10-043-16/+58
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move tagsplugin to compiled handlebarsRoeland Jago Douma2018-10-043-11/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move systemtags to compiled handlebarsRoeland Jago Douma2018-10-048-49/+108
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move Comments to compiled handlebarsRoeland Jago Douma2018-10-048-56/+133
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move detailsview to compiled handlebarsRoeland Jago Douma2018-10-043-22/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move systemtagsinfoviewtoggleview away from handlebarsRoeland Jago Douma2018-10-041-7/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move filelist to compiled handlebarsRoeland Jago Douma2018-10-043-9/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #11607 from ↵Roeland Jago Douma2018-10-045-10/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-multiselect-2.1.3 Bump vue-multiselect from 2.1.0 to 2.1.3 in /settings
| * | | | Bump build and fix makefileJohn Molakvoæ (skjnldsv)2018-10-043-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Bump vue-multiselect from 2.1.0 to 2.1.3 in /settingsdependabot[bot]2018-10-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.0 to 2.1.3. - [Release notes](https://github.com/shentao/vue-multiselect/releases) - [Commits](https://github.com/shentao/vue-multiselect/compare/v2.1.0...v2.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>