Commit Graph

36946 Commits

Author SHA1 Message Date
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
Christoph Wurst 3b76699c9c
Increase 2fa backup codes entropy
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 11:24:03 +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
John Molakvoæ (skjnldsv) 0ec6ea5ace
Copyright and code format
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-12 19:49:09 +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) 052eb98c18
Header scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-12 15:18:21 +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
Vincent Petry 269b652754
Add tests for move/copy hooks in Node API
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-12 13:52:59 +01:00
Vincent Petry e667b28298
Fix files node API failed rename/copy
Whenever a rename or copy operation failed on the view, we must throw
an exception instead of just ignoring.

Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-12 13:52:59 +01:00
Bjoern Schiessle 27357569b6
generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-12 12:44:41 +01:00
Joas Schilling 5dc6899d1a
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-12 10:49:22 +01:00
Morris Jobke 00c3f807db Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu
Fit federationScopeMenu to guidelines
2017-01-12 10:09:30 +01:00
Nextcloud bot 09a46b7bd6
[tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
John Molakvoæ a3e31116b1
Update federationscopemenu.js
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:20:01 +01:00
John Molakvoæ (skjnldsv) 67c4f3d07c
App-navigation action layout fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 21:01:54 +01:00
John Molakvoæ fab82e9780 Merge pull request #3029 from nextcloud/systemtags-scss-optimisation
Systemtags scss optimisation
2017-01-11 18:41:14 +01:00
John Molakvoæ (skjnldsv) dda4b3b272
Fix padding if empty button
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 18:37:59 +01:00
John Molakvoæ 3463c134a9 Merge pull request #3027 from nextcloud/multiselect-scss-optimisation
Multiselect scss optimisation
2017-01-11 18:24:15 +01:00
Morris Jobke b6c00a3f51 Merge pull request #3026 from nextcloud/icons-scss-optimisation
Icons scss optimisation
2017-01-11 16:52:27 +01:00
Roeland Jago Douma 96d2f2f124 Merge pull request #3028 from nextcloud/tooltip-scss-optimisation
Tooltip scss optimisation
2017-01-11 16:38:18 +01:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Vincent Petry eb5ea0e260
Refactor files node API for more code reuse
Signed-off-by: Vincent Petry <pvince81@owncloud.com>
2017-01-11 14:53:42 +01:00
John Molakvoæ (skjnldsv) dfee6ffaca
Systemtags scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:38:35 +01:00
John Molakvoæ (skjnldsv) 2899f34c4c
Tooltip scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:33:11 +01:00
John Molakvoæ (skjnldsv) 8317a71fee
Multiselect scss optimisation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:22:19 +01:00
John Molakvoæ (skjnldsv) 2a2d4390c6
Comments and delete icon
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:16:05 +01:00
John Molakvoæ (skjnldsv) 27a1dadea4
Loader and animation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-11 14:12:39 +01:00