wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
37060 commits 157 branches 562 tags 714 MiB
Commit graph

37060 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
76bc3bcdef
Allow ordered lists as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-16 15:00:54 +01:00
Christoph Wurst
6726c98bbd
use constant and clean up unit test 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-16 13:14:15 +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
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
Joas Schilling
77577b952b
Make sure different webroots use different cached paths 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-12 15:58:18 +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
Christoph Wurst
140555b786
always allow remembered login 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
6f84eb89fc
fix constructor params in failing test 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
21d3fe5883
do not hard-require the token provider 
The provider might need DB access and therefore depenedency
resolution fails on the setup page where we cannot inject
the db implementation.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
6f74ecd94a
use login hook credentials as fallback 
If no session token is available, we can use the credentials provided
by the login hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
e4abb9cb6e
migrate 'password::sessioncredentials' extern storage auth to credential store 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
3316a9d294
fix @since annotations (9.1->12) 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
46adb3eced
replace session implementation if it changes at runtime 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
Christoph Wurst
730442cd8f
add @since annotations and document methods 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:10 +01:00
Christoph Wurst
a6dca9e7a0
add login credential store 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:09 +01:00