]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMove CalDAV activity filters to new API
Joas Schilling [Tue, 29 Nov 2016 14:00:00 +0000 (15:00 +0100)]
Move CalDAV activity filters to new API

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2394 from nextcloud/use-displayname-for-sharee-view
Joas Schilling [Tue, 29 Nov 2016 13:30:30 +0000 (14:30 +0100)]
Merge pull request #2394 from nextcloud/use-displayname-for-sharee-view

Use displayname instead of username for sharee view

7 years agoMerge pull request #2393 from nextcloud/fix-tabheaders-floating
Morris Jobke [Tue, 29 Nov 2016 13:01:33 +0000 (14:01 +0100)]
Merge pull request #2393 from nextcloud/fix-tabheaders-floating

Fix floating of tabHeader items

7 years agofix tests 2394/head
Morris Jobke [Tue, 29 Nov 2016 12:40:41 +0000 (13:40 +0100)]
fix tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2389 from nextcloud/fix-ellipsis-breadcrumb
Roeland Jago Douma [Tue, 29 Nov 2016 11:40:11 +0000 (12:40 +0100)]
Merge pull request #2389 from nextcloud/fix-ellipsis-breadcrumb

Fix ellipsis breadcrumb

7 years agoMerge pull request #2396 from nextcloud/use-correct-channel
Roeland Jago Douma [Tue, 29 Nov 2016 11:39:50 +0000 (12:39 +0100)]
Merge pull request #2396 from nextcloud/use-correct-channel

Use correct channel information

7 years agoUse displayname
John Molakvoæ [Tue, 29 Nov 2016 10:24:35 +0000 (11:24 +0100)]
Use displayname

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoUse correct channel information 2396/head
Morris Jobke [Tue, 29 Nov 2016 10:28:04 +0000 (11:28 +0100)]
Use correct channel information

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix floating of tabHeader items 2393/head
Julius Haertl [Tue, 29 Nov 2016 10:06:00 +0000 (11:06 +0100)]
Fix floating of tabHeader items

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix ellipsis in breadcrumb fix #2387 2389/head
John Molakvoæ (skjnldsv) [Tue, 29 Nov 2016 06:13:06 +0000 (07:13 +0100)]
Fix ellipsis in breadcrumb fix #2387

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 29 Nov 2016 01:06:47 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2386 from nextcloud/fix-iphone-and-ipad
Christoph Wurst [Mon, 28 Nov 2016 23:00:53 +0000 (00:00 +0100)]
Merge pull request #2386 from nextcloud/fix-iphone-and-ipad

Fix Regex for iPhone and add iPad

7 years agoMerge pull request #2383 from nextcloud/add-icon-for-remote-share-notifications
Roeland Jago Douma [Mon, 28 Nov 2016 20:00:27 +0000 (21:00 +0100)]
Merge pull request #2383 from nextcloud/add-icon-for-remote-share-notifications

Add an icon to the federated sharing notification

7 years agoFix Regex for iPhone and add iPad 2386/head
Lukas Reschke [Mon, 28 Nov 2016 17:42:49 +0000 (18:42 +0100)]
Fix Regex for iPhone and add iPad

The previous Regex worked for an iPhone with version "10.0" but not with "10.0.1" which was wrong. I modified the Regex to also match for those situations.

I also added a Regex for the iPad

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications
blizzz [Mon, 28 Nov 2016 17:13:54 +0000 (18:13 +0100)]
Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications

Rich strings and icons for mention notifications

7 years agoAdd an icon to the federated sharing notification 2383/head
Joas Schilling [Mon, 28 Nov 2016 16:23:42 +0000 (17:23 +0100)]
Add an icon to the federated sharing notification

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2375 from Morlinest/patch-1
Lukas Reschke [Mon, 28 Nov 2016 16:19:25 +0000 (17:19 +0100)]
Merge pull request #2375 from Morlinest/patch-1

Mark all content in search field

