Commit Graph

36711 Commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv) 07da606caa
Css fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-15 12:34:54 +01:00
Arthur Schiwon 839f2342da
LDAP's checkPassword should only catch when a user was not found, fixes #2431
Also fixes error processing after ldap_search, due to different return format

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-15 11:50:36 +01:00
Nextcloud bot d41b2d688c
[tx-robot] updated from transifex 2017-02-15 01:07:38 +00:00
Morris Jobke 4e9f59dab2 Merge pull request #3481 from nextcloud/stable11-screensharing-icon
[stable11] add screensharing icon
2017-02-14 17:40:22 -06:00
Jan-Christoph Borchardt 9c1573d278 add screensharing icon
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-02-14 21:04:36 +01:00
Nextcloud bot 33c995bc47
[tx-robot] updated from transifex 2017-02-14 01:07:30 +00:00
Lukas Reschke bd3c99057b Merge pull request #3440 from nextcloud/backport-oc-26963
[stable11] Make sure invalid images don't flood the log file
2017-02-13 10:13:16 +01:00
Lukas Reschke 9ba080f5f8 Merge pull request #3445 from nextcloud/stable11-add-integration-tests-for-dav
[stable11] Add integration tests for legacy DAV endpoints
2017-02-13 10:11:28 +01:00
Nextcloud bot 2cb637ec85
[tx-robot] updated from transifex 2017-02-13 01:07:19 +00:00
Nextcloud bot 1e668ec02b
[tx-robot] updated from transifex 2017-02-12 01:07:36 +00:00
Nextcloud bot 61420af20c
[tx-robot] updated from transifex 2017-02-11 01:07:33 +00:00
Victor Dubiniuk 02a7e3f6d2
Check if color exists in palette before using it
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-10 16:28:32 +01:00
Lukas Reschke 886938718d
Add integration tests for legacy DAV endpoints
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-10 16:19:45 +01:00
Lukas Reschke f65b99c17d Merge pull request #3431 from nextcloud/backport-3430-fix-ios-client-detection
[stable11] Fix detection of the new iOS app
2017-02-10 14:45:54 +01:00
Lukas Reschke c025aa88d4 Merge pull request #3436 from nextcloud/stable11-increase-version
Increase version to 11.0.2 RC1
2017-02-10 14:03:49 +01:00
Joas Schilling 057f330879
Make sure invalid images don't flood the log file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 13:45:37 +01:00
Lukas Reschke 592af1fff1 Merge pull request #3259 from nextcloud/add-profile-data-to-provisioning-api-stable11
Add profile data to provisioning api stable11
2017-02-10 13:00:04 +01:00
Lukas Reschke 347008f125
Increase version to 11.0.2 RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-10 12:55:32 +01:00
Lukas Reschke 3f290315ef Merge pull request #3433 from nextcloud/backport-3181-fix-favorite-activity-mail
[stable11] Make sure the file information is available when sending the email
2017-02-10 12:49:39 +01:00
Lukas Reschke 7330430618 Merge pull request #3426 from nextcloud/stable11-set-vendor-during-install
[stable11] Set vendor during install
2017-02-10 11:41:06 +01:00
Lukas Reschke 020bf77dde Merge pull request #3286 from nextcloud/popover-backport
[stable11] popovermenu backport
2017-02-10 11:27:03 +01:00
Lukas Reschke 0cb59ad3f5 Merge pull request #3412 from nextcloud/backport-3394-files-activity-expects-parameter-1-to-be-an-array
[stable11] Make sure ownCloud 8.2 activities also can get displayed
2017-02-10 10:44:14 +01:00
Joas Schilling 372474603d
Make sure the file information is available when sending the email
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:35:29 +01:00
Joas Schilling 76a2bf72e6
Fix detection of the new iOS app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:13:33 +01:00
Morris Jobke 5c1bf139b4 Merge pull request #3414 from nextcloud/backport-3396-dont-log-password-on-failed-confirmation
[stable11] Don't log the password on confirmPassword when LDAP throws an exception
2017-02-10 00:08:47 -06:00
Morris Jobke 020fa06d34 Merge pull request #3411 from nextcloud/backport-3407-user-settings-email-accounts-table
[stable11] Update the email in the accounts table as well
2017-02-09 23:52:41 -06:00
Morris Jobke c6ed15b88e
Set vendor during install
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:39:58 -06:00
Morris Jobke eb31895ad5 Merge pull request #3423 from nextcloud/stable11-transifex
add transifex config for sharebymail
2017-02-09 20:14:24 -06:00
Morris Jobke e48f608b08
add transifex config for sharebymail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 19:56:04 -06:00
Nextcloud bot 3aeed578fc
[tx-robot] updated from transifex 2017-02-10 01:07:12 +00:00
Joas Schilling 1ee9bee489
Backport more fixes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 14:53:17 +01:00
Lukas Reschke 201055bf8c Merge pull request #3251 from nextcloud/fix-upload-estimation-translation
Use correct plural implementation for upload estimation
2017-02-09 14:45:46 +01:00
Joas Schilling 8d87ac3a9d
Don't log the password on confirmPassword when LDAP throws an exception
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:20:53 +01:00
Joas Schilling 1badbe922e
Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:17:22 +01:00
Joas Schilling fb3821406a
Add tests for getUser()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:53 +01:00
Joas Schilling b89e2ecd05
Add tests for getFile()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:44 +01:00
Joas Schilling 0f823b654a
Make sure ownCloud 8.2 activities also can get displayed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:15:36 +01:00
Joas Schilling 0ec38e2cf3
Update the email in the accounts table as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 12:13:27 +01:00
Nextcloud bot acc759e0c9
[tx-robot] updated from transifex 2017-02-09 01:07:20 +00:00
Joas Schilling d8916ddfd8 Merge pull request #3400 from nextcloud/backport-3023-filter-out-sensitive-appconfigs
[stable11] Filter out sensitive appconfig values
2017-02-08 12:10:13 +01:00
Lukas Reschke e803d8b00d Merge pull request #3399 from nextcloud/backport-3163-wrong-page-title-on-non-nonce-browser
[stable11] Use correct theming when returning the defaults
2017-02-08 10:10:27 +01:00
Nextcloud bot dfe4491b00
[tx-robot] updated from transifex 2017-02-08 01:07:18 +00:00
Morris Jobke 2c4f8089b0 Merge pull request #3363 from nextcloud/fix/2787/busy_also_for_creator_bug_stable11
fix shared-as-busy events for owner
2017-02-07 16:03:41 -06:00
Morris Jobke 98e99cf7ca Merge pull request #3397 from nextcloud/backport-3359-fix-sharing-app-description
[stable11] Fix Sharing app description
2017-02-07 10:47:33 -06:00
Joas Schilling cf849e621b
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 17:00:10 +01:00
Joas Schilling 7c366f1602
Filter out sensitive appconfig values
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 16:59:59 +01:00
Joas Schilling 7917ae7c23
Use correct theming when returning the defaults
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 16:57:30 +01:00
Joas Schilling 0cb057e256
Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 14:34:48 +01:00
Nextcloud bot cd82be929d
[tx-robot] updated from transifex 2017-02-07 01:09:03 +00:00
Nextcloud bot aa124646d2
[tx-robot] updated from transifex 2017-02-06 01:07:13 +00:00