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

49932 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
8b31dbc5a4
[tx-robot] updated from transifex 2019-07-16 02:14:48 +00:00
Morris Jobke
cd3f5e48de
Merge pull request #16151 from jameslao/master 
Update operationprogressbar.js
 2019-07-15 22:09:25 +02:00
Morris Jobke
03ad858841
Merge pull request #14228 from nextcloud/feature/noid/add-metadata-etag 
Add DB table to extend filecache with metadata etag, creation  and upload time
 2019-07-15 21:37:25 +02:00
Roeland Jago Douma
a3deb21bf4
Merge pull request #16334 from nextcloud/feature/noid/enterprise-logo 
Add enterprise logo
 2019-07-15 20:31:06 +02:00
Roeland Jago Douma
89e8b29aad
Merge pull request #16390 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-collections-0.5.4 
Bump nextcloud-vue-collections from 0.5.2 to 0.5.4
 2019-07-15 20:27:12 +02:00
Roeland Jago Douma
1e5d0fd3a9
Merge pull request #16404 from nextcloud/dependabot/npm_and_yarn/babel/core-7.5.4 
Bump @babel/core from 7.5.0 to 7.5.4
 2019-07-15 20:26:20 +02:00
Morris Jobke
60dcb1800c
Add DB table to extend filecache with metadata etag, creation time and upload time 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-15 16:58:44 +02:00
Morris Jobke
b732f51c10
Add enterprise logo 
Also set it as theming logo if the subscription is valid.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-15 16:45:53 +02:00
dependabot-preview[bot]
e3b96a3db3 Bump @babel/core from 7.5.0 to 7.5.4 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.0 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-07-15 13:31:39 +00:00
Morris Jobke
c048c56411
Merge pull request #16369 from nextcloud/rename-parameter-in-ocp-toast-for-consistency-with-oc-notification 
Rename parameter in OCP.Toast for consistency with OC.Notification
 2019-07-15 10:20:04 +02:00
Morris Jobke
1e5fadcdf1
Merge pull request #16399 from nextcloud/improvement/noid/fulltextsearch-simple-queries 
[nc17] add SimpleQueries to FullTextSearch
 2019-07-15 10:18:04 +02:00
Roeland Jago Douma
de25e492f8
Merge pull request #16400 from nextcloud/bugfix/noid/fixing-addsubtag 
addsubtag should push to array
 2019-07-15 08:45:16 +02:00
Roeland Jago Douma
0ff1f1614c
Merge pull request #16394 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.5.4 
Bump @babel/preset-env from 7.5.2 to 7.5.4
 2019-07-15 08:44:25 +02:00
Nextcloud bot
c4bfa405ab
[tx-robot] updated from transifex 2019-07-15 02:14:30 +00:00
Maxence Lange
cb91b3ce3e addsubtag should push to array 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-07-14 19:17:55 -01:00
Maxence Lange
1e2518d7f9 new model to manage some simple queries 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
fixing issue in addSubTag()

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
fix const

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
autoload

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Revert "fixing issue in addSubTag()"

