]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agomake sure that we only update the email address if it really changed 2484/head
Bjoern Schiessle [Fri, 2 Dec 2016 15:54:17 +0000 (16:54 +0100)]
make sure that we only update the email address if it really changed

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #2448 from nextcloud/errorreload-login
Robin Appelman [Fri, 2 Dec 2016 13:37:12 +0000 (14:37 +0100)]
Merge pull request #2448 from nextcloud/errorreload-login

only reload on errors when logged in

7 years agoadjust js tests 2448/head
Robin Appelman [Fri, 2 Dec 2016 12:40:23 +0000 (13:40 +0100)]
adjust js tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 2 Dec 2016 01:07:35 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoonly reload on errors when logged in
Robin Appelman [Thu, 1 Dec 2016 22:44:50 +0000 (23:44 +0100)]
only reload on errors when logged in

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2432 from nextcloud/activity-mail-language
Morris Jobke [Thu, 1 Dec 2016 22:01:00 +0000 (23:01 +0100)]
Merge pull request #2432 from nextcloud/activity-mail-language

Make sure the activity emails can be sent in the users language

7 years agoMerge pull request #2444 from nextcloud/detect-also-a-400-status
Christoph Wurst [Thu, 1 Dec 2016 20:25:54 +0000 (21:25 +0100)]
Merge pull request #2444 from nextcloud/detect-also-a-400-status

Catch status code 400

7 years agoMerge pull request #2435 from nextcloud/sidebar-preview-non-preview
Roeland Jago Douma [Thu, 1 Dec 2016 20:14:10 +0000 (21:14 +0100)]
Merge pull request #2435 from nextcloud/sidebar-preview-non-preview

allow registering sidebar preview handlers for mimetypes that dont co…

7 years agoMerge pull request #2441 from nextcloud/optimize-createParentDirectories
Roeland Jago Douma [Thu, 1 Dec 2016 19:15:48 +0000 (20:15 +0100)]
Merge pull request #2441 from nextcloud/optimize-createParentDirectories

Prevent endless loop in \OC\Files\View::createParentDirectories

7 years agoCatch status code 400 2444/head
Lukas Reschke [Thu, 1 Dec 2016 18:13:28 +0000 (19:13 +0100)]
Catch status code 400

In case the server returns a statuscode 400 we should also gracefully return to the home directory.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd tests 2441/head
Lukas Reschke [Thu, 1 Dec 2016 17:52:32 +0000 (18:52 +0100)]
Add tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoPrevent endless loop in \OC\Files\View::createParentDirectories
Lukas Reschke [Thu, 1 Dec 2016 15:52:12 +0000 (16:52 +0100)]
Prevent endless loop in \OC\Files\View::createParentDirectories

\OC\Files\View::createParentDirectories was previously prone to an endless loop. If a path such as /foo/existingfile.txt/bar/foo was passed and existingfile.txt existed in foo the loop was never left and running until the PHP process timed out.

This commit changes the logic to a foreach loop over an array and additionally additional error handling using is_file.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2436 from nextcloud/fix_inline_action_gone
Björn Schießle [Thu, 1 Dec 2016 15:42:47 +0000 (16:42 +0100)]
Merge pull request #2436 from nextcloud/fix_inline_action_gone

We should always show permanent actions

7 years agoallow registering sidebar preview handlers for mimetypes that dont come with server... 2435/head
Robin Appelman [Thu, 1 Dec 2016 14:00:51 +0000 (15:00 +0100)]
allow registering sidebar preview handlers for mimetypes that dont come with server side previews

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agofix mouse pointer 2436/head
Bjoern Schiessle [Thu, 1 Dec 2016 14:37:08 +0000 (15:37 +0100)]
fix mouse pointer

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoWe should always show permanent actions
Roeland Jago Douma [Thu, 1 Dec 2016 14:16:06 +0000 (15:16 +0100)]
We should always show permanent actions

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2416 from nextcloud/cache_all_avatar_responses
Lukas Reschke [Thu, 1 Dec 2016 12:48:55 +0000 (13:48 +0100)]
Merge pull request #2416 from nextcloud/cache_all_avatar_responses

Cache all avatar responses

7 years agoMerge pull request #2423 from nextcloud/fix-language-names
Lukas Reschke [Thu, 1 Dec 2016 12:39:17 +0000 (13:39 +0100)]
Merge pull request #2423 from nextcloud/fix-language-names

