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

48817 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
3f8235da62
Merge pull request #14583 from nextcloud/remove-g+-federation 
Remove Google+ federation usersettings
 2019-03-08 09:04:01 +01:00
blizzz
3af7f2c2ea
Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filter 
resolve user and groups in nested groups first before filtering the results
 2019-03-07 22:31:51 +01:00
paul
38eccce224
Update index.php 
Linking to NC 15 documentation instead of NC 13
 2019-03-07 22:05:38 +01:00
Joas Schilling
e4cffa00df
Add preview data as optional data for files 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-07 19:47:40 +01:00
Marius Blüm
f7ea96f56a
Remove Google+ from Social Sharing Bundle (2) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 14:57:56 +01:00
Marius Blüm
80937159fb
Remove "socialsharing_googleplus" from Social Sharing Bundle 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 14:56:16 +01:00
Marius Blüm
993e15b72c
Remove G+ CSS rule (Feedback from Joas) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 14:28:36 +01:00
Marius Blüm
6c2b80170e
Mention Open Cloud Mesh in Federated User Settings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 13:55:09 +01:00
Marius Blüm
bdad72dfa9
Remove G+ code from Federated Files Sharing-usersettings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 13:46:49 +01:00
Marius Blüm
500986f30e
Remove G+ icon from Federated Files Sharing-usersettings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-07 13:45:23 +01:00
Roeland Jago Douma
7ff1f8366a
Merge pull request #14579 from nextcloud/fix/bump_streams_files_external 
Have streams of files_external in sync
 2019-03-07 12:53:07 +01:00
Roeland Jago Douma
bb3c3539cc
Have streams of files_external in sync 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-07 12:15:32 +01:00
Julius Härtl
9e3335f11e
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-07 10:48:26 +01:00
Julius Härtl
496a668bd4
Add wrapper for removed tooltip functions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-07 10:48:26 +01:00
Julius Härtl
d768634616
Fix domparser on phantomjs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-07 10:45:47 +01:00
Julius Härtl
067651b715
Use tooltip dist file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-07 10:45:47 +01:00
Julius Härtl
e6ab850aac
Fix tooltip styling for bootstrap 4.3 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-07 10:45:47 +01:00
Julius Härtl
b2be083c5e
Fix tooltip include 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-07 10:45:47 +01:00
dependabot[bot]
f739cabe2b
[Security] Bump bootstrap from 3.4.1 to 4.3.1 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 3.4.1 to 4.3.1. **This update includes security fixes.**
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v3.4.1...v4.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-03-07 10:45:46 +01:00
Roeland Jago Douma
ba3a23e5c9
Merge pull request #14568 from nextcloud/techdebt/noid/cleanup-code-leftovers 
Cleanup some PHPDoc leftovers and unused variables
 2019-03-06 21:08:46 +01:00
Morris Jobke
dfaa90185e
Merge pull request #14569 from nextcloud/fix/noid/fix-transifex 
Fix transifex sync for files_sharing
 2019-03-06 16:59:09 +01:00
Morris Jobke
3f9cdeeb5f
Cleanup some PHPDoc leftovers and unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 15:43:56 +01:00
Roeland Jago Douma
1b27e9578d
Merge pull request #14424 from nextcloud/fix/13554/swift_to_tmp 
Use a tmp file for swift writes
 2019-03-06 15:33:15 +01:00
Morris Jobke
540ec4f3df
Merge pull request #14563 from nextcloud/fix/jquery-version 
Pin the jquery version to 2.1.4
 2019-03-06 15:32:48 +01:00
Morris Jobke
65b0e2727d
Merge pull request #14561 from Nutomic/wrong-username-message 
Change login error message to "wrong username or password"
 2019-03-06 15:26:12 +01:00
Ari Selseng
d16cfb519e Avoid calculating folder size for parent that needs scan. 
Signed-off-by: Ari Selseng <ari@selseng.net>
 2019-03-06 15:23:37 +01:00
