]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Fri, 10 Feb 2017 10:27:03 +0000 (11:27 +0100)]
Merge pull request #3286 from nextcloud/popover-backport
[stable11] popovermenu backport
Lukas Reschke [Fri, 10 Feb 2017 09:44:14 +0000 (10:44 +0100)]
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
Morris Jobke [Fri, 10 Feb 2017 06:08:47 +0000 (00:08 -0600)]
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
Morris Jobke [Fri, 10 Feb 2017 05:52:41 +0000 (23:52 -0600)]
Merge pull request #3411 from nextcloud/backport-3407-user-settings-email-accounts-table
[stable11] Update the email in the accounts table as well
Morris Jobke [Fri, 10 Feb 2017 02:14:24 +0000 (20:14 -0600)]
Merge pull request #3423 from nextcloud/stable11-transifex
add transifex config for sharebymail
Morris Jobke [Fri, 10 Feb 2017 01:53:32 +0000 (19:53 -0600)]
add transifex config for sharebymail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Fri, 10 Feb 2017 01:07:12 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Thu, 9 Feb 2017 13:53:17 +0000 (14:53 +0100)]
Backport more fixes
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Thu, 9 Feb 2017 13:45:46 +0000 (14:45 +0100)]
Merge pull request #3251 from nextcloud/fix-upload-estimation-translation
Use correct plural implementation for upload estimation
Joas Schilling [Tue, 7 Feb 2017 11:16:11 +0000 (12:16 +0100)]
Don't log the password on confirmPassword when LDAP throws an exception
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 8 Feb 2017 10:55:50 +0000 (11:55 +0100)]
Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Tue, 7 Feb 2017 11:01:28 +0000 (12:01 +0100)]
Add tests for getUser()
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Tue, 7 Feb 2017 10:49:01 +0000 (11:49 +0100)]
Add tests for getFile()
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Tue, 7 Feb 2017 10:30:23 +0000 (11:30 +0100)]
Make sure ownCloud 8.2 activities also can get displayed
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 8 Feb 2017 12:52:55 +0000 (13:52 +0100)]
Update the email in the accounts table as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Thu, 9 Feb 2017 01:07:20 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Wed, 8 Feb 2017 11:10:13 +0000 (12:10 +0100)]
Merge pull request #3400 from nextcloud/backport-3023-filter-out-sensitive-appconfigs
[stable11] Filter out sensitive appconfig values
Lukas Reschke [Wed, 8 Feb 2017 09:10:27 +0000 (10:10 +0100)]
Merge pull request #3399 from nextcloud/backport-3163-wrong-page-title-on-non-nonce-browser
[stable11] Use correct theming when returning the defaults
Nextcloud bot [Wed, 8 Feb 2017 01:07:18 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 7 Feb 2017 22:03:41 +0000 (16:03 -0600)]
Merge pull request #3363 from nextcloud/fix/2787/busy_also_for_creator_bug_stable11
fix shared-as-busy events for owner
Morris Jobke [Tue, 7 Feb 2017 16:47:33 +0000 (10:47 -0600)]
Merge pull request #3397 from nextcloud/backport-3359-fix-sharing-app-description
[stable11] Fix Sharing app description
Joas Schilling [Thu, 12 Jan 2017 09:49:22 +0000 (10:49 +0100)]
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 11 Jan 2017 10:42:36 +0000 (11:42 +0100)]
Filter out sensitive appconfig values
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 19 Jan 2017 15:55:09 +0000 (16:55 +0100)]
Use correct theming when returning the defaults
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 2 Feb 2017 15:22:21 +0000 (16:22 +0100)]
Fix Sharing app description
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Tue, 7 Feb 2017 01:09:03 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Mon, 6 Feb 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 5 Feb 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 4 Feb 2017 01:07:29 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Georg Ehrke [Thu, 26 Jan 2017 11:02:27 +0000 (12:02 +0100)]
fix shared-as-busy events for owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Nextcloud bot [Fri, 3 Feb 2017 01:07:30 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 2 Feb 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Wed, 1 Feb 2017 01:07:06 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Tue, 31 Jan 2017 01:07:13 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Mon, 30 Jan 2017 01:07:22 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 29 Jan 2017 01:07:03 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 28 Jan 2017 01:07:09 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 27 Jan 2017 01:07:28 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
John Molakvoæ (skjnldsv) [Thu, 26 Jan 2017 17:15:55 +0000 (18:15 +0100)]
Fit newFileMenu to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Thu, 26 Jan 2017 17:10:16 +0000 (18:10 +0100)]
Fit federationScopeMenu to guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Thu, 26 Jan 2017 17:09:42 +0000 (18:09 +0100)]
Popover backport from 12
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Morris Jobke [Thu, 26 Jan 2017 04:50:27 +0000 (22:50 -0600)]
Merge pull request #3213 from nextcloud/ldap-ocs-stable11
[stable] 11 LDAP OCS API
Morris Jobke [Thu, 26 Jan 2017 04:07:32 +0000 (22:07 -0600)]
Merge pull request #3115 from nextcloud/backport-3106-spreed-calls-are-objects
[stable11] Define spreed calls
Nextcloud bot [Thu, 26 Jan 2017 01:07:27 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Wed, 25 Jan 2017 09:21:00 +0000 (10:21 +0100)]
Use correct plural implementation for upload estimation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Wed, 25 Jan 2017 01:10:10 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Tue, 24 Jan 2017 01:07:25 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Arthur Schiwon [Wed, 18 Jan 2017 20:13:23 +0000 (21:13 +0100)]
LDAP OCS API (Part 1)
LDAP OCS Api for create config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
LDAP OCS Api for delete config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix and extend behat tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
add LDAP OCS Api for modifying a configuration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
test against OCS v2 instead
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
LDAP OCS Api for show config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
also, let ldap integration tests run
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix indentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
enable user_ldap app for tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
LDAP PUT command now supports setting multiple keys at once
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
fix deletion for configIDs < s10
Also move ensureConfigIDExists checks into try, it might throw DB
related exceptions
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
remove outdated scenario
covered by "Delete a non-existing configuration"
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Joas Schilling [Mon, 23 Jan 2017 11:09:38 +0000 (12:09 +0100)]
Merge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldap
[stable11] Use login name to fix password confirm with ldap users
Nextcloud bot [Mon, 23 Jan 2017 00:17:48 +0000 (00:17 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 22 Jan 2017 01:08:00 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 21 Jan 2017 01:07:55 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 20 Jan 2017 01:07:49 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 19 Jan 2017 01:08:17 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Christoph Wurst [Wed, 18 Jan 2017 16:52:56 +0000 (17:52 +0100)]
Merge pull request #3138 from nextcloud/backport-2776-prevent-quotes-from-being-a-problem
[stable11] Escape the name for the jquery selector
Morris Jobke [Wed, 18 Jan 2017 16:33:25 +0000 (10:33 -0600)]
Merge pull request #3143 from senden9/patch-2
Fix style in comment.
Stefano Probst [Wed, 18 Jan 2017 15:42:11 +0000 (16:42 +0100)]
Fix style in comment.
Add missing grave accent to fix the highlighting in the documentation.
Joas Schilling [Tue, 20 Dec 2016 08:32:47 +0000 (09:32 +0100)]
Escape the name for the jquery selector
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Wed, 18 Jan 2017 01:07:47 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Tue, 17 Jan 2017 15:32:13 +0000 (16:32 +0100)]
Merge pull request #3117 from nextcloud/backport-1594-markdown-support-for-app-descriptions
[stable11] Markdown support for app descriptions
Morris Jobke [Tue, 17 Jan 2017 04:25:27 +0000 (22:25 -0600)]
add a bit of space around paragraphs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 17 Jan 2017 04:22:05 +0000 (22:22 -0600)]
fix list style of app description
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Mon, 16 Jan 2017 14:00:54 +0000 (15:00 +0100)]
Allow ordered lists as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Fri, 13 Jan 2017 17:46:41 +0000 (18:46 +0100)]
Manually whitelist tags
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Fri, 13 Jan 2017 17:30:43 +0000 (18:30 +0100)]
Apply DOMPurify over HTML
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Morris Jobke [Wed, 11 Jan 2017 16:08:52 +0000 (17:08 +0100)]
Fix JSUnit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Wed, 11 Jan 2017 09:57:26 +0000 (10:57 +0100)]
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 15 Dec 2016 16:07:07 +0000 (17:07 +0100)]
Don't render non HTTP links, images and quotes
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 12:41:55 +0000 (14:41 +0200)]
Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 12:41:37 +0000 (14:41 +0200)]
Remove the magic parsing of the description
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 12:41:19 +0000 (14:41 +0200)]
Render markdown
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Sep 2016 11:52:41 +0000 (13:52 +0200)]
Add marked
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Tue, 17 Jan 2017 09:08:02 +0000 (10:08 +0100)]
Add call-type in case the information shall be used for styling or something else in the future
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 16 Jan 2017 17:41:00 +0000 (18:41 +0100)]
Define spreed calls
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Tue, 17 Jan 2017 01:08:03 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 16 Jan 2017 17:02:23 +0000 (11:02 -0600)]
Merge pull request #3080 from nextcloud/share-by-mail-use-display-name-stable11
[stable11] generate correct path for owner and use the display name
Morris Jobke [Mon, 16 Jan 2017 16:45:10 +0000 (10:45 -0600)]
Merge pull request #3063 from nextcloud/backport-3051-change-row-format-before-collation
[stable11] Change the row-format before changing the collation
Bjoern Schiessle [Wed, 11 Jan 2017 17:11:27 +0000 (18:11 +0100)]
generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Nextcloud bot [Mon, 16 Jan 2017 01:15:59 +0000 (01:15 +0000)]
[tx-robot] updated from transifex
Lukas Reschke [Sun, 15 Jan 2017 15:49:00 +0000 (16:49 +0100)]
Bump to 11.0.1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Joas Schilling [Thu, 12 Jan 2017 15:54:29 +0000 (16:54 +0100)]
Change the row-format before changing the collation
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Thu, 12 Jan 2017 01:07:53 +0000 (01:07 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Wed, 11 Jan 2017 15:20:31 +0000 (15:20 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Tue, 10 Jan 2017 15:49:23 +0000 (16:49 +0100)]
Merge pull request #3010 from nextcloud/backport-3009-fix-calendar-todo-event-type
[stable11] Make sure the used event type and the setting/filter are the same
Roeland Jago Douma [Tue, 10 Jan 2017 14:47:33 +0000 (15:47 +0100)]
Merge pull request #3011 from nextcloud/backport-2951-handle-nextcloud-log-type-gracefully
[stable11] Handle log_type "nextcloud" more gracefully
Joas Schilling [Tue, 10 Jan 2017 11:58:23 +0000 (12:58 +0100)]
Better fallback for unknown log types
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Mon, 9 Jan 2017 09:55:40 +0000 (10:55 +0100)]
Add tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 5 Jan 2017 11:47:27 +0000 (12:47 +0100)]
Handle log_type "nextcloud" more gracefully
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Tue, 10 Jan 2017 11:28:55 +0000 (12:28 +0100)]
Make sure the used event type and the setting/filter are the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Tue, 10 Jan 2017 08:59:57 +0000 (09:59 +0100)]
Merge pull request #2980 from nextcloud/backport-2930-kill-group-restriction-when-not-applicable
[stable11] Remove group restrictions when those are not allowed anymore
Morris Jobke [Tue, 10 Jan 2017 08:57:03 +0000 (09:57 +0100)]
Merge pull request #2994 from nextcloud/stable11_2987
dont write a certificate bundle if the shipped ca bundle is empty
Christoph Wurst [Mon, 9 Jan 2017 21:30:52 +0000 (22:30 +0100)]
Merge pull request #2993 from nextcloud/stable11-rc1
Increase version to 11.0.1 RC1
Robin Appelman [Mon, 9 Jan 2017 13:26:31 +0000 (14:26 +0100)]
dont write a certificate bundle if the shipped ca bundle is empty
Signed-off-by: Robin Appelman <robin@icewind.nl>
Lukas Reschke [Mon, 9 Jan 2017 20:11:17 +0000 (21:11 +0100)]
Increase version to 11.0.1 RC1
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Roeland Jago Douma [Mon, 9 Jan 2017 18:37:16 +0000 (19:37 +0100)]
Merge pull request #2981 from nextcloud/backport-2854-2fa-redirect-url
[stable11] Set redirect_url on 2FA challenge page
Morris Jobke [Mon, 9 Jan 2017 17:38:25 +0000 (18:38 +0100)]
Merge pull request #2988 from nextcloud/backport-2933-dont-link-to-oc-forum
[stable11] Don't link to the oC forum
Joas Schilling [Wed, 4 Jan 2017 11:44:10 +0000 (12:44 +0100)]
Don't link to the oC forum
Signed-off-by: Joas Schilling <coding@schilljs.com>
Christoph Wurst [Fri, 23 Dec 2016 19:53:26 +0000 (20:53 +0100)]
Set redirect_url on 2FA challenge page
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Joas Schilling [Wed, 4 Jan 2017 09:40:14 +0000 (10:40 +0100)]
Remove group restrictions when those are not allowed anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Mon, 9 Jan 2017 08:25:08 +0000 (08:25 +0000)]
[tx-robot] updated from transifex
projects / nextcloud-server.git / log