Fix naming of languages

7 years agoMerge pull request #2430 from nextcloud/avatar_changelog
Roeland Jago Douma [Thu, 1 Dec 2016 12:00:10 +0000 (13:00 +0100)]
Merge pull request #2430 from nextcloud/avatar_changelog

Add avatar info to changelog

7 years agoMerge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares
Lukas Reschke [Thu, 1 Dec 2016 11:17:56 +0000 (12:17 +0100)]
Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares

Add share indicator for mail shares

7 years agoMerge pull request #2425 from nextcloud/show-real-apps-rating
Roeland Jago Douma [Thu, 1 Dec 2016 10:56:33 +0000 (11:56 +0100)]
Merge pull request #2425 from nextcloud/show-real-apps-rating

Show app store rating only for 5+ votes

7 years agoAdjust all implementations in the server repo 2432/head
Joas Schilling [Thu, 1 Dec 2016 10:35:23 +0000 (11:35 +0100)]
Adjust all implementations in the server repo

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd language to the parse method for emails
Joas Schilling [Thu, 1 Dec 2016 10:34:56 +0000 (11:34 +0100)]
Add language to the parse method for emails

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd avatar info to changelog 2430/head
Roeland Jago Douma [Thu, 1 Dec 2016 10:05:59 +0000 (11:05 +0100)]
Add avatar info to changelog

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 1 Dec 2016 01:07:17 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoShow app store rating only for 5+ votes 2425/head
Morris Jobke [Wed, 30 Nov 2016 14:59:02 +0000 (15:59 +0100)]
Show app store rating only for 5+ votes

* shows the rating of an app only if a given amount of ratings are given
* fixes #2001

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2422 from nextcloud/text-preview-debug
Robin Appelman [Wed, 30 Nov 2016 14:39:59 +0000 (15:39 +0100)]
Merge pull request #2422 from nextcloud/text-preview-debug

remove js debug statements in sidebar text preview generator

