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

36005 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
7e6f829d54 Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirect 
[Minor] Fix link to external storage settings on error notification
 2016-11-27 09:02:26 +01:00
Nextcloud bot
9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Felix A. Epp
c911a876bf Fix link to external storage settings on error notification 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2016-11-26 10:15:42 +01:00
Nextcloud bot
8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Morris Jobke
789e6e7363 Merge pull request #2340 from nextcloud/autocomplete-max-width-to-input 
Add jquery ui fixes js file + fix autocomplete width
 2016-11-25 23:49:37 +01:00
John Molakvoæ (skjnldsv)
9528045178
Add jquery ui fixes js file 
+ fix autocomplete width (fix #2324)

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-25 16:44:51 +01:00
Morris Jobke
47646794b9 Merge pull request #2322 from nextcloud/compat-with-chrome54 
Remove exception for Chrome on Mobile
 2016-11-25 12:00:56 +01:00
Lukas Reschke
e502a2df48 Merge pull request #2325 from nextcloud/fix-slogan-styling 
Fix styling of slogan on login page for longer text
 2016-11-25 11:58:53 +01:00
Morris Jobke
64fb0fb3dd Merge pull request #2276 from nextcloud/update-email-address 
Update email address
 2016-11-25 11:40:20 +01:00
Julius Haertl
9a3423f25f
Fix styling of slogan on login page for longer text 
Fixes #851

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-25 10:43:37 +01:00
Bjoern Schiessle
0de685c562
bring back setEmailAddress for the user management 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-25 10:26:48 +01:00
Bjoern Schiessle
3fc75073b8
update accounts table if email address or display name changes from outside 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-25 10:26:47 +01:00
Lukas Reschke
1967b9112c Increase to 11.0.0.4 2016-11-25 09:56:26 +01:00
Lukas Reschke
39aa74eb7b Merge pull request #2323 from nextcloud/add-announcements-to-shipped 
Add nextcloud_announcements to shipped.json
 2016-11-25 09:54:48 +01:00
Lukas Reschke
dee88d08e4
Add nextcloud_announcements to shipped.json 
Otherwise on the update from beta1 to beta2 the app would be disabled again as incompatible:

```
root@cloud:/var/www/html# sudo -u www-data php occ upgrade
Nextcloud or one of the apps require upgrade - only a limited number of commands are available
You may use your browser or the occ upgrade command to do the upgrade
Set log level to debug
Turned on maintenance mode
Updating database schema
Updated database
Disabled 3rd-party app: calendar
Disabled 3rd-party app: contacts
Disabled 3rd-party app: nextcloud_announcements
Disabled 3rd-party app: spreed
Update 3rd-party app: calendar
Update 3rd-party app: contacts
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-25 09:39:57 +01:00
Lukas Reschke
7b2c60d1a3 Increase version for one 2016-11-25 09:34:13 +01:00
Lukas Reschke
b3696f3910 Merge pull request #2314 from nextcloud/log-upgrade-steps 
Log all events that happen during an upgrade
 2016-11-25 09:12:27 +01:00
Morris Jobke
f514bb2be6 Merge pull request #2285 from nextcloud/identityproof_tests 
Add Identityproof tests
 2016-11-25 02:18:18 +01:00
Lukas Reschke
2144a114b0
Remove exception for Chrome on Mobile 
This didn't really work anyways and Chrome 54 for Android has been pushed out via Google Play on October 19th. So we should remove this.

This is only in master and doesn't affect any stable branch.

Fixes https://github.com/nextcloud/server/issues/2318

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-24 22:26:10 +01:00
Roeland Jago Douma
9492de3005 Merge pull request #2321 from nextcloud/lint-php7.1 
Run syntax test for php7.1
 2016-11-24 22:21:32 +01:00
Roeland Jago Douma
72f9920a58
Add Identityproof tests 
* Add tests for Key
* Add tests for Manager
* Add tests for Signer
* Removed URLGenerator from Signer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-24 21:50:19 +01:00
Roeland Jago Douma
06c771e49f
Run syntex test for php7.1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-24 21:44:29 +01:00
Roeland Jago Douma
c398fdda7e Merge pull request #2319 from nextcloud/php-7.1rc6 
Bump php7.1 container to RC6
 2016-11-24 21:33:24 +01:00
Roeland Jago Douma
2ddee155f7
Bump php7.1 container to RC6 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-24 20:46:15 +01:00
Roeland Jago Douma
5fb43b1cc9 Merge pull request #2301 from nextcloud/pass-confirm-cookie-login 
fix password check when using remember me login
 2016-11-24 20:39:13 +01:00
Roeland Jago Douma
147b3d6f00 Merge pull request #2243 from nextcloud/file-drop-wording 
fix wording of File drop, ref #2207
 2016-11-24 20:32:00 +01:00
Roeland Jago Douma
10db5bf7d2 Merge pull request #2316 from nextcloud/fix-personal-loading-icon 
Loading icon fix #2198
 2016-11-24 20:21:31 +01:00
John Molakvoæ (skjnldsv)
dc4ceb7338
Loading icon fix #2198 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-24 17:28:21 +01:00
Morris Jobke
8f14ffd734 Merge pull request #2306 from nextcloud/dont-log-user-password 
Don't log the user password in case something goes wrong
 2016-11-24 17:08:25 +01:00
blizzz
cb69accdc5 Merge pull request #2307 from nextcloud/better-filter-on-appstore 
Loop for newest version in appstore response
 2016-11-24 16:57:14 +01:00
Morris Jobke
98891751bf Merge pull request #2313 from nextcloud/fix-naming 
fix some outdated naming
 2016-11-24 16:49:37 +01:00
Morris Jobke
3620d81184
Log all events that happen during an update 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-24 16:37:57 +01:00
Lukas Reschke
b394151d1c Merge pull request #2309 from nextcloud/fix-favicons 
fix favicon viewbox, remove decimals
 2016-11-24 16:32:30 +01:00
Jan-Christoph Borchardt
e75dede590 fix some outdated naming 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-24 16:05:05 +01:00
Lukas Reschke
cbf943301f Merge pull request #2224 from nextcloud/fix-visibility-switcher 
Fix visibility switcher for avatar
 2016-11-24 15:47:55 +01:00
Lukas Reschke
ddf944eca1 Merge pull request #2302 from nextcloud/register-command-error-handling 
handle errors in apps while registering commands
 2016-11-24 15:47:20 +01:00
Jan-Christoph Borchardt
3069ee912b fix favicon viewbox, remove decimals 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-11-24 15:42:05 +01:00
Lukas Reschke
d6ade509cf Merge pull request #2299 from nextcloud/oc-mounts-non-existing-user 
filter out oc_mounts results from non existing users
 2016-11-24 15:28:40 +01:00
Robin Appelman
65ace7c5a7
handle errors in apps while registering commands 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-24 15:13:29 +01:00
Lukas Reschke
7162166bae
Also show updates on the "enabled" page 
The enabled page doesn't pass through "getAppsForCategory" thus it also needs to have that special logic applied.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-24 15:04:23 +01:00
Morris Jobke
b74b6671c1 Merge pull request #2305 from nextcloud/fix_previews_federated_shares 
Fix previews for federated shares
 2016-11-24 14:37:12 +01:00
Lukas Reschke
6a4c0cf237
Loop for newest version in appstore response 
The current implementation when fetching apps from the appstore is to assume that the first element is the newest version, this is now always applicable and leads to the fact that for some apps (e.g. nextant) the newest version is not delivered. This can be easily tested by comparing the version of the downloaded Nextant version.

This change will loop over all releases delivered by the appstore and chooses the newest compatible one. While not the cleanest solution, it does its job.

Most of the code are actually unit tests. Whereas I have copied the whole original response from the appstore and also have performed the transformation. So that's why the diff looks so huge.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-24 14:29:57 +01:00
Joas Schilling
df0eeb8089
Don't log the user password in case something goes wrong 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-24 13:58:03 +01:00
Morris Jobke
e3489d92fd Merge pull request #2303 from nextcloud/password-check-improvements 
small password check improvements
 2016-11-24 13:30:11 +01:00
Roeland Jago Douma
dab87ef6fd
Fix previews for federated shares 
The owner of a federated file is the federated user. For which we
obviously can't setup a view.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-24 13:20:51 +01:00
Bjoern Schiessle
9361952596
show dialog again of operation failed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-24 12:35:59 +01:00
Bjoern Schiessle
adb581431f
set focus on input field 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-24 12:35:28 +01:00
Robin Appelman
dd7d493e4d
fix password check when using remember me login 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-24 11:57:10 +01:00
Robin Appelman
ce2f9493a7
filter out oc_mounts results from non existing users 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-24 11:44:18 +01:00
Lukas Reschke
f4cf125a4a Merge pull request #2296 from nextcloud/nitpicking-on-federation-admin-section 
Fix some language issues in the federation admin panel
 2016-11-24 10:13:57 +01:00