f692ea34f1
Merge pull request #2263 from nextcloud/remove91_migration
...
Remove migration steps in app dav
2016-11-23 12:18:06 +01:00
10cc849dbc
Merge pull request #2267 from nextcloud/issue-2254-react-to-remote-share-activities-only
...
Only do stuff when its a remote-share activity
2016-11-23 12:16:55 +01:00
f0670aadbe
Merge pull request #2239 from nextcloud/cleanup-settings-application-again
...
Cleanup settings application again
2016-11-23 11:07:10 +01:00
a36d26950e
Only do stuff when its a remote-share activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
7b0b7e801f
Merge pull request #2250 from nextcloud/check-if-data-is-defined
...
Check if data is defined
2016-11-22 20:31:32 +01:00
181af830fd
Remove 9.1 migration steps in app dav ( #25654 )
2016-11-22 20:17:05 +01:00
ca3b67703c
Merge pull request #2251 from nextcloud/remove-superfluos-mail-input-field
...
Remove superfluous email input field
2016-11-22 19:21:22 +01:00
623c02fe6e
Remove superfluous email input field
...
That field is already there and looking at the code this seems to have been missed on a rebase.
Fixes https://github.com/nextcloud/server/issues/2222
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 18:29:09 +01:00
f4470b6861
Merge pull request #2246 from nextcloud/display-name-for-files-and-tagging-activities-again
...
Use the display name for files activities again
2016-11-22 18:25:52 +01:00
e827be759d
Check if data is defined
...
Otherwise when adding a user as subadmin this would throw the following JS error:
```
users.js?v=bc2aae7…:500 Uncaught TypeError: Cannot read property 'message' of undefined(…)(anonymous function) @ users.js?v=bc2aae7…:500j @ jquery.js:3099fireWith @ jquery.js:3211x @ jquery.js:8264(anonymous function) @ jquery.js:8605
```
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 18:23:48 +01:00
717fd9fdd6
Merge pull request #2229 from nextcloud/select2-fix-bis
...
Select2 fix bis
2016-11-22 17:50:53 +01:00
3e7bbaa2b8
Merge pull request #2241 from nextcloud/make-it-a-beta
...
Make it 11.0 beta
2016-11-22 17:04:15 +01:00
f6e7269628
document new variable
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 16:55:28 +01:00
e1feb72583
Use the display name for files activities again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 16:39:29 +01:00
c778e5d15e
Make it 11.0 beta
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 15:55:59 +01:00
e0d01e4768
Merge pull request #2238 from nextcloud/fix_systemtags
...
Fix undefined systemtags stuff
2016-11-22 15:53:15 +01:00
7f1bf10044
Clean up the Application class again
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 15:04:03 +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
3fa81d6c35
Fix select2 input on retina - fixes #2226
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 10:49:29 +01:00
6bcb6e08be
Fix systemtagsfilelist unwanted margin and clean aera a bit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-22 10:49:24 +01:00
d89143524b
Remove unwanted padding
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-22 10:49:11 +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
Lukas Reschke
Joas Schilling
Thomas Müller
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
John Molakvoæ
Nextcloud bot
Georg Ehrke
Bjoern Schiessle
Robin Appelman