7 years agoMerge pull request #2380 from nextcloud/make-it-beta-2
Lukas Reschke [Mon, 28 Nov 2016 16:18:05 +0000 (17:18 +0100)]
Merge pull request #2380 from nextcloud/make-it-beta-2

Increase version to Beta 2

7 years agoMerge pull request #2378 from nextcloud/fix-preview-image_src
Morris Jobke [Mon, 28 Nov 2016 16:03:25 +0000 (17:03 +0100)]
Merge pull request #2378 from nextcloud/fix-preview-image_src

Fix image_src link

7 years agoIncrease version to Beta 2 2380/head
Lukas Reschke [Mon, 28 Nov 2016 15:22:24 +0000 (16:22 +0100)]
Increase version to Beta 2

Just as a precaution already so we can easily ship this via the updater to the beta channel properly to Beta 1 users

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix image_src link 2378/head
Lukas Reschke [Mon, 28 Nov 2016 15:16:01 +0000 (16:16 +0100)]
Fix image_src link

The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2335 from nextcloud/grouping-for-activities
Morris Jobke [Mon, 28 Nov 2016 15:18:02 +0000 (16:18 +0100)]
Merge pull request #2335 from nextcloud/grouping-for-activities

Bring back grouping for activities

7 years agoMark all content in search field 2375/head
Morlinest [Mon, 28 Nov 2016 14:06:02 +0000 (15:06 +0100)]
Mark all content in search field

To resolve issue #2310

7 years agoMerge pull request #2342 from nextcloud/filepicker-shadow
Lukas Reschke [Mon, 28 Nov 2016 14:00:19 +0000 (15:00 +0100)]
Merge pull request #2342 from nextcloud/filepicker-shadow

Fix filepicker styling

7 years agoMerge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-downloads
Joas Schilling [Mon, 28 Nov 2016 13:56:18 +0000 (14:56 +0100)]
Merge pull request #2367 from nextcloud/issue-2349-keep-filemtime-for-zip-downloads

Keep the filemtime for files when downloading them in a zip/tar

7 years agoAdd doc block for $time 2367/head
Joas Schilling [Mon, 28 Nov 2016 13:25:44 +0000 (14:25 +0100)]
Add doc block for $time

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agomove more sizing logic to css 2342/head
Robin Appelman [Mon, 28 Nov 2016 13:05:46 +0000 (14:05 +0100)]
move more sizing logic to css

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2351 from nextcloud/remember-session-default
Lukas Reschke [Mon, 28 Nov 2016 13:05:04 +0000 (14:05 +0100)]
Merge pull request #2351 from nextcloud/remember-session-default

do not remember session tokens by default

7 years agoMerge pull request #2353 from nextcloud/renew-session-token-remember
Lukas Reschke [Mon, 28 Nov 2016 13:04:13 +0000 (14:04 +0100)]
Merge pull request #2353 from nextcloud/renew-session-token-remember

copy remember-me value when renewing a session token

7 years agoMerge pull request #2341 from nextcloud/filepicker-public-share
Lukas Reschke [Mon, 28 Nov 2016 12:58:07 +0000 (13:58 +0100)]
Merge pull request #2341 from nextcloud/filepicker-public-share

use public share fileclient when available

7 years agofix dialog to window using css
Robin Appelman [Mon, 28 Nov 2016 12:49:45 +0000 (13:49 +0100)]
fix dialog to window using css

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agocenter dialog using css
Robin Appelman [Mon, 28 Nov 2016 12:44:27 +0000 (13:44 +0100)]
center dialog using css

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2363 from nextcloud/fix-2329
Morris Jobke [Mon, 28 Nov 2016 11:54:51 +0000 (12:54 +0100)]
Merge pull request #2363 from nextcloud/fix-2329

open popup menu in share dialog only for one sharee on render

