e0d01e4768
Merge pull request #2238 from nextcloud/fix_systemtags
...
Fix undefined systemtags stuff
2016-11-22 15:53:15 +01:00
9619f49ba4
Fix undefined systemtags stuff
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-22 14:59:51 +01:00
b5fab4ed9c
Merge pull request #2234 from nextcloud/add-subadmin-middleware-back
...
Add SubAdminMiddleware back
2016-11-22 14:46:43 +01:00
54f80ce6d9
Add SubAdminMiddleware back
...
Removed by mistake in #1946
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 13:33:23 +01:00
df215625f1
Merge pull request #1972 from nextcloud/invalid-files-from-scanner
...
Make sure we don't scan files that can not be accessed
2016-11-22 12:55:54 +01:00
b8732a1a53
Merge pull request #2179 from nextcloud/update-systemtags-to-new-activity-api
...
Update systemtags activity to new API
2016-11-22 11:05:06 +01:00
08ef7356f6
Merge pull request #2165 from nextcloud/sharing-activities-update
...
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
9c52f16dbb
Merge pull request #2228 from nextcloud/use-appid-instead-of-app-element
...
Use app ID instead of object
2016-11-22 10:06:33 +01:00
a02d0975dd
Merge pull request #2154 from nextcloud/comments-activities-update
...
Move comments activities to the new API
2016-11-22 09:56:22 +01:00
b0cf78aa1e
[tx-robot] updated from transifex
2016-11-22 01:06:54 +00:00
8ee11956da
Use app ID instead of object
...
Fixes several error messages when installing an app from the appstore, including:
```
Illegal offset type in isset or empty at /media/psf/stable9/lib/private/legacy/app.php#662
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#663
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#661
Object of class OC_App could not be converted to string at /media/psf/stable9/lib/private/legacy/app.php#81
trim() expects parameter 1 to be string, object given at /media/psf/stable9/lib/private/legacy/app.php#628
```
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 00:24:23 +01:00
2786877013
Merge pull request #2215 from nextcloud/add-setup-page-integration-test
...
Add integration test for web based installer
2016-11-21 23:26:19 +01:00
1e06d0bb47
Merge pull request #2221 from nextcloud/from-is-featured-to-featured
...
Error log spam: Cast "isFeatured" to "featured"
2016-11-21 23:11:29 +01:00
d0c3c5cee3
Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests
...
fix PropPatch requests on calendars
2016-11-21 22:54:17 +01:00
3a8c4230be
fix PropPatch requests on calendars
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2016-11-21 22:10:51 +01:00
de0df3cfd9
Merge pull request #2220 from nextcloud/app-password-default-device-name
...
app passwords: add default name if none given
2016-11-21 22:10:39 +01:00
951f7f5eaf
Add integration test for web based installer
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-21 22:00:16 +01:00
e2bfce0d26
Cast "isFeatured" to "featured"
...
The appstore returns a "isFeatured" in the current API revision. We need to cast this thus.
Fixes the following error log message when opening the tab "Customization":
> Undefined index: featured at /media/psf/stable9/settings/Controller/AppSettingsController.php#233
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 21:34:37 +01:00
2a712abdfd
use date as device name if no name was given
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 20:28:21 +01:00
206ef51eac
Merge pull request #2216 from nextcloud/proper-return-value
...
Use proper return function
2016-11-21 17:34:46 +01:00
cd24010fa4
Merge pull request #2214 from nextcloud/remove-logging
...
remove old logging section
2016-11-21 17:17:02 +01:00
0048b3aa2e
update tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-21 15:59:08 +01:00
b6c9029c82
Use proper return function
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 15:14:32 +01:00
efdef8f801
Merge pull request #2211 from nextcloud/maintenance-wsod
...
fix white screen of death in maintenance mode when theming is disabled
2016-11-21 14:00:41 +01:00
3d9077ae3a
Merge pull request #2212 from nextcloud/fix_web_installer
...
Do not trigger appconfig queries when we are not yet installed
2016-11-21 13:57:48 +01:00
94004cf46b
Merge pull request #1946 from nextcloud/federated-sharing-persona-settings
...
Add more personal information fields to the settings page for enhanced federated sharing
2016-11-21 13:50:03 +01:00
c694bd3455
remove old logging section
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-21 13:46:31 +01:00
9bc4ac367f
Do not trigger appconfig queries when we are not yet installed
...
Fixes #2209
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 13:13:53 +01:00
58685413d2
fix white screen of death in maintenance mode when theming is disabled
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-21 13:10:55 +01:00
a1ca54a0ae
center checkmark to indicate that the setting was stored
2016-11-21 11:30:03 +01:00
4a05aa8a02
don't try to verify email address if no email address is set
2016-11-21 11:30:03 +01:00
5aed91c321
small fixes
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:30:03 +01:00
d001dbd259
Adjust unit tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:03 +01:00
d04ec9221c
Adjust integration test
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
16181c5463
Ask for password when scope is changed
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
e87933bc3d
Fix mail scope
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
5acc3d3c5e
Highlight current entry
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
a0c64044b2
Make JS aware of password verification
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
ccf3e4255a
Remove debug code
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
7b3855a375
Add config switch
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
c49b0d3834
Remove unused variable
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:01 +01:00
dac980115f
Add retry job
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:01 +01:00
6e783f8345
make icons a bit smaller
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
f062c6daee
fix menu positioning hack
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
15c075eba8
Fix lookup url
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
e53e585e91
put explanatory text directly in popup
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
c20c7f31da
Push json to the lookupserver
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
f7f70028d1
Search on lookup server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
8bf4111368
Fix changing display names for subadmins
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
662dff046d
Adjust permission checks
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
Joas Schilling
Roeland Jago Douma
Lukas Reschke
Roeland Jago Douma
Morris Jobke
Nextcloud bot
Georg Ehrke
Bjoern Schiessle
Robin Appelman
Jan-Christoph Borchardt