Commit Graph

36613 Commits

Author SHA1 Message Date
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
Morris Jobke 475e466d58 Merge pull request #3213 from nextcloud/ldap-ocs-stable11
[stable] 11 LDAP OCS API
2017-01-25 22:50:27 -06:00
Morris Jobke 66efe66580 Merge pull request #3115 from nextcloud/backport-3106-spreed-calls-are-objects
[stable11] Define spreed calls
2017-01-25 22:07:32 -06:00
Nextcloud bot 6b3ddd5ccd
[tx-robot] updated from transifex 2017-01-26 01:07:27 +00:00
Bjoern Schiessle 659320dfca
unify endpoints form core and the the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 14:19:41 +01:00
Bjoern Schiessle c4ae0cd433
add data from the users profile to the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 14:17:18 +01:00
Joas Schilling 1ae01c5eb5
Use correct plural implementation for upload estimation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 10:22:35 +01:00
Nextcloud bot 026ceab35f
[tx-robot] updated from transifex 2017-01-25 01:10:10 +00:00
Nextcloud bot 175435c76b
[tx-robot] updated from transifex 2017-01-24 01:07:25 +00:00
Arthur Schiwon 9299c9fc79
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>
2017-01-23 14:24:10 +01:00
Joas Schilling 275db05a46 Merge pull request #2953 from nextcloud/backport-2797-sudo-password-with-ldap
[stable11] Use login name to fix password confirm with ldap users
2017-01-23 12:09:38 +01:00
Nextcloud bot 34fff32409
[tx-robot] updated from transifex 2017-01-23 00:17:48 +00:00
Nextcloud bot 948ab09a18
[tx-robot] updated from transifex 2017-01-22 01:08:00 +00:00
Nextcloud bot 8c4a329b6d
[tx-robot] updated from transifex 2017-01-21 01:07:55 +00:00
Nextcloud bot f6b42901dc
[tx-robot] updated from transifex 2017-01-20 01:07:49 +00:00
Nextcloud bot 623ea04317
[tx-robot] updated from transifex 2017-01-19 01:08:17 +00:00
Christoph Wurst ecb6354933 Merge pull request #3138 from nextcloud/backport-2776-prevent-quotes-from-being-a-problem
[stable11] Escape the name for the jquery selector
2017-01-18 17:52:56 +01:00
Morris Jobke 98aa4557f6 Merge pull request #3143 from senden9/patch-2
Fix style in comment.
2017-01-18 10:33:25 -06:00
Stefano Probst 90bd4b1fc1 Fix style in comment.
Add missing grave accent to fix the highlighting in the documentation.
2017-01-18 16:42:11 +01:00
Joas Schilling d17635b502
Escape the name for the jquery selector
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 09:08:13 +01:00
Nextcloud bot 0c8220d57e
[tx-robot] updated from transifex 2017-01-18 01:07:47 +00:00
Joas Schilling 6eb31b5639 Merge pull request #3117 from nextcloud/backport-1594-markdown-support-for-app-descriptions
[stable11] Markdown support for app descriptions
2017-01-17 16:32:13 +01:00
Morris Jobke 4158f386b5
add a bit of space around paragraphs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-17 11:38:09 +01:00
Morris Jobke bc604299b5
fix list style of app description
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-17 11:37:50 +01:00
Joas Schilling e05f53e018
Allow ordered lists as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:37:37 +01:00
Lukas Reschke a30d170aca
Manually whitelist tags
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-17 11:37:26 +01:00
Lukas Reschke 2382bf9011
Apply DOMPurify over HTML
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-17 11:37:16 +01:00
Morris Jobke 45c12d26ce
Fix JSUnit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-17 11:37:06 +01:00
Joas Schilling 964d7b2389
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:57 +01:00
Joas Schilling a21dfdf8e7
Don't render non HTTP links, images and quotes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:49 +01:00
Joas Schilling 832007a993
Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:40 +01:00
Joas Schilling de1a89a12b
Remove the magic parsing of the description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:32 +01:00
Joas Schilling eb94f748c8
Render markdown
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:23 +01:00
Joas Schilling 33644d9da3
Add marked
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:10 +01:00