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

45499 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
90a656305b
Bump autoloaders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-10 15:03:22 +02:00
Roeland Jago Douma
7aad5b7721
Merge pull request #10543 from nextcloud/ignore-deactivated-users 
Do not show deactivated users in sharees and contacts
 2018-08-10 15:01:14 +02:00
Roeland Jago Douma
674d5f2924
Merge pull request #10623 from nextcloud/bugfix/10622/mobile-header 
Apply flex-basis to right header
 2018-08-10 14:55:06 +02:00
Julius Härtl
da60031b54
Bump bundled javascript from settings 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-10 13:56:52 +02:00
Julius Härtl
e74181b84b
Sort apps by a proper hierarchical order (active, update, name) 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-10 13:56:14 +02:00
John Molakvoæ (skjnldsv)
846b8572ed
Tests fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-10 13:54:21 +02:00
Julius Härtl
1abf0717df
Fix removeing apps in the sidebar 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-10 13:38:06 +02:00
Roeland Jago Douma
7191d676ab
Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-update 
Redirect to the same page after an update
 2018-08-10 11:14:03 +02:00
blizzz
d2b9b78c70
Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codes 
Fix 2FA being enforced if only backup codes provider is active
 2018-08-10 11:06:40 +02:00
Roeland Jago Douma
a080c425cd
Merge pull request #10618 from nextcloud/mimetype-insert-if-not-exists 
use insertIfNotExists to store new mimetypes.
 2018-08-10 10:31:55 +02:00
Christoph Wurst
3254b85c12
Merge pull request #10546 from nextcloud/popover-tokens 
Popovermenu fix and token settings design fixes
 2018-08-10 09:38:27 +02:00
Christoph Wurst
5c70aa2a22
Remove unused import 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-10 09:30:17 +02:00
Christoph Wurst
1124b87bc0
Fix 2FA being enforced if only backup codes provider is active 
Fixes https://github.com/nextcloud/server/issues/10634.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-10 09:26:40 +02:00
Nextcloud bot
103a2c30fb
[tx-robot] updated from transifex 2018-08-10 00:12:26 +00:00
Arthur Schiwon
59e35e3bf7
tests for user storage location 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-10 00:28:44 +02:00
Arthur Schiwon
b069b13226
convert pagination tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:12 +02:00
Arthur Schiwon
0f6d98eed2
convert connection tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:12 +02:00
Arthur Schiwon
f1cd4bc0c2
fix prov tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:12 +02:00
Arthur Schiwon
8808da816d
simplify tests and move some out to a new feature as we need a pristine 
database for them

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:12 +02:00
Arthur Schiwon
eaf352b8d1
integration test to ensure entries without displayname don't cause trouble 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:11 +02:00
Arthur Schiwon
d1a8a909de
login does not save the response 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:11 +02:00
Arthur Schiwon
4e8db8aa11
convert LDAP offline and backup server integration tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:11 +02:00
Arthur Schiwon
a39c995083
FIX: emit assignedUserId only for users 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:11 +02:00
Arthur Schiwon
3450ed4536
integration test checking the group filter 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:10 +02:00
Arthur Schiwon
b4eeb9eff5
check user details 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:10 +02:00
Arthur Schiwon
86d145f069
behat integration tests for LDAP, basic setup 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-09 23:45:04 +02:00
Roeland Jago Douma
f630b12fc7
Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_file 
Do not use file as template parameter
 2018-08-09 19:49:47 +02:00
Michael Weimann
3f790bb85b
Excludes not writable app roots from the directory permission check 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-09 19:49:01 +02:00
Michael Weimann
ebcfe33d0d
Extends the setup check js tests 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-09 19:48:39 +02:00
Michael Weimann
0017cbe18a
Adds a test for the app directory permission check. 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-09 19:48:19 +02:00
Michael Weimann
b2e60e365d
Adds a setup check for app directory permissions. 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-09 19:47:55 +02:00
Roeland Jago Douma
7dc4fadc21
Merge pull request #10626 from nextcloud/bugfix/noid/quickaccess-spaces 
Fix quickaccess active indicator for folders with spaces
 2018-08-09 19:44:17 +02:00
Julius Härtl
d54635fc7d
Fix quickaccess active indicator for folders with spaces 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-09 18:31:02 +02:00
Roeland Jago Douma
46d340045d
Merge pull request #10598 from schoonc/patch-1 
Removed unused variable isFile
 2018-08-09 17:00:03 +02:00
Julius Härtl
c954eb1d12
Apply flex-basis to right header 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-09 16:46:43 +02:00
Roeland Jago Douma
8c1e75e052
Do not use file as template parameter 
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-09 16:45:25 +02:00
Joas Schilling
e1d3965883
Add the ToS app to the enterprise bundle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-09 16:12:48 +02:00
Roeland Jago Douma
88603e98f8
Merge pull request #10611 from nextcloud/fix/2fa-provider-user-dao-duplicate-key 
Fix duplicate key violation in 2FA provider registry DAO
 2018-08-09 15:52:51 +02:00
Robin Appelman
5e9d6b1585
use insertIfNotExists to store new mimetypes. 
Also throw an error if we can't find the mimetype after insert

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-09 15:20:55 +02:00
Julius Härtl
4823b2746e
Redirect to the same page after an update 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-09 15:19:58 +02:00
Robin Appelman
16909f04c2
Fix trashbin file actions 
Fixes #10491

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-09 14:31:02 +02:00
Christoph Wurst
8db66d5dfb
Fix double-inserts of the same provider state 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-09 13:56:04 +02:00
Christoph Wurst
85bc5edb5e
Add integration/unit test for the double-insert of same values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-09 13:43:00 +02:00
John Molakvoæ (skjnldsv)
fc4f122881
Align to the left 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-09 12:47:50 +02:00
John Molakvoæ (skjnldsv)
1d05e457d6
Typo 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-09 12:46:08 +02:00
John Molakvoæ (skjnldsv)
fd806366ca
Fix header menu & contact popover 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-09 12:42:59 +02:00
Roeland Jago Douma
0757c52980
Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect 
Fix login redirection if only one 2FA provider is active
 2018-08-09 12:27:29 +02:00
Roeland Jago Douma
def2bf2086
Merge pull request #10604 from nextcloud/release/14/beta3 
Nextcloud 14.0.0 beta3
 2018-08-09 11:29:01 +02:00
Roeland Jago Douma
dff35edaca
Nextcloud 14.0.0 beta3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-09 11:18:21 +02:00
Björn Schießle
6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares 
Add support for room shares
 2018-08-09 10:44:11 +02:00