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

43871 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ (skjnldsv)
5518415829
Fixes since requirement 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-24 17:52:15 +02:00
John Molakvoæ (skjnldsv)
97af7566e4
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-24 17:52:15 +02:00
John Molakvoæ (skjnldsv)
10c135ca34
Added disabled count per groups 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-24 17:52:15 +02:00
Morris Jobke
6689a3e37b
Merge pull request #9582 from nextcloud/feature/2593/password-confirm-texts 
Allow custom text for OC.PasswordConfirmation
 2018-05-24 17:47:02 +02:00
Julius Härtl
354c6e95d5
Allow empty route for navigation entries 
Navigation entries might be handled by javascript, as the about section
from https://github.com/nextcloud/firstrunwizard/pull/64 so we don't
need a route for that.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-24 16:28:05 +02:00
Julius Härtl
e1af2f4766
Rename sync clients section to mobile & desktop 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-24 15:06:28 +02:00
Robin Appelman
07e5b30b90
remove unneeded is_dir from file cache gc 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-24 14:24:10 +02:00
Robin Appelman
51724a35a4
use getUserFolder instead of getFileInfo when constructing FilesHome 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-24 14:17:53 +02:00
Julius Härtl
d44cbc8118
Add custom texts to apps management password checks 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-24 14:02:56 +02:00
Julius Härtl
10b33cd5d0
Add placeholder to input in OCdialog prompt 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-24 14:02:25 +02:00
Julius Härtl
33b65faba0
Allow to specify custom text on admin password confirmation dialogs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-24 14:01:58 +02:00
Morris Jobke
fd4a7bf72a
Merge pull request #9574 from nextcloud/search-category 
Add search category icon
 2018-05-24 09:20:51 +02:00
John Molakvoæ (skjnldsv)
54de42109e
Add search category icon 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-24 07:18:44 +02:00
Nextcloud bot
caa3953245
[tx-robot] updated from transifex 2018-05-24 00:13:48 +00:00
Roeland Jago Douma
84482eb25a
Merge pull request #9435 from nextcloud/bugfix/noid/fix_force_language_html_attr 
make sure force language is reflected in html lang attribute
 2018-05-23 23:45:24 +02:00
Roeland Jago Douma
4286e17777
Always set the request language to the force language 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 21:19:46 +02:00
Morris Jobke
6b6d522969
Merge pull request #9395 from nextcloud/scanner-error-lock-cleanup 
cleanup locks in scanner on error
 2018-05-23 20:05:01 +02:00
Morris Jobke
3a41db7f67
Merge pull request #9564 from nextcloud/techdebt/noid/new-sharing 
Improve test code to be done with new sharing
 2018-05-23 19:49:02 +02:00
Roeland Jago Douma
9c23c7c821
Fix ViewTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 19:12:51 +02:00
Roeland Jago Douma
33b639d23c
Fix ExpiresSharesJobTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 19:12:02 +02:00
Roeland Jago Douma
c5042f1545
Use node api 
* delete old test that can't happen anymore since we check for a valid
node

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 19:10:11 +02:00
Roeland Jago Douma
d42515a934
Merge pull request #9561 from nextcloud/techdebt/noid/cron.php 
Fix code style
 2018-05-23 18:27:33 +02:00
Joas Schilling
7860c81523
Fix code style 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-05-23 17:33:11 +02:00
Roeland Jago Douma
e11a523ce9
Merge pull request #9557 from nextcloud/fix/noid/cleanup 
Remove .lgtm file
 2018-05-23 16:00:04 +02:00
Roeland Jago Douma
b3aec38e5e
Remove .lgtm file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 14:49:22 +02:00
Morris Jobke
d0942e135a
Merge pull request #9556 from nextcloud/package-security-fix 
Updated settings package deps
 2018-05-23 14:49:07 +02:00
John Molakvoæ (skjnldsv)
193df8304d
Updated settings package deps 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-23 13:55:11 +02:00
John Molakvoæ
9296b81c8d
Merge pull request #9555 from nextcloud/users-list-improvements 
Fixed IE design, subadmins groups update and multiselect base width
 2018-05-23 10:23:34 +02:00
John Molakvoæ (skjnldsv)
aa1c6fb6b4
Fixed IE design, subadmins groups update and multiselect base width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-23 09:43:33 +02:00
Nextcloud bot
4bbad8f88a
[tx-robot] updated from transifex 2018-05-23 00:15:44 +00:00
Morris Jobke
a2c518ee5a
Merge pull request #8824 from nextcloud/settings-vue 
Vue migration: settings
 2018-05-23 00:32:46 +02:00
Georg Ehrke
2a21471c74
make sure force language is reflected in html lang attribute 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-05-22 19:30:25 +02:00
Georg Ehrke
367ca563b4
allow admins to override FreeBusy capabilities without modifying ShareAPI capabilities 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-05-22 19:16:26 +02:00
Morris Jobke
b40bae816a
Merge pull request #9545 from nextcloud/bugfix/noid/ellipsis-below-public-textfiles 
Remove ellipsis below public text file shares
 2018-05-22 16:33:29 +02:00
Morris Jobke
245d20f9ac
Merge pull request #9531 from remyj38/master 
Fix translation bug on lost password page
 2018-05-22 16:31:30 +02:00
Jan-Christoph Borchardt
cbe5c193d0
Merge pull request #9538 from nextcloud/bugfix/noid/active-indicator-width 
Increase width of other active navigation indicators to 4px
 2018-05-22 15:53:42 +02:00
Roeland Jago Douma
0c7a797652
Merge pull request #9544 from nextcloud/bugfix/noid/fix-phpdoc 
Fix PHPDoc
 2018-05-22 15:39:07 +02:00
Morris Jobke
8c043dd00d
Remove ellipsis below public text file shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-22 15:14:23 +02:00
Morris Jobke
96efc42584
Fix PHPDoc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-22 15:11:32 +02:00
John Molakvoæ (skjnldsv)
760b01e8db
Fix api error 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-22 10:33:48 +02:00
Roeland Jago Douma
57d4a16cfb
Merge pull request #9517 from nextcloud/feature/noid/improve_oauth_handling 
Improve OAuth handling
 2018-05-22 10:16:45 +02:00
Roeland Jago Douma
6fac639747
Merge pull request #9520 from nextcloud/3rdparty/noid/bump_phpseclib 
[3rdparty] Bump phpseclib to 2.0.11
 2018-05-22 09:24:53 +02:00
Roeland Jago Douma
461998dd15
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
5a97148863
Don't use special chars to avoid confusion 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
f7ecec855b
Rotate token 
On a refresh token request:
* rorate
* reset expire

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
c28b25c4f0
Authenticate the clients on requesting a token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
4e3aef22a1
Fail if the response type is not properly set 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
49795d2006
Set OAuth token expiration 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-22 09:24:17 +02:00
Roeland Jago Douma
bbcb36cd60
Merge pull request #9513 from nextcloud/3rdparty/noid/bump_autosize 
Bump autosize to 4.0.2
 2018-05-22 09:22:39 +02:00
Roeland Jago Douma
d4464cc3ef
Merge pull request #9515 from nextcloud/bugfix/noid/reset_session_when_auth_against_protected_share 
Regenerate session id after public share auth
 2018-05-22 09:21:39 +02:00