7 years agoMerge pull request #2365 from nextcloud/resize-the-controls-after-the-sidebar-slided-in
Lukas Reschke [Mon, 28 Nov 2016 11:50:37 +0000 (12:50 +0100)]
Merge pull request #2365 from nextcloud/resize-the-controls-after-the-sidebar-slided-in

Make sure the controls is resized after the sidebar disappeared

7 years agoMerge pull request #2336 from nextcloud/fix-share-by-mail-permissions
Björn Schießle [Mon, 28 Nov 2016 11:41:06 +0000 (12:41 +0100)]
Merge pull request #2336 from nextcloud/fix-share-by-mail-permissions

bring back permissions for mail shares

7 years agoMerge pull request #2366 from nextcloud/phpdoc-hintexception
Björn Schießle [Mon, 28 Nov 2016 11:25:33 +0000 (12:25 +0100)]
Merge pull request #2366 from nextcloud/phpdoc-hintexception

add missing phpdoc to HintException

7 years agoKeep the filemtime for files when downloading them in a zip/tar
Joas Schilling [Mon, 28 Nov 2016 10:36:10 +0000 (11:36 +0100)]
Keep the filemtime for files when downloading them in a zip/tar

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoadd missing phpdoc to HintException 2366/head
Arthur Schiwon [Mon, 28 Nov 2016 10:34:23 +0000 (11:34 +0100)]
add missing phpdoc to HintException

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agobring back permissions for mail shares 2336/head
Bjoern Schiessle [Fri, 25 Nov 2016 14:38:49 +0000 (15:38 +0100)]
bring back permissions for mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMake sure the controls is resized after the sidebar disappeared 2365/head
Joas Schilling [Mon, 28 Nov 2016 10:23:05 +0000 (11:23 +0100)]
Make sure the controls is resized after the sidebar disappeared

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2312 from nextcloud/move-sharebymail-to-new-api
Björn Schießle [Mon, 28 Nov 2016 10:09:47 +0000 (11:09 +0100)]
Merge pull request #2312 from nextcloud/move-sharebymail-to-new-api

Move ShareByMail activities to new API

