wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35910 commits 157 branches 562 tags 714 MiB
Commit graph

35910 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
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
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
717fd9fdd6 Merge pull request #2229 from nextcloud/select2-fix-bis 
Select2 fix bis
 2016-11-22 17:50:53 +01:00
Lukas Reschke
3e7bbaa2b8 Merge pull request #2241 from nextcloud/make-it-a-beta 
Make it 11.0 beta
 2016-11-22 17:04:15 +01:00
Morris Jobke
f6e7269628
document new variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-22 16:55:28 +01:00
Joas Schilling
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
Lukas Reschke
c778e5d15e
Make it 11.0 beta 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-22 15:55:59 +01:00
Joas Schilling
e0d01e4768 Merge pull request #2238 from nextcloud/fix_systemtags 
Fix undefined systemtags stuff
 2016-11-22 15:53:15 +01:00
Roeland Jago Douma
9619f49ba4
Fix undefined systemtags stuff 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-22 14:59:51 +01:00
Joas Schilling
b5fab4ed9c Merge pull request #2234 from nextcloud/add-subadmin-middleware-back 
Add SubAdminMiddleware back
 2016-11-22 14:46:43 +01:00
Lukas Reschke
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
Roeland Jago Douma
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
Joas Schilling
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
Morris Jobke
3fa81d6c35
Fix select2 input on retina - fixes #2226 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-22 10:49:29 +01:00
John Molakvoæ
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
John Molakvoæ
d89143524b
Remove unwanted padding 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-22 10:49:11 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Morris Jobke
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
Nextcloud bot
b0cf78aa1e
[tx-robot] updated from transifex 2016-11-22 01:06:54 +00:00
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
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
Lukas Reschke
d0c3c5cee3 Merge pull request #2225 from nextcloud/fix_caldav_proppatch_requests 
fix PropPatch requests on calendars
 2016-11-21 22:54:17 +01:00
Georg Ehrke
3a8c4230be
fix PropPatch requests on calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2016-11-21 22:10:51 +01:00
Lukas Reschke
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
Morris Jobke
951f7f5eaf
Add integration test for web based installer 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-21 22:00:16 +01:00
Lukas Reschke
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
Bjoern Schiessle
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
Lukas Reschke
206ef51eac Merge pull request #2216 from nextcloud/proper-return-value 
Use proper return function
 2016-11-21 17:34:46 +01:00
Robin Appelman
cd24010fa4 Merge pull request #2214 from nextcloud/remove-logging 
remove old logging section
 2016-11-21 17:17:02 +01:00
Robin Appelman
0048b3aa2e
update tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-21 15:59:08 +01:00
Lukas Reschke
b6c9029c82
Use proper return function 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 15:14:32 +01:00
Robin Appelman
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
Morris Jobke
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
Lukas Reschke
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
Robin Appelman
c694bd3455
remove old logging section 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-21 13:46:31 +01:00
Roeland Jago Douma
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
Robin Appelman
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
Bjoern Schiessle
a1ca54a0ae
center checkmark to indicate that the setting was stored 2016-11-21 11:30:03 +01:00
Bjoern Schiessle
4a05aa8a02
don't try to verify email address if no email address is set 2016-11-21 11:30:03 +01:00
Bjoern Schiessle
5aed91c321
small fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-21 11:30:03 +01:00
Lukas Reschke
d001dbd259
Adjust unit tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:03 +01:00
Lukas Reschke
d04ec9221c
Adjust integration test 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00
Lukas Reschke
16181c5463
Ask for password when scope is changed 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00
Lukas Reschke
e87933bc3d
Fix mail scope 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00
Lukas Reschke
5acc3d3c5e
Highlight current entry 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00
Lukas Reschke
a0c64044b2
Make JS aware of password verification 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00
Lukas Reschke
ccf3e4255a
Remove debug code 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00