This reverts commit a9ab2ab91b98133c69272f27ea1b51594719e241.

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
syntax

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-07-14 19:07:28 -01:00
dependabot-preview[bot]
34ebf9b11b Bump nextcloud-vue-collections from 0.5.2 to 0.5.4 
Bumps [nextcloud-vue-collections](https://github.com/juliushaertl/nextcloud-vue-collections) from 0.5.2 to 0.5.4.
- [Release notes](https://github.com/juliushaertl/nextcloud-vue-collections/releases)
- [Commits](https://github.com/juliushaertl/nextcloud-vue-collections/compare/v0.5.2...v0.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-07-14 11:52:30 +00:00
Roeland Jago Douma
b3249f931b
Merge pull request #16389 from nextcloud/dependabot/npm_and_yarn/webpack-4.35.3 
Bump webpack from 4.35.2 to 4.35.3
 2019-07-14 13:49:58 +02:00
Roeland Jago Douma
2a393a82fa
Merge pull request #16385 from nextcloud/dependabot/npm_and_yarn/lodash-4.17.14 
Bump lodash from 4.17.13 to 4.17.14
 2019-07-14 13:49:21 +02:00
dependabot-preview[bot]
725db35c5a Bump lodash from 4.17.13 to 4.17.14 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-07-14 10:36:29 +00:00
Nextcloud bot
d307ed8e42
[tx-robot] updated from transifex 2019-07-14 02:15:06 +00:00
dependabot-preview[bot]
7eb2fa9ffb
Bump webpack from 4.35.2 to 4.35.3 
Bumps [webpack](https://github.com/webpack/webpack) from 4.35.2 to 4.35.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.35.2...v4.35.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-14 01:16:20 +00:00
dependabot-preview[bot]
4f49fc13af
Bump @babel/preset-env from 7.5.2 to 7.5.4 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.2 to 7.5.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.2...v7.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-14 01:14:06 +00:00
Nextcloud bot
7675d01955
[tx-robot] updated from transifex 2019-07-13 02:14:18 +00:00
Roeland Jago Douma
685f00c018
Merge pull request #15794 from nextcloud/fix/scss_locking 
Lock SCSS so we only run 1 job at a time
 2019-07-12 19:48:45 +02:00
Roeland Jago Douma
f8aeef7ae9
Lock SCSS so we only run 1 job at a time 
This is bit hacky but a start to lock the SCSS compiler properly
Retry during 10s then give up
Properly get error message
Do not clear locks and properly debug scss caching

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-12 16:18:02 +02:00
Daniel Calviño Sánchez
916c95758f
Rename parameter in OCP.Toast for consistency with OC.Notification 
This fixes HTML messages in "OC.Notification.showTemporary" (as
"showHtml" was not set based on "isHTML"), and also makes OCP.Toast to
keep the old OC.Notification API when used directly.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-07-12 16:15:05 +02:00
Roeland Jago Douma
c193c0d466
Merge pull request #16331 from nextcloud/feature/noid/talk-guest-mentions 
Allow guest mentions of talk to be parsed
 2019-07-12 10:35:54 +02:00
Nextcloud bot
951f16da65
[tx-robot] updated from transifex 2019-07-12 02:15:00 +00:00
Roeland Jago Douma
74be0cf982
Merge pull request #16361 from nextcloud/bugfix/noid/drop-foreignkey-on-owncloud-migration 
Drop foreignkey on owncloud migration
 2019-07-11 19:40:04 +02:00
Morris Jobke
79e0b5c4ce
Merge pull request #15514 from nextcloud/feature/noid/add-enterprise-channel 
Update channels for updater server
 2019-07-11 12:42:34 +02:00
Joas Schilling
0d4ca0e754
Drop foreign key before trying to drop the accounts table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-11 12:14:25 +02:00
Roeland Jago Douma
13e0a95063
Merge pull request #16343 from nextcloud/dependabot/npm_and_yarn/lodash-4.17.13 
[Security] Bump lodash from 4.17.11 to 4.17.13
 2019-07-11 11:21:31 +02:00
Roeland Jago Douma
0d0f33c057
Merge pull request #16256 from nextcloud/bugfix/noid/remove-white-space-from-personal-settings 
Remove vertical whitespace between entries in Personal settings
 2019-07-11 11:06:21 +02:00
Joas Schilling
092d34d9df
Add a unit test for guests as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-11 10:24:27 +02:00
Roeland Jago Douma
27a6e395e3
Merge pull request #16349 from nextcloud/dependabot/npm_and_yarn/build/lodash-4.17.14 
[Security] Bump lodash from 4.17.11 to 4.17.14 in /build
 2019-07-11 08:55:31 +02:00
dependabot-preview[bot]
862bd3518e [Security] Bump lodash from 4.17.11 to 4.17.13 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-07-11 06:14:29 +00:00
dependabot-preview[bot]
7a4e9f7a81
[Security] Bump lodash from 4.17.11 to 4.17.14 in /build 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-11 02:21:38 +00:00
Nextcloud bot
0263821010
[tx-robot] updated from transifex 2019-07-11 02:14:31 +00:00
Roeland Jago Douma
bf54d0f40d
Merge pull request #16324 from nextcloud/bugfix/noid/workflow-dark-theme 
Improve dark theme handling in workflow apps
 2019-07-10 21:45:59 +02:00
Greta Doci
482570ca5f Remove vertical whitespace between entries in Personal settings 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-07-10 20:27:08 +02:00
Morris Jobke
39c28bd05b
Enterprise update channel 
Allows to select the enterprise update channel for instances that have a valid subscription.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-07-10 16:19:34 +02:00
Joas Schilling
77918356d6
Allow guest mentions of talk to be parsed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-10 15:33:10 +02:00
Roeland Jago Douma
996120bab8
Merge pull request #16323 from nextcloud/fix/s3/http1.1 
Use HTTP1.1 to read S3 objects
 2019-07-10 15:19:28 +02:00
John Molakvoæ
e7224f6767
Merge pull request #16313 from te-online/master 
Adjust stale bot message
 2019-07-10 13:02:32 +02:00
Thomas Ebert
865905eb5d
Stale Bot message – Revert to old phrasing. Remove it. 2019-07-10 12:42:47 +02:00
Morris Jobke
5c21b29d7f
Merge pull request #16308 from nextcloud/fix/undefined-offset-0 
Prevent undefined offset 0 in findByUserIdOrMail
 2019-07-10 12:16:36 +02:00
Morris Jobke
b120f57975
Merge pull request #16322 from nextcloud/bugfix/noid/fix-workflow-handlebars 
Fix files_automatedtagging settings
 2019-07-10 11:52:49 +02:00
Roeland Jago Douma
e953205908
Use HTTP1.1 to read S3 objects 
Some of the READs otherwise use HTTP/1.0 which is not always supported
by all backends. HTTP/1.1 is there since 1999 way longer than S3 so safe
to assume it is always there IMO.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-10 11:42:22 +02:00
Joas Schilling
89ca22b170
Use SCSS nesting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-07-10 11:35:06 +02:00