Morris Jobke
5c6a46314a
Fix transifex sync for files_sharing 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 15:02:07 +01:00
Morris Jobke
7479de71e7
Merge pull request #14567 from nextcloud/fix/noid/transifex-excludes 
Update generated webpack files to .l10nignore
 2019-03-06 14:42:48 +01:00
Morris Jobke
88f0697cb9
Update generated webpack files to .l10nignore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 14:27:11 +01:00
Morris Jobke
d77bab9a26
Merge pull request #14560 from nextcloud/tests/noid/fully-check-compliant-apps 
Fully check compliant apps
 2019-03-06 14:00:10 +01:00
Christoph Wurst
9549d79faa
Pin the jquery version to 2.1.4 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-03-06 12:22:49 +01:00
Felix Ableitner
1c1cd10f0d Change login error message to "wrong username or password" (fixes #14460) 
Signed-off-by: Felix Ableitner <me@nutomic.com>
 2019-03-06 11:59:03 +01:00
Morris Jobke
bdf95ef0ec
Merge pull request #14558 from nextcloud/fix/13790/fix-comment 
Fix unnecessary boolean cast
 2019-03-06 11:42:14 +01:00
Joas Schilling
e13253c66a
"Fix" the unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-06 11:06:03 +01:00
Morris Jobke
d004164fcc
Merge pull request #13327 from nextcloud/allow-bracket-notation-for-remove-ipv6-address 
Allow bracket IPv6 address format inside IPAdress Normalizer
 2019-03-06 10:34:02 +01:00
Morris Jobke
58f6a777b1
Merge pull request #14553 from nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa 
Clear backupcode reminder when no 2fa
 2019-03-06 10:16:58 +01:00
Morris Jobke
4b49e2eb52
Fix unnecessary boolean cast 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-06 10:12:58 +01:00
Morris Jobke
fde4c54136
Merge pull request #13790 from fretn/master 
Fix for crashing occ files:scan
 2019-03-06 10:12:14 +01:00
Arthur Schiwon
e36cede994
remove unused use statement 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-03-06 00:34:29 +01:00
Arthur Schiwon
987db8e6c5
add missing config bits to integration tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-03-06 00:09:23 +01:00
Arthur Schiwon
dfc7007242
with LDAP server set offline, config cannot be controlled via ocs anymore 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-03-05 23:13:49 +01:00
Morris Jobke
7fa0615e6d
Merge pull request #14541 from nextcloud/ci/noid/disable-fragile-tests 
Disable fragile tests for now
 2019-03-05 22:31:38 +01:00
Roeland Jago Douma
3d17ab0936
Do not send notification if no active 2fa 
If the job is still present we should also not fire it off if there is
not a single active 2FA provider.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-05 20:21:37 +01:00
Roeland Jago Douma
1c29a01956
Clear backupcodes reminder if no 2FA is enabled 
Fixes #14125

Listen to 2FA disable event. If a provider is disabled for a user. We
check if there are no more providers. If there are no more providers we
Remove the backupcode reminder notification (if still present).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-05 20:14:16 +01:00
Roeland Jago Douma
c1c594f2ad
Merge pull request #14535 from nextcloud/tests/noid/reduce-logs-in-checker-test 
Reduce errors in checker tests
 2019-03-05 19:53:26 +01:00
Morris Jobke
debd32b461
Merge pull request #14175 from skydiablo/master 
Fix ObjectStorage expired token (v3)
 2019-03-05 18:59:45 +01:00
Joas Schilling
a788da6ac2
Make the file strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-05 18:01:14 +01:00
Joas Schilling
c5ab74348c
Avoid duplicate App container creation 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-05 17:55:35 +01:00
Morris Jobke
a4b34abe45
Merge pull request #14373 from nextcloud/ci/noid/add-bundle-test 
Add test for updated CA bundle
 2019-03-05 17:14:01 +01:00
Morris Jobke
a48043f8c9
Merge pull request #14544 from nextcloud/fix/admin-2fa-settings-leftover 
Remove leftover input that causes undefined index errors
 2019-03-05 16:25:39 +01:00