Commit Graph

36546 Commits

Author SHA1 Message Date
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
Nextcloud bot 335f2087a3
[tx-robot] updated from transifex 2017-02-05 01:07:13 +00:00
Nextcloud bot 69f0bfb2c1
[tx-robot] updated from transifex 2017-02-04 01:07:29 +00:00
Georg Ehrke d398de5c6a
fix shared-as-busy events for owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-02-03 11:08:13 +01:00
Nextcloud bot 8d12c43556
[tx-robot] updated from transifex 2017-02-03 01:07:30 +00:00
Nextcloud bot d71e472ab6
[tx-robot] updated from transifex 2017-02-02 01:07:13 +00:00
Nextcloud bot 44264daa42
[tx-robot] updated from transifex 2017-02-01 01:07:06 +00:00
Nextcloud bot 97a4688580
[tx-robot] updated from transifex 2017-01-31 01:07:13 +00:00
Nextcloud bot 6ab21c2e94
[tx-robot] updated from transifex 2017-01-30 01:07:22 +00:00
Nextcloud bot ea51c2fc12
[tx-robot] updated from transifex 2017-01-29 01:07:03 +00:00
Nextcloud bot 89cd31bd0f
[tx-robot] updated from transifex 2017-01-28 01:07:09 +00:00
Nextcloud bot edb9d83658
[tx-robot] updated from transifex 2017-01-27 01:07:28 +00:00
John Molakvoæ (skjnldsv) 9e7afbf6cb
Fit newFileMenu to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 18:32:25 +01:00
John Molakvoæ (skjnldsv) 0b83a25208
Fit federationScopeMenu to guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 18:32:25 +01:00
John Molakvoæ (skjnldsv) aa636f0450
Popover backport from 12
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-26 18:32:25 +01:00
Bjoern Schiessle 757f1b922c
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:34:07 +01:00