Commit Graph

46018 Commits

Author SHA1 Message Date
Daniel Kesselberg be5e992021
Fix typo
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-08 13:02:12 +02:00
Christoph Wurst b1b43aa7bc
Fix reference to template in tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-08 11:27:22 +02:00
Christoph Wurst f29189f200
Rename admin security settings template
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-08 10:45:28 +02:00
Morris Jobke 7971ba5cc6
Merge pull request #10898 from nextcloud/feature/10684/default-logo-color-theme-colors
Switches the default logo color depending on the primary color
2018-10-08 10:33:22 +02:00
Christoph Wurst 5d2fdfe0b5
Rename admin security section
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-08 10:31:51 +02:00
Morris Jobke 75f4b7b191
Merge pull request #11620 from nextcloud/followup/11615
Extract translated strings of compiled handlebars
2018-10-08 10:24:31 +02:00
Nextcloud bot 80f7add485
[tx-robot] updated from transifex 2018-10-08 00:12:54 +00:00
Georg Ehrke 970242b6ca
RoomManager/ResourceManager: Inject IServerContainer instead of using OC Server
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-08 01:50:17 +02:00
Georg Ehrke 1c6f666bbf
adjust Calendar resource / room interfaces to use class implementation
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-08 01:25:20 +02:00
Daniel Kesselberg 752f637207
Adjust code for changed method signature
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-07 18:17:29 +02:00
Daniel Kesselberg 14d802b8f3
Refactor method to throw exception instead of true/false
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-07 18:12:38 +02:00
Nextcloud bot 4c47ec005f
[tx-robot] updated from transifex 2018-10-07 00:12:21 +00:00
Nextcloud bot 7dd2212b2c
[tx-robot] updated from transifex 2018-10-06 00:12:15 +00:00
Daniel Kesselberg 28fc7b5061
Ignore case for is and !is
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-05 17:54:48 +02:00
Joas Schilling 506f7f29bf
Merge pull request #11636 from nextcloud/deprecation/remove/publishActivity
Remove deprecated publishActivity function
2018-10-05 14:16:33 +02:00
Roeland Jago Douma 60a34179c9
Remove deprecated publishActivity function
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-05 12:55:45 +02:00
Roeland Jago Douma 8932a51b91
Extract translated strings of compiled handlebars
Follow up to #11615

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-05 12:32:48 +02:00
Roeland Jago Douma 02e326f8f9
Merge pull request #11624 from nextcloud/fix/11468/app-menu-scrollbar
Fixes the apps menu scrollbar
2018-10-05 10:57:21 +02:00
Nextcloud bot d9fe68ed12
[tx-robot] updated from transifex 2018-10-05 00:12:56 +00:00
Michael Weimann 32856197b9
Fixes the apps menu scrollbar
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-10-04 22:09:28 +02:00
Michael Weimann 044ab0cbec
Adapts the theming util to the new core logo image path
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-10-04 20:43:27 +02:00
Roeland Jago Douma fbe62e1985
Merge pull request #11615 from nextcloud/followup/11583
Remove leftover '
2018-10-04 19:54:16 +02:00
Daniel Kesselberg 37ae5cb100
Change placeholder
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-04 17:59:29 +02:00
Morris Jobke e0ed64366c
Merge pull request #11613 from nextcloud/add-missing-throw-statement
add missing throw statement to doc block
2018-10-04 16:28:08 +02:00
Roeland Jago Douma 363ec1d3c3
Remove leftover '
Followup to #11583

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 16:02:09 +02:00
Roeland Jago Douma bfa870d803
Merge pull request #11611 from nextcloud/fix/10852
Allow userId to be null
2018-10-04 15:35:22 +02:00
Bjoern Schiessle 1d4a80f37d
add missing throw statement to doc block
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-04 15:23:07 +02:00
Daniel Kesselberg 4c4f50ee2d
Remove unused import
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-04 14:23:45 +02:00
Roeland Jago Douma 13b1cd5cb8
Allow userId to be null
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>
2018-10-04 13:04:58 +02:00
Morris Jobke e387d90b29
Merge pull request #11583 from nextcloud/csp/more_moving_handlebars
Csp/more moving handlebars
2018-10-04 10:24:40 +02:00
Roeland Jago Douma 5aa0ad92a4
Merge pull request #11607 from nextcloud/dependabot/npm_and_yarn/settings/vue-multiselect-2.1.3
Bump vue-multiselect from 2.1.0 to 2.1.3 in /settings
2018-10-04 10:18:28 +02:00
Roeland Jago Douma 1161b838d7
Move newfilemenu to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:55:05 +02:00
Roeland Jago Douma b574d1c814
Move files_versions to compiled handlebars templates
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:45 +02:00
Roeland Jago Douma b0fd31496b
Move OC.Share to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:45 +02:00
Roeland Jago Douma b10cddebe5
Move sharetabview to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma fca9987a6a
Move mainfileinfodetailsview to commpiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma 6f940a9b02
Move fileactions to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma 8dfc397a5e
Move tagsplugin to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma cd7c17482e
Move systemtags to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma d281f2625d
Move Comments to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma 187953153a
Move detailsview to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma a0368608f0
Move systemtagsinfoviewtoggleview away from handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
Roeland Jago Douma 48d1fe0116
Move filelist to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
John Molakvoæ (skjnldsv) 153faad307
Bump build and fix makefile
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-10-04 09:26:42 +02:00
John Molakvoæ 0b27595eb4
Merge pull request #11581 from nextcloud/users-table-header-fix
Fix sticky header on users list
2018-10-04 09:04:56 +02:00
dependabot[bot] e638e6e99a
Bump vue-multiselect from 2.1.0 to 2.1.3 in /settings
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>
2018-10-04 06:35:20 +00:00
Roeland Jago Douma 0630360835
Merge pull request #11604 from nextcloud/remove-unused-code
Remove unused code in legacy classes
2018-10-04 08:07:32 +02:00
Roeland Jago Douma 3c42510f02
Merge pull request #11603 from nextcloud/bugfix/noid/fix-wrong-call-for-logger
Fix call to logger
2018-10-04 07:40:31 +02:00
Roeland Jago Douma dc037d9332
Merge pull request #11606 from nextcloud/fix/2fa-login-screen-design-III
Improve 2FA login screens
2018-10-04 07:40:07 +02:00
Nextcloud bot d9504a4e06
[tx-robot] updated from transifex 2018-10-04 00:12:07 +00:00