7 years agoLanguage 2423/head
Morris Jobke [Tue, 29 Nov 2016 18:02:29 +0000 (19:02 +0100)]
Language

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 30 Nov 2016 14:18:08 +0000 (14:18 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2419 from nextcloud/issue-template-location
Morris Jobke [Wed, 30 Nov 2016 14:10:38 +0000 (15:10 +0100)]
Merge pull request #2419 from nextcloud/issue-template-location

fix issue template location

7 years agoremove js debug statements in sidebar text preview generator 2422/head
Robin Appelman [Wed, 30 Nov 2016 13:54:54 +0000 (14:54 +0100)]
remove js debug statements in sidebar text preview generator

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2415 from nextcloud/fix_encrypted_trash_previews
Lukas Reschke [Wed, 30 Nov 2016 13:32:04 +0000 (14:32 +0100)]
Merge pull request #2415 from nextcloud/fix_encrypted_trash_previews

Ignore AppData in encryption wrapper

7 years agoMerge pull request #2417 from nextcloud/fix-password-change-in-user-mgt
Lukas Reschke [Wed, 30 Nov 2016 13:31:07 +0000 (14:31 +0100)]
Merge pull request #2417 from nextcloud/fix-password-change-in-user-mgt

Fix password change in user management

7 years agofix issue template location 2419/head
Robin Appelman [Wed, 30 Nov 2016 13:28:54 +0000 (14:28 +0100)]
fix issue template location

Fixes #2418

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #2406 from nextcloud/move-dav-activities-to-new-api
Roeland Jago Douma [Wed, 30 Nov 2016 13:01:58 +0000 (14:01 +0100)]
Merge pull request #2406 from nextcloud/move-dav-activities-to-new-api

Move dav activities to new api

7 years agoFix password change in user management 2417/head
Morris Jobke [Wed, 30 Nov 2016 12:36:37 +0000 (13:36 +0100)]
Fix password change in user management

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd tests for the base provider 2406/head
Joas Schilling [Wed, 30 Nov 2016 11:04:19 +0000 (12:04 +0100)]
Add tests for the base provider

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMove generic tests into namespace
Joas Schilling [Wed, 30 Nov 2016 10:41:38 +0000 (11:41 +0100)]
Move generic tests into namespace

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDeduplicate the provider code
Joas Schilling [Wed, 30 Nov 2016 10:38:49 +0000 (11:38 +0100)]
Deduplicate the provider code

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2405 from nextcloud/add-avatar-job-once
Roeland Jago Douma [Wed, 30 Nov 2016 10:36:01 +0000 (11:36 +0100)]
Merge pull request #2405 from nextcloud/add-avatar-job-once

Execute MoveAvatars repair step only once

7 years agoMerge pull request #1446 from nextcloud/fix-mail-design
Morris Jobke [Wed, 30 Nov 2016 10:31:43 +0000 (11:31 +0100)]
Merge pull request #1446 from nextcloud/fix-mail-design

Fix mail design

7 years agoAdd unit tests for ISetting instances
Joas Schilling [Wed, 30 Nov 2016 09:52:16 +0000 (10:52 +0100)]
Add unit tests for ISetting instances

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd tests for the filters
Joas Schilling [Wed, 30 Nov 2016 09:47:55 +0000 (10:47 +0100)]
Add tests for the filters

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2152 from nextcloud/preview_cleanupjob
Morris Jobke [Wed, 30 Nov 2016 09:39:21 +0000 (10:39 +0100)]
Merge pull request #2152 from nextcloud/preview_cleanupjob

Adds background job to cleanup all previews.

7 years agoMerge pull request #2414 from nextcloud/version_previews
Lukas Reschke [Wed, 30 Nov 2016 09:03:17 +0000 (10:03 +0100)]
Merge pull request #2414 from nextcloud/version_previews

Fix empty version previews

7 years agoCache all avatar responses 2416/head
Roeland Jago Douma [Wed, 30 Nov 2016 07:38:13 +0000 (08:38 +0100)]
Cache all avatar responses

* Cache for 30 minutes
* Also cache when avatar can't be found

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDisplay link share icon when toggling share 2371/head
Roeland Jago Douma [Wed, 30 Nov 2016 08:35:38 +0000 (09:35 +0100)]
Display link share icon when toggling share

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd an icon when the file is shared by mail
Joas Schilling [Mon, 28 Nov 2016 11:14:27 +0000 (12:14 +0100)]
Add an icon when the file is shared by mail

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAlso return the ShareByMail provider when getting all
Joas Schilling [Mon, 28 Nov 2016 11:13:55 +0000 (12:13 +0100)]
Also return the ShareByMail provider when getting all

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAlso get infos about email shares
Joas Schilling [Mon, 28 Nov 2016 11:13:34 +0000 (12:13 +0100)]
Also get infos about email shares

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMake sure the app is loaded in dav
Joas Schilling [Mon, 28 Nov 2016 11:13:10 +0000 (12:13 +0100)]
Make sure the app is loaded in dav

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #2409 from nextcloud/fix-1470
Roeland Jago Douma [Wed, 30 Nov 2016 08:02:34 +0000 (09:02 +0100)]
Merge pull request #2409 from nextcloud/fix-1470

log exception about user not present on LDAP on login only if logleve…

7 years agoMerge pull request #2105 from nextcloud/focus-tags-input-on-toggle
Roeland Jago Douma [Wed, 30 Nov 2016 07:57:00 +0000 (08:57 +0100)]
Merge pull request #2105 from nextcloud/focus-tags-input-on-toggle

Focus the input after clicking the "Tags" label

7 years agoFix minor mail issues 1446/head
Roeland Jago Douma [Wed, 30 Nov 2016 07:51:50 +0000 (08:51 +0100)]
Fix minor mail issues

* a nextcloud
* Strong username & url

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 30 Nov 2016 01:07:16 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoRemove leftovers from #1929
Morris Jobke [Tue, 29 Nov 2016 15:50:02 +0000 (16:50 +0100)]
Remove leftovers from #1929

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate sharedbymail template
Morris Jobke [Tue, 29 Nov 2016 15:31:40 +0000 (16:31 +0100)]
Update sharedbymail template

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix mail header logo [fixes #1326]
Felix Epp [Mon, 19 Sep 2016 14:00:41 +0000 (16:00 +0200)]
Fix mail header logo [fixes #1326]

Signed-off-by: Felix A. Epp <work@felixepp.de>
7 years agoIgnore AppData in encryption wrapper 2415/head
Roeland Jago Douma [Tue, 29 Nov 2016 21:01:04 +0000 (22:01 +0100)]
Ignore AppData in encryption wrapper

Fixes part of #2407

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix js tests 2414/head
Roeland Jago Douma [Tue, 29 Nov 2016 19:48:03 +0000 (20:48 +0100)]
Fix js tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoShow mimeicon when versions don't have a preview
Roeland Jago Douma [Tue, 29 Nov 2016 19:35:19 +0000 (20:35 +0100)]
Show mimeicon when versions don't have a preview

Fixes #2413

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2412 from nextcloud/filepicker-bottom-padding-fix
Christoph Wurst [Tue, 29 Nov 2016 18:30:15 +0000 (19:30 +0100)]
Merge pull request #2412 from nextcloud/filepicker-bottom-padding-fix

Fix #2408

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 29 Nov 2016 17:57:47 +0000 (17:57 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2410 from nextcloud/fix-mobile-text
Lukas Reschke [Tue, 29 Nov 2016 17:49:21 +0000 (18:49 +0100)]
Merge pull request #2410 from nextcloud/fix-mobile-text

Fix missing text for downloads on mobile

7 years agoFix #2408 2412/head
John Molakvoæ [Tue, 29 Nov 2016 16:41:34 +0000 (17:41 +0100)]
Fix #2408

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

7 years agoMerge pull request #2066 from nextcloud/fix-redirect-double-encoding
Morris Jobke [Tue, 29 Nov 2016 16:21:43 +0000 (17:21 +0100)]
Merge pull request #2066 from nextcloud/fix-redirect-double-encoding

do not double encode the redirect url

7 years agoFix missing text for downloads on mobile 2410/head
Morris Jobke [Tue, 29 Nov 2016 16:06:09 +0000 (17:06 +0100)]
Fix missing text for downloads on mobile

* fixes #2362

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agolog exception about user not present on LDAP on login only if loglevel is set to... 2409/head
Arthur Schiwon [Tue, 29 Nov 2016 16:05:55 +0000 (17:05 +0100)]
log exception about user not present on LDAP on login only if loglevel is set to debug

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge pull request #2388 from nextcloud/share-table-ellipsis
Morris Jobke [Tue, 29 Nov 2016 15:56:16 +0000 (16:56 +0100)]
Merge pull request #2388 from nextcloud/share-table-ellipsis

Fix whitespace between sharee name and icons #2384

7 years agoExecute MoveAvatars repair step only once 2405/head
Morris Jobke [Tue, 29 Nov 2016 15:05:09 +0000 (16:05 +0100)]
Execute MoveAvatars repair step only once

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2404 from nextcloud/streamresponse-warning
Joas Schilling [Tue, 29 Nov 2016 15:36:01 +0000 (16:36 +0100)]
Merge pull request #2404 from nextcloud/streamresponse-warning

prevent warning in StreamResponse

7 years agoMove event and todo parsing to new API
Joas Schilling [Tue, 29 Nov 2016 15:21:36 +0000 (16:21 +0100)]
Move event and todo parsing to new API

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDeduplicate icon assignment
Joas Schilling [Tue, 29 Nov 2016 14:56:22 +0000 (15:56 +0100)]
Deduplicate icon assignment

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd viewbox to the icons
Joas Schilling [Tue, 29 Nov 2016 14:48:07 +0000 (15:48 +0100)]
Add viewbox to the icons

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMove calendar activity parsing to new API
Joas Schilling [Tue, 29 Nov 2016 14:47:43 +0000 (15:47 +0100)]
Move calendar activity parsing to new API

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoprevent warning in StreamResponse 2404/head
Robin Appelman [Tue, 29 Nov 2016 14:29:02 +0000 (15:29 +0100)]
prevent warning in StreamResponse

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMove CalDAV activity settings to new API
Joas Schilling [Tue, 29 Nov 2016 14:06:54 +0000 (15:06 +0100)]
Move CalDAV activity settings to new API

Signed-off-by: Joas Schilling <coding@schilljs.com>
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 mobile view 2388/head
John Molakvoæ (skjnldsv) [Tue, 29 Nov 2016 12:47:37 +0000 (13:47 +0100)]
Fix mobile view

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
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 username width
John Molakvoæ (skjnldsv) [Tue, 29 Nov 2016 09:51:35 +0000 (10:51 +0100)]
Fix username width

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
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 agoFix #2384
John Molakvoæ (skjnldsv) [Tue, 29 Nov 2016 06:05:18 +0000 (07:05 +0100)]
Fix #2384

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