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

45194 Commits

Author SHA1 Message Date
Roeland Jago Douma 7ba57233bf
Merge pull request #10592 from nextcloud/allow-external-actions-userslist 
Allow external actions to users list
 2018-08-13 15:39:22 +02:00
Roeland Jago Douma 05b249844e
Merge pull request #10659 from danielkesselberg/feature/noid/remove-xcache 
Drop support for xcache
 2018-08-13 13:55:26 +02:00
John Molakvoæ (skjnldsv) b9a24bfef8
Allow external actions to users list 
+ Created fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-13 11:33:48 +02:00
Roeland Jago Douma b0c18b8117
Merge pull request #10666 from nextcloud/update/crl2 
Another CRL bump
 2018-08-13 11:31:03 +02:00
Roeland Jago Douma 0fb2c50f17
Another CRL bump 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-13 10:28:23 +02:00
Roeland Jago Douma 6e009c790f
Merge pull request #10664 from nextcloud/update/crl 
Update CRL
 2018-08-13 10:19:05 +02:00
Roeland Jago Douma 45385e8114
Update CRL 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-13 09:53:19 +02:00
Nextcloud bot ccb040ee01
[tx-robot] updated from transifex 2018-08-13 00:12:09 +00:00
Daniel Kesselberg 0d7f9e1b8c
Update autoloader 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-08-12 18:26:50 +02:00
Daniel Kesselberg bfa49410a2
Drop support for xcache 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-08-12 17:14:08 +02:00
Nextcloud bot 4cdad9b69f
[tx-robot] updated from transifex 2018-08-11 00:12:30 +00:00
Roeland Jago Douma 2afd37331e
Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldap 
do not trigger counting on LDAP
 2018-08-10 20:54:18 +02:00
Roeland Jago Douma c2dfea57c8
Merge pull request #10639 from nextcloud/bugfix/10607/appsettings-fixes 
Fix apps management sorting and app removal
 2018-08-10 16:18:46 +02:00
Roeland Jago Douma e22d15c3a1
Merge pull request #10642 from nextcloud/bump/autoloaders 
Bump autoloaders
 2018-08-10 16:18:00 +02:00
Arthur Schiwon 1b74bfc999
do not trigger counting on LDAP 
it's probably too many, degregading performance

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-10 15:39:52 +02:00
Roeland Jago Douma 9cb1b1b76e
Recompile 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-10 15:22:53 +02:00
Roeland Jago Douma 80dd312e74
Merge pull request #10615 from nextcloud/fix-trashbin-actions 
Fix trashbin file actions
 2018-08-10 15:09:28 +02:00
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
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
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
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
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
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
Roeland Jago Douma ca0f2f63eb
Merge pull request #10537 from MartB/mselect_fix 
Fix multiSelectMenu for public shares #10536
 2018-08-09 10:41:38 +02:00
Roeland Jago Douma a21c93a3cf
Merge pull request #8690 from nextcloud/feature/8565/make-thunderbird-and-outlook-addons-identifyable 
[Part2] Make thunderbird and outlook addons identifyable
 2018-08-09 09:55:26 +02:00
Roeland Jago Douma ad8e7d8665
Merge pull request #10597 from nextcloud/fix/10583/guest-icon-paths 
Restores the guest icons
 2018-08-09 09:45:45 +02:00
Roeland Jago Douma b4e282e477
Merge pull request #10599 from nextcloud/fix/app-code-checker-ignore-build-dir 
Fix app code checker to ignore `build` directory
 2018-08-09 08:50:31 +02:00