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

50893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
09828bee5a
Merge pull request #17524 from nextcloud/dependabot/npm_and_yarn/nextcloud/axios-0.4.2 
Bump @nextcloud/axios from 0.4.1 to 0.4.2
 2019-10-13 10:59:06 +02:00
Roeland Jago Douma
1b21f79dca
Merge pull request #17531 from nextcloud/dependabot/npm_and_yarn/webpack-4.41.1 
Bump webpack from 4.41.0 to 4.41.1
 2019-10-13 10:56:39 +02:00
dependabot-preview[bot]
5f52f9e4a5 Bump webpack from 4.41.0 to 4.41.1 
Bumps [webpack](https://github.com/webpack/webpack) from 4.41.0 to 4.41.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.0...v4.41.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-13 06:32:01 +00:00
Roeland Jago Douma
12929f95d0
Merge pull request #17523 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.3 
Bump handlebars from 4.4.2 to 4.4.3 in /build
 2019-10-13 08:31:01 +02:00
Nextcloud bot
0d03115eb0
[tx-robot] updated from transifex 2019-10-13 02:15:52 +00:00
dependabot-preview[bot]
116c9c41e1
Bump @nextcloud/axios from 0.4.1 to 0.4.2 
Bumps [@nextcloud/axios](https://github.com/nextcloud/nextcloud-axios) from 0.4.1 to 0.4.2.
- [Release notes](https://github.com/nextcloud/nextcloud-axios/releases)
- [Commits](https://github.com/nextcloud/nextcloud-axios/compare/v0.4.1...v0.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-13 01:14:10 +00:00
dependabot-preview[bot]
929295ac31
Bump handlebars from 4.4.2 to 4.4.3 in /build 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.2 to 4.4.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.2...v4.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-13 01:13:38 +00:00
Roeland Jago Douma
24820e06e5
Merge pull request #17390 from nextcloud/refactor/external-initial-state-impl 
Use the external initial state implementation
 2019-10-12 13:52:28 +02:00
Christoph Wurst
c2e8821345
Use the external initial state implementation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-12 13:21:50 +02:00
Nextcloud bot
7f8ff16c76
[tx-robot] updated from transifex 2019-10-12 02:15:10 +00:00
Roeland Jago Douma
961e591f04
Merge pull request #17510 from nextcloud/bump/nextcloud/event-bus 
Bump nextcloud/event-bus to 0.2.1
 2019-10-11 14:55:30 +02:00
Roeland Jago Douma
0646167111
Bump nextcloud/event-bus to 0.2.1 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-11 12:57:19 +02:00
Roeland Jago Douma
15576dcba3
Merge pull request #17505 from nextcloud/design/input-contrast 
Increase contast between text and placeholder in input fields
 2019-10-11 12:53:25 +02:00
Nextcloud bot
a373fd5848
[tx-robot] updated from transifex 2019-10-11 02:14:43 +00:00
Roeland Jago Douma
1e8f063aed
Merge pull request #17484 from nextcloud/bugfix/activity-last-timestamp-merged 
Always use the latest timestamp for merged activities
 2019-10-10 20:30:16 +02:00
Julius Härtl
57a4a7d0e4
Increase contast between text and placeholder in input fields 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-10 15:54:10 +02:00
kesselb
0e06239ae1
Merge pull request #17488 from nextcloud/fix/phan-settings-app 
Remove settings/ from phan
 2019-10-09 15:53:33 +02:00
Roeland Jago Douma
5917644536
Merge pull request #17276 from nextcloud/storage-id-eq 
Get single storage id using `eq` instead of `in`
 2019-10-09 15:17:49 +02:00
Daniel Kesselberg
99358d70e8
Remove settings/ from phan 
settings is a app now. so the directory does not exist.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-09 14:34:05 +02:00
Roeland Jago Douma
fa7eb52092
Merge pull request #17458 from nextcloud/enh/avoid_direct_query 
Make renewSessionToken return the new token
 2019-10-09 12:00:55 +02:00
Julius Härtl
a41ed39bf2
Always use the latest timestamp for merged activities 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-09 11:25:37 +02:00
Roeland Jago Douma
5122629bb0
Make renewSessionToken return the new token 
Avoids directly getting the token again. We just inserted it so it and
have all the info. So that query is just a waste.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-09 10:10:37 +02:00
Roeland Jago Douma
f663154adf
Merge pull request #17480 from nextcloud/enhancement/drone/no-submodule-when-not-needed 
Remove unnecessary submodules steps
 2019-10-09 08:59:20 +02:00
John Molakvoæ (skjnldsv)
8b6731b1f0
Remove unwanted submodules 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-09 07:44:50 +02:00
Nextcloud bot
2b0f49455d
[tx-robot] updated from transifex 2019-10-09 02:15:07 +00:00
kesselb
f4aad082e7
Merge pull request #17475 from nextcloud/ci/integration/parallel_composer 
Run composer install in parallel
 2019-10-08 22:54:03 +02:00
Roeland Jago Douma
4cc5b28063
Run composer install in parallel 
The newer docker image runs the composer isntall in parallel. Saving
precious seconds on CI.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 21:17:53 +02:00
Roeland Jago Douma
cafa2b5ef0
Merge pull request #17471 from nextcloud/bugfix/15951/public-txt-truncation-size 
Raised public txt file truncation size to 10kb (#15951)
 2019-10-08 20:52:39 +02:00
Roeland Jago Douma
77d16990a3
Merge pull request #17463 from nextcloud/enh/token/cache 
Cache the public key tokens
 2019-10-08 20:52:24 +02:00
Roeland Jago Douma
c0827cfb1d
Merge pull request #17445 from nextcloud/db/add-index-on-schedulingobjects 
Add index on principaluri for schedulingobjects table
 2019-10-08 19:26:32 +02:00
Roeland Jago Douma
480a3fc7af
Merge pull request #17462 from gary-kim/fix/noid/check-if-tag-name-empty 
Show error if tag name is empty
 2019-10-08 19:25:02 +02:00
Johannes Koenig
58b93b65d3 Raised public txt file truncation size to 10kb 
Signed-off-by: Johannes Koenig <mail@jokoenig.de>
 2019-10-08 18:38:49 +02:00
Gary Kim
7e2149cd82
Show error if tag name is empty 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2019-10-08 22:15:05 +08:00
Roeland Jago Douma
3fccc7dc47
Cache the public key tokens 
Sometimes (esp with token auth) we query the same token multiple times.
While this is properly indexed and fast it is still a bit of a waste.

Right now it is doing very stupid caching. Which gets invalidate on any
update.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 13:57:36 +02:00
Thomas Citharel
68cf47e947
Check and add index on principaluri for schedulingobjects table 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-08 10:25:56 +02:00
Roeland Jago Douma
b7803665c1
Merge pull request #17429 from nextcloud/db/add-index-on-calendar-object-props-calendar-id 
Add index on calendarid for calendarobject_props table
 2019-10-08 10:09:48 +02:00
Roeland Jago Douma
093b25bfe1
Merge pull request #17454 from nextcloud/ci/kill/ui-regression 
Kill ui-regression ci job
 2019-10-08 09:35:13 +02:00
Roeland Jago Douma
075a0b24d5
Merge pull request #17431 from johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive 
make TrustedDomainHelper case insensitive
 2019-10-08 08:51:11 +02:00
Roeland Jago Douma
d9b87123a2
Kill ui-regression ci job 
Since we do not use it at the moment anyway it seems like a waste of
resources to actually run it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 08:49:55 +02:00
Roeland Jago Douma
f2d44b87bb
Merge pull request #17440 from nextcloud/enh/noid/log-json-escape 
Do not escape slashes in log json
 2019-10-08 08:48:52 +02:00
John Molakvoæ
76bdced6e3
Remove duplicate code (#17451) 
Remove duplicate code
 2019-10-08 08:21:30 +02:00
Roeland Jago Douma
e4948f5d86
Merge pull request #17414 from gary-kim/enh/15155/delete-icon-in-trashbin 
Show Delete Icon in Breadcrumb in Trashbin
 2019-10-08 08:08:02 +02:00
Nextcloud bot
85dbde060d
[tx-robot] updated from transifex 2019-10-08 02:15:01 +00:00
Daniel Kesselberg
fdf4e1ebb2
Remove duplicate code 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-10-08 00:46:50 +02:00
Thomas Citharel
90e5850cc4
Add index on calendarid for calendarobject_props table 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-10-07 22:03:15 +02:00
Roeland Jago Douma
bea5bbde31
Merge pull request #17449 from nextcloud/fix/joas-should-know-you-have-to-increaste-the-server-version-for-new-migrations 
Increase server version to trigger latest migration
 2019-10-07 19:46:31 +02:00
John Molakvoæ
f8d1990eb8
Do not follow symlinks with webpack (#17448) 
Do not follow symlinks with webpack
 2019-10-07 18:26:35 +02:00
Christoph Wurst
79db678075
Increase server version to trigger all migrations 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-07 16:37:15 +02:00
John Molakvoæ (skjnldsv)
8d87312d9a
Do not follow symlinks with webpack 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-07 16:28:10 +02:00
Julius Härtl
29a6f2d830
Do not escape slashes in log json 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-07 13:39:40 +02:00