Commit Graph

35709 Commits

Author SHA1 Message Date
Roeland Jago Douma cc8750ca30 Merge pull request #2160 from nextcloud/its-nextcloud
It's Nextcloud
2016-11-16 18:01:39 +01:00
Roeland Jago Douma 319c7ee1c0 Merge pull request #2166 from nextcloud/logreader-shipped
set logreader as shipped
2016-11-16 18:00:49 +01:00
Roeland Jago Douma 7100a1b347 Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboard
Adds copy tooltip to clipboards
2016-11-16 17:57:35 +01:00
Robin Appelman a7c0d99705
ensure we setup the mount manager when in lockdown
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 17:24:37 +01:00
Robin Appelman bd10c960ee
set logreader as shipped 2016-11-16 17:08:30 +01:00
Robin Appelman 0e88b519d1
fix warning with token login
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 16:33:56 +01:00
Roeland Jago Douma 61453f5fd5 Merge pull request #719 from nextcloud/lockdown
Allow restricting of app password permissions
2016-11-16 16:17:28 +01:00
Morris Jobke b7e6e9f83c
Fix tooltips - they now properly change on click
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 15:43:26 +01:00
Roeland Jago Douma 5f789fdebc Merge pull request #2150 from nextcloud/move_buttons_to_bottom
Move social buttons to bottom on admin page
2016-11-16 15:37:11 +01:00
Roeland Jago Douma 00729bcbc5 Merge pull request #2156 from nextcloud/fix-autoloader-for-new-apps
Add autoloader path for newly installed apps too
2016-11-16 15:36:37 +01:00
Robin Appelman e633f2f8df
add test
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:33 +01:00
Robin Appelman e77432783b
Add test for setting up fake fs
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:32 +01:00
Robin Appelman 9157f807cc
dropdown ui
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:32 +01:00
Roeland Jago Douma 311531ecce
Adds tests for the AuthSettingsController
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 15:24:31 +01:00
Roeland Jago Douma 59d6003f89
Adds NullCache ans NullStorage tests for Lockdown
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 15:24:31 +01:00
Roeland Jago Douma e5bc80b31d
Adds TokenProvider and Mapper tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 15:24:31 +01:00
Robin Appelman 91851c37be
add tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:30 +01:00
Robin Appelman 4837904ad6
update autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:30 +01:00
Robin Appelman 4c3d18a9fc
explicit types
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:29 +01:00
Robin Appelman a4ea20a259
cast to int
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:29 +01:00
Robin Appelman bb65d3b03d
update tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:29 +01:00
Robin Appelman c5df58ec69
phpdoc
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-16 15:24:28 +01:00
Robin Appelman 7e9e5db496
fix setscope
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:28 +01:00
Robin Appelman da63af8b02
enable deleting/configuring new tokens
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:28 +01:00
Robin Appelman 1afccde16a
allow configuring filesystem access
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:27 +01:00
Robin Appelman b4e27d35f5
app password scope wip
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:27 +01:00
Robin Appelman 2389e0f250
read lockdown scope from token
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:27 +01:00
Robin Appelman b56f2c9ed0
basic lockdown logic
Signed-off-by: Robin Appelman <icewind@owncloud.com>
2016-11-16 15:24:23 +01:00
Marius Blüm 46edb4e1a7
It's Nextcloud
Signed-off-by: Marius Blüm <marius@lineone.io>
2016-11-16 14:56:30 +01:00
Julius Haertl beeb819292
Fix margin for checkboxes in multiselect options
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-16 14:06:33 +01:00
Julius Haertl 520f2f6221
Revert "Fix #1782"
This reverts commit bc5268bdc8.

Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-16 13:52:51 +01:00
Morris Jobke 43e22f4da4
Add autoloader path for newly installed apps too
* followup to https://github.com/nextcloud/server/pull/2148
* problem noticed in https://github.com/nextcloud/files_antivirus/pull/11

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 12:55:34 +01:00
Joas Schilling 6a525fadbb
Show all in one message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 12:27:22 +01:00
Roeland Jago Douma d03446a0ae Merge pull request #2148 from nextcloud/add_autoloader_before_enabling
Add autoloader before enabling apps
2016-11-16 12:09:39 +01:00
Jan-Christoph Borchardt 0c89beb639 left-align social media buttons correctly on Personal page too
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 12:06:43 +01:00
Jan-Christoph Borchardt b228ed7bef add explanatory text of what to do on app version error
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 11:47:39 +01:00
Joas Schilling 81e9836900 Merge pull request #2092 from nextcloud/activity-filter-api
Better API for activity filters, settings and providers + Rich Object support
2016-11-16 11:47:17 +01:00
Jan-Christoph Borchardt e595c50042 theming: move reset button into field and only show when focused
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 11:38:01 +01:00
Roeland Jago Douma 0200f34dd1
Move social buttons to bottom on admin page
For #2134

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 10:48:31 +01:00
Roeland Jago Douma 06d8801328
No HTML in string
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 10:23:30 +01:00
Jan-Christoph Borchardt 317b132d31
convert text to single line so tabs in translation issue is fixed
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-16 10:07:39 +01:00
Joas Schilling 6b88d56e3a
Update the since version to 11.0.0
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:29:27 +01:00
Joas Schilling 6047493b6d
Fix integration tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:46 +01:00
Joas Schilling b5f1296d1f
Make sure they are always arrays
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:46 +01:00
Joas Schilling 1dc23f2fd6
Remove the old activity extension
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:46 +01:00
Joas Schilling cf8b91be52
Add back the support for the short translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling 8725302307
Fix InfoParser empty tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling b8958ee937
Fix activity manager tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling 27c08167df
Don't even try to combine when the subject is different
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling c2a5c1f2c6
Allow combining events
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00