7 years agoopen popup menu in share dialog only for one sharee on render 2363/head
Arthur Schiwon [Mon, 28 Nov 2016 09:56:22 +0000 (10:56 +0100)]
open popup menu in share dialog only for one sharee on render

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Nov 2016 09:51:57 +0000 (09:51 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Nov 2016 09:31:02 +0000 (09:31 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2361 from nextcloud/2fa-backup-codes-undefined-index
Morris Jobke [Mon, 28 Nov 2016 09:23:30 +0000 (10:23 +0100)]
Merge pull request #2361 from nextcloud/2fa-backup-codes-undefined-index

fix undefined index error when the backup codes provider is not active

7 years agofix parameter order 2351/head
Christoph Wurst [Mon, 28 Nov 2016 08:59:59 +0000 (09:59 +0100)]
fix parameter order

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #2327 from nextcloud/exclude-pre-releases
Christoph Wurst [Mon, 28 Nov 2016 08:55:24 +0000 (09:55 +0100)]
Merge pull request #2327 from nextcloud/exclude-pre-releases

Exclude pre-release versions as per SemVer

7 years agofix undefined index error when the backup codes provider is not active 2361/head
Christoph Wurst [Mon, 28 Nov 2016 07:47:34 +0000 (08:47 +0100)]
fix undefined index error when the backup codes provider is not active

In users have not created backup codes yet the app is not enabled for that user
and therefore we got an undefined index error because the code assumed it was
always there. It now properly returns null.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Nov 2016 01:06:56 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

7 years agocopy remember-me value when renewing a session token 2353/head
Christoph Wurst [Sun, 27 Nov 2016 13:19:57 +0000 (14:19 +0100)]
copy remember-me value when renewing a session token

On renew, a session token is duplicated. For some reason we did
not copy over the remember-me attribute value. Hence, the new token
was deleted too early in the background job and remember-me did
not work properly.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agodo not remember session tokens by default
Christoph Wurst [Sun, 27 Nov 2016 12:59:46 +0000 (13:59 +0100)]
do not remember session tokens by default

We have to respect the value of the remember-me checkbox. Due to an error
in the source code the default value for the session token was to remember
it.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #2343 from nextcloud/fix-exteranl-storage-redirect
Joas Schilling [Sun, 27 Nov 2016 08:02:26 +0000 (09:02 +0100)]
Merge pull request #2343 from nextcloud/fix-exteranl-storage-redirect

[Minor] Fix link to external storage settings on error notification

8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 27 Nov 2016 01:07:08 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

8 years agoFix link to external storage settings on error notification 2343/head
Felix A. Epp [Sat, 26 Nov 2016 09:14:23 +0000 (10:14 +0100)]
Fix link to external storage settings on error notification

Signed-off-by: Felix A. Epp <work@felixepp.de>
8 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 26 Nov 2016 01:06:57 +0000 (01:06 +0000)]
[tx-robot] updated from transifex

8 years agoMerge pull request #2340 from nextcloud/autocomplete-max-width-to-input
Morris Jobke [Fri, 25 Nov 2016 22:49:37 +0000 (23:49 +0100)]
Merge pull request #2340 from nextcloud/autocomplete-max-width-to-input

Add jquery ui fixes js file + fix autocomplete width

8 years agolimit filepicker height to screen
Robin Appelman [Fri, 25 Nov 2016 19:50:09 +0000 (20:50 +0100)]
limit filepicker height to screen

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agofix styling of filepicker dialog
Robin Appelman [Fri, 25 Nov 2016 19:49:50 +0000 (20:49 +0100)]
fix styling of filepicker dialog

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agouse public share fileclient when available 2341/head
Robin Appelman [Fri, 25 Nov 2016 18:23:17 +0000 (19:23 +0100)]
use public share fileclient when available

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoAdd jquery ui fixes js file 2340/head
John Molakvoæ (skjnldsv) [Fri, 25 Nov 2016 15:42:53 +0000 (16:42 +0100)]
Add jquery ui fixes js file
+ fix autocomplete width (fix #2324)

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
8 years agoAdd an event merger and use it for the files activities 2335/head
Joas Schilling [Fri, 25 Nov 2016 14:21:16 +0000 (15:21 +0100)]
Add an event merger and use it for the files activities

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoWorking towards groups
Joas Schilling [Wed, 16 Nov 2016 19:43:28 +0000 (20:43 +0100)]
Working towards groups

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2322 from nextcloud/compat-with-chrome54
Morris Jobke [Fri, 25 Nov 2016 11:00:56 +0000 (12:00 +0100)]
Merge pull request #2322 from nextcloud/compat-with-chrome54

Remove exception for Chrome on Mobile

8 years agoMerge pull request #2325 from nextcloud/fix-slogan-styling
Lukas Reschke [Fri, 25 Nov 2016 10:58:53 +0000 (11:58 +0100)]
Merge pull request #2325 from nextcloud/fix-slogan-styling

Fix styling of slogan on login page for longer text

8 years agoCorrectly match the subjects to the parameters 2312/head
Joas Schilling [Fri, 25 Nov 2016 10:45:40 +0000 (11:45 +0100)]
Correctly match the subjects to the parameters

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #2276 from nextcloud/update-email-address
Morris Jobke [Fri, 25 Nov 2016 10:40:20 +0000 (11:40 +0100)]
Merge pull request #2276 from nextcloud/update-email-address

Update email address

8 years agoExclude pre-release versions as per SemVer 2327/head
Lukas Reschke [Fri, 25 Nov 2016 10:32:46 +0000 (11:32 +0100)]
Exclude pre-release versions as per SemVer

As SemVer can be used apps could define a release like "10.0.0-alpha". This is something that we don't support at the moment in the server and we should filter all prereleases.

Ref https://github.com/nextcloud/server/pull/2307#issuecomment-262911588

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years agoRemove old test
Joas Schilling [Fri, 25 Nov 2016 10:17:40 +0000 (11:17 +0100)]
Remove old test

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoGet user name from contacts if available
Joas Schilling [Fri, 25 Nov 2016 10:17:06 +0000 (11:17 +0100)]
Get user name from contacts if available

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix styling of slogan on login page for longer text 2325/head
Julius Haertl [Fri, 25 Nov 2016 09:43:37 +0000 (10:43 +0100)]
Fix styling of slogan on login page for longer text

Fixes #851

Signed-off-by: Julius Haertl <jus@bitgrid.net>
8 years agobring back setEmailAddress for the user management 2276/head
Bjoern Schiessle [Wed, 23 Nov 2016 22:57:20 +0000 (23:57 +0100)]
bring back setEmailAddress for the user management

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoupdate accounts table if email address or display name changes from outside
Bjoern Schiessle [Wed, 23 Nov 2016 20:19:06 +0000 (21:19 +0100)]
update accounts table if email address or display name changes from outside

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
8 years agoIncrease to 11.0.0.4
Lukas Reschke [Fri, 25 Nov 2016 08:56:26 +0000 (09:56 +0100)]
Increase to 11.0.0.4

8 years agoMerge pull request #2323 from nextcloud/add-announcements-to-shipped
Lukas Reschke [Fri, 25 Nov 2016 08:54:48 +0000 (09:54 +0100)]
Merge pull request #2323 from nextcloud/add-announcements-to-shipped

Add nextcloud_announcements to shipped.json

8 years agoAdd nextcloud_announcements to shipped.json 2323/head
Lukas Reschke [Fri, 25 Nov 2016 08:39:57 +0000 (09:39 +0100)]
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>
8 years agoIncrease version for one
Lukas Reschke [Fri, 25 Nov 2016 08:34:13 +0000 (09:34 +0100)]
Increase version for one

8 years agoMerge pull request #2314 from nextcloud/log-upgrade-steps
Lukas Reschke [Fri, 25 Nov 2016 08:12:27 +0000 (09:12 +0100)]
Merge pull request #2314 from nextcloud/log-upgrade-steps

Log all events that happen during an upgrade

8 years agoMerge pull request #2285 from nextcloud/identityproof_tests
Morris Jobke [Fri, 25 Nov 2016 01:18:18 +0000 (02:18 +0100)]
Merge pull request #2285 from nextcloud/identityproof_tests

Add Identityproof tests

8 years agoRemove exception for Chrome on Mobile 2322/head
Lukas Reschke [Thu, 24 Nov 2016 21:26:10 +0000 (22:26 +0100)]
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>
8 years agoMerge pull request #2321 from nextcloud/lint-php7.1
Roeland Jago Douma [Thu, 24 Nov 2016 21:21:32 +0000 (22:21 +0100)]
Merge pull request #2321 from nextcloud/lint-php7.1

Run syntax test for php7.1

8 years agoAdd Identityproof tests 2285/head
Roeland Jago Douma [Tue, 22 Nov 2016 13:53:09 +0000 (14:53 +0100)]
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>
8 years agoRun syntex test for php7.1 2321/head
Roeland Jago Douma [Thu, 24 Nov 2016 20:44:29 +0000 (21:44 +0100)]
Run syntex test for php7.1

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2319 from nextcloud/php-7.1rc6
Roeland Jago Douma [Thu, 24 Nov 2016 20:33:24 +0000 (21:33 +0100)]
Merge pull request #2319 from nextcloud/php-7.1rc6

Bump php7.1 container to RC6

8 years agoBump php7.1 container to RC6 2319/head
Roeland Jago Douma [Thu, 24 Nov 2016 19:46:15 +0000 (20:46 +0100)]
Bump php7.1 container to RC6

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #2301 from nextcloud/pass-confirm-cookie-login
Roeland Jago Douma [Thu, 24 Nov 2016 19:39:13 +0000 (20:39 +0100)]
Merge pull request #2301 from nextcloud/pass-confirm-cookie-login

fix password check when using remember me login

8 years agoMerge pull request #2243 from nextcloud/file-drop-wording
Roeland Jago Douma [Thu, 24 Nov 2016 19:32:00 +0000 (20:32 +0100)]
Merge pull request #2243 from nextcloud/file-drop-wording

fix wording of File drop, ref #2207

8 years agoMerge pull request #2316 from nextcloud/fix-personal-loading-icon
Roeland Jago Douma [Thu, 24 Nov 2016 19:21:31 +0000 (20:21 +0100)]
Merge pull request #2316 from nextcloud/fix-personal-loading-icon

Loading icon fix #2198

8 years agoLoading icon fix #2198 2316/head
John Molakvoæ (skjnldsv) [Thu, 24 Nov 2016 16:26:57 +0000 (17:26 +0100)]
Loading icon fix #2198

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
8 years agoMerge pull request #2306 from nextcloud/dont-log-user-password
Morris Jobke [Thu, 24 Nov 2016 16:08:25 +0000 (17:08 +0100)]
Merge pull request #2306 from nextcloud/dont-log-user-password

Don't log the user password in case something goes wrong

8 years agoMerge pull request #2307 from nextcloud/better-filter-on-appstore
blizzz [Thu, 24 Nov 2016 15:57:14 +0000 (16:57 +0100)]
Merge pull request #2307 from nextcloud/better-filter-on-appstore

Loop for newest version in appstore response

8 years agoMerge pull request #2313 from nextcloud/fix-naming
Morris Jobke [Thu, 24 Nov 2016 15:49:37 +0000 (16:49 +0100)]
Merge pull request #2313 from nextcloud/fix-naming

fix some outdated naming

8 years agoLog all events that happen during an update 2314/head
Morris Jobke [Thu, 24 Nov 2016 15:33:05 +0000 (16:33 +0100)]
Log all events that happen during an update

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #2309 from nextcloud/fix-favicons
Lukas Reschke [Thu, 24 Nov 2016 15:32:30 +0000 (16:32 +0100)]
Merge pull request #2309 from nextcloud/fix-favicons

fix favicon viewbox, remove decimals

8 years agoMove ShareByMail activities to new API
Joas Schilling [Thu, 24 Nov 2016 14:46:38 +0000 (15:46 +0100)]
Move ShareByMail activities to new API

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agofix some outdated naming 2313/head
Jan-Christoph Borchardt [Thu, 24 Nov 2016 15:05:05 +0000 (16:05 +0100)]
fix some outdated naming

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #2224 from nextcloud/fix-visibility-switcher
Lukas Reschke [Thu, 24 Nov 2016 14:47:55 +0000 (15:47 +0100)]
Merge pull request #2224 from nextcloud/fix-visibility-switcher

Fix visibility switcher for avatar

8 years agoMerge pull request #2302 from nextcloud/register-command-error-handling
Lukas Reschke [Thu, 24 Nov 2016 14:47:20 +0000 (15:47 +0100)]
Merge pull request #2302 from nextcloud/register-command-error-handling

handle errors in apps while registering commands

8 years agofix favicon viewbox, remove decimals 2309/head
Jan-Christoph Borchardt [Thu, 24 Nov 2016 14:42:00 +0000 (15:42 +0100)]
fix favicon viewbox, remove decimals

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #2299 from nextcloud/oc-mounts-non-existing-user
Lukas Reschke [Thu, 24 Nov 2016 14:28:40 +0000 (15:28 +0100)]
Merge pull request #2299 from nextcloud/oc-mounts-non-existing-user

filter out oc_mounts results from non existing users

8 years agohandle errors in apps while registering commands 2302/head
Robin Appelman [Thu, 24 Nov 2016 11:28:40 +0000 (12:28 +0100)]
handle errors in apps while registering commands

Signed-off-by: Robin Appelman <robin@icewind.nl>