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

50895 Commits

Author SHA1 Message Date
Joas Schilling a0792137cf
Rename the variable aswell 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-12 13:48:05 +01:00
Morris Jobke 33c34ddafa
Merge pull request #14626 from nextcloud/bugfix/14621/make-sure-urlparams-are-correctly-injected-in-global-routes 
Make sure urlparams are correctly injected in global routes
 2019-03-12 12:46:54 +01:00
Jan-Christoph Borchardt 9306caec3e
Add border around previews in grid view 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-03-12 10:44:51 +01:00
Morris Jobke aff13a2072
Merge pull request #14586 from nextcloud/hint-user-docs-federation 
Add hint to user documentation (Federation)
 2019-03-11 20:03:29 +01:00
Joas Schilling c9026fc75c
Fix plural rule detection for languages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-11 15:19:23 +01:00
Morris Jobke 1832537571
Merge pull request #14623 from nextcloud/fix/noid/login-page-wrong-password 
Fix acceptance tests for wrong password message due to changed message
 2019-03-11 12:49:05 +01:00
Morris Jobke 89ed84e8b6
Fix display of i in personal settings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-11 12:47:14 +01:00
Marius Blüm ab488a49d0
Add hint to user documentation (Federation) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-11 12:47:14 +01:00
Joas Schilling a3c9e5b11b
Add a message about disabled global routes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-11 12:43:39 +01:00
Joas Schilling 4e8b033281
Make sure urlParams are correctly injected in global routes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-11 12:30:44 +01:00
Morris Jobke 065690dcf5
Merge pull request #14620 from nextcloud/fix/noid/copy-paste-typo 
Fix unneeded doc link to unrelated resource
 2019-03-11 12:01:27 +01:00
Morris Jobke 77cf702220
Fix acceptance tests for wrong password message due to changed message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-11 11:54:38 +01:00
Morris Jobke 25d700ef30
Fix unneeded doc link to unrelated resource 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-11 11:00:21 +01:00
Morris Jobke d40b21ac81
Merge pull request #14603 from nextcloud/fix/noid/add-setup-check-for-s3-temp-path 
Show a setup warning in case S3 object storage is used as primary storage
 2019-03-08 18:03:49 +01:00
Roeland Jago Douma 8996b9efbf
Merge pull request #14352 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.3.1 
[Security] Bump bootstrap from 3.4.1 to 4.3.1
 2019-03-08 15:32:16 +01:00
Morris Jobke 060b637b70
Show a setup warning in case S3 object storage is used as primary storage 
* checks for at least 50 GB of free space

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-08 13:38:39 +01:00
Morris Jobke ec5f4200ad
Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-container-creation 
Avoid duplicate App container creation
 2019-03-08 10:31:10 +01:00
Morris Jobke 592975bf64
Merge pull request #14590 from Worteks/master 
Update index.php
 2019-03-08 09:45:33 +01:00
Morris Jobke 49c7799496
Merge pull request #14585 from nextcloud/ocm-mention-federation 
Mention Open Cloud Mesh in Federated User Settings
 2019-03-08 09:42:22 +01:00
Morris Jobke de935848a4
Merge pull request #14589 from nextcloud/feature/noid/add-preview-information-as-optional-data 
Add preview data as optional data for files
 2019-03-08 09:41:33 +01:00
Morris Jobke 772303309d
Merge pull request #14425 from cowai/fix-multiple-incomplete-folders 
Do not calculate folder size for parent that also needs proper scan, fixes #3524
 2019-03-08 09:12:33 +01:00
Morris Jobke 70aa85997d
Merge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundle 
Remove Google+ from Social Sharing Bundle
 2019-03-08 09:05:07 +01:00
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