mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
36,809 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

36809 Commits

Author SHA1 Message Date
Joas Schilling 5d1f7e5a7b
Allow subadmins to add people to groups via provisioning api 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-18 14:34:38 +01:00
Joas Schilling d80a4453af
Make sure subadmins can not delete users from their last subadmin group 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-18 11:56:24 +01:00
Joas Schilling 55db07a20b
Fix CamelCasing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-18 11:45:26 +01:00
Joas Schilling ae77067a07
No need to check the subadmin again 
The user needs to be a subadmin of the group,
otherwise they are not allowed to remove anyone from the group

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-18 11:43:52 +01:00
Nextcloud bot 4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Morris Jobke 08cdcf8f7f Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problem 
Escape the name for the jquery selector
 2017-01-17 18:40:11 -06:00
Lukas Reschke 4009d3db03 Merge pull request #3116 from nextcloud/spreed-turnserver-secret-is-sensitive 
Make sure the spreed TURN server secret stays a secret
 2017-01-17 14:49:43 +01:00
Joas Schilling ce973929e8 Merge pull request #3075 from nils/debug-no-versionhash 
Do not add version hash in debug mode
 2017-01-17 11:44:50 +01:00
Joas Schilling 35b8f03c07 Merge pull request #3106 from nextcloud/spreed-calls-are-objects 
Define spreed calls
 2017-01-17 11:42:13 +01:00
Joas Schilling 30b9262a5a
Make sure the spreed TURN server secret stays a secret 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-17 11:29:10 +01:00
Björn Schießle 61c68d4ebe Merge pull request #3114 from nextcloud/menuitem-fix 
Add menuitem to popover menu
 2017-01-17 11:12:49 +01:00
Joas Schilling aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions 
Markdown support for app descriptions
 2017-01-17 11:11:16 +01:00
Christoph Wurst 012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs 
Filter out sensitive appconfig values
 2017-01-17 11:01:42 +01:00
John Molakvoæ 75587cf135 Add menuitem to popover menu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-17 10:11:08 +01:00
Joas Schilling 377e536417
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>
 2017-01-17 10:08:02 +01:00
Morris Jobke 6ba7ba6e0c
add a bit of space around paragraphs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-16 22:25:27 -06:00
Morris Jobke aadfadfcf1
fix list style of app description 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-16 22:22:05 -06:00
Nextcloud bot b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Morris Jobke 250b7119b7 Merge pull request #3096 from nextcloud/update-theme-urls 
Prevent Example-Theme from using invalid URLs
 2017-01-16 11:42:08 -06:00
Joas Schilling 745b707cd9
Define spreed calls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-16 18:41:00 +01:00
Marius Blüm 5e2995923d
Prevent Example-Theme from using invalid URLs 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-01-16 17:52:28 +01:00
Joas Schilling 182f570b04 Merge pull request #3070 from dnel/Clarify-English-setting 
Clarify that English refers to US English
 2017-01-16 15:17:09 +01:00
Joas Schilling 76bc3bcdef
Allow ordered lists as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-16 15:00:54 +01:00
Björn Schießle 6c7a7e0c1a Merge pull request #3033 from nextcloud/share-by-mail-use-display-name 
generate correct path for owner and use the display name instead of t…
 2017-01-16 12:29:16 +01:00
Nextcloud bot 203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Nils ba3506c431 [Enhancement] Do not add version hash in debug mode 
Signed-off-by: Nils <git@to.nilsschnabel.de>
 2017-01-15 13:29:32 +01:00
Lukas Reschke ddfc7e6a3f
Manually whitelist tags 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-13 18:58:18 +01:00
Lukas Reschke 6a047a045a
Apply DOMPurify over HTML 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-13 18:58:18 +01:00
Morris Jobke 4d7dee5996
Fix JSUnit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-13 18:33:43 +01:00
Joas Schilling fcfb4205bc
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:43 +01:00
Joas Schilling 1a7d713883
Don't render non HTTP links, images and quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:43 +01:00
Joas Schilling d26b902a13
Fix "broken" app descriptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:42 +01:00
Joas Schilling 587eca3ccd
Remove the magic parsing of the description 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:42 +01:00
Joas Schilling 1e453576dd
Render markdown 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:42 +01:00
Joas Schilling e7a2151c4d
Add marked 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:42 +01:00
Joas Schilling c371e2f532 Merge pull request #3062 from nextcloud/user-settings-tooltip 
use tooltip in user list
 2017-01-13 16:53:18 +01:00
John Molakvoæ 8d8aff1bce Merge pull request #3024 from nextcloud/apps-scss-optimisation 
Apps scss optimisation
 2017-01-13 16:31:16 +01:00
John Molakvoæ 127024d89d Merge pull request #3048 from nextcloud/share-scss-optimisation 
Share scss optimisation
 2017-01-13 16:03:17 +01:00
John Molakvoæ (skjnldsv) ce9c833c5b
App navigation utils button fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-13 15:31:42 +01:00
David Nelson deb05a9f9d Update personal.php 2017-01-13 14:01:46 +00:00
Joas Schilling 0f792fedef Merge pull request #3060 from nextcloud/cleanup-js-tests 
Cleanup js tests
 2017-01-13 14:47:06 +01:00
Joas Schilling 91beb178a7 Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-collation 
Change the row-format before changing the collation
 2017-01-13 14:43:06 +01:00
Christoph Wurst c70b3f0e46 use tooltip in user list 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 14:01:15 +01:00
Christoph Wurst dd88e70dff fix image warnings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:49:37 +01:00
Christoph Wurst c82befbc00 allow/fix loading of fonts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:46:06 +01:00
Christoph Wurst da28a1612e expect warning to be shown 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:33:12 +01:00
Morris Jobke 622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements 
create new encryption keys on password reset and backup the old one
 2017-01-13 11:28:43 +01:00
Christoph Wurst 9d56d5e94d add spies for l10n warnings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:20:19 +01:00
Joas Schilling 77b5d7bc86
Change the row-format before changing the collation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-12 16:54:29 +01:00
John Molakvoæ (skjnldsv) bab09dc5d4
Share scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-12 15:02:14 +01:00