summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-10-1140-2/+172
|
* Merge pull request #17484 from nextcloud/bugfix/activity-last-timestamp-mergedRoeland Jago Douma2019-10-101-1/+2
|\ | | | | Always use the latest timestamp for merged activities
| * Always use the latest timestamp for merged activitiesJulius Härtl2019-10-091-1/+2
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #17488 from nextcloud/fix/phan-settings-appkesselb2019-10-091-1/+0
|\ \ | | | | | | Remove settings/ from phan
| * | Remove settings/ from phanDaniel Kesselberg2019-10-091-1/+0
| | | | | | | | | | | | | | | | | | settings is a app now. so the directory does not exist. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #17276 from nextcloud/storage-id-eqRoeland Jago Douma2019-10-092-2/+10
|\ \ \ | | | | | | | | Get single storage id using `eq` instead of `in`
| * | | use eq instead of in for loading single storageRobin Appelman2019-09-261-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | log which storage id can't be insertedRobin Appelman2019-09-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #17458 from nextcloud/enh/avoid_direct_queryRoeland Jago Douma2019-10-096-19/+24
|\ \ \ \ | | | | | | | | | | Make renewSessionToken return the new token
| * | | | Make renewSessionToken return the new tokenRoeland Jago Douma2019-10-096-19/+24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #17480 from ↵Roeland Jago Douma2019-10-091-8/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/enhancement/drone/no-submodule-when-not-needed Remove unnecessary submodules steps
| * | | | Remove unwanted submodulesJohn Molakvoæ (skjnldsv)2019-10-091-8/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-10-0924-22/+118
| |_|/ / |/| | |
* | | | Merge pull request #17475 from nextcloud/ci/integration/parallel_composerkesselb2019-10-081-15/+15
|\ \ \ \ | |/ / / |/| | | Run composer install in parallel
| * | | Run composer install in parallelRoeland Jago Douma2019-10-081-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The newer docker image runs the composer isntall in parallel. Saving precious seconds on CI. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #17471 from nextcloud/bugfix/15951/public-txt-truncation-sizeRoeland Jago Douma2019-10-081-1/+1
|\ \ \ \ | | | | | | | | | | Raised public txt file truncation size to 10kb (#15951)
| * | | | Raised public txt file truncation size to 10kbJohannes Koenig2019-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Koenig <mail@jokoenig.de>
* | | | | Merge pull request #17463 from nextcloud/enh/token/cacheRoeland Jago Douma2019-10-081-5/+42
|\ \ \ \ \ | |_|/ / / |/| | | | Cache the public key tokens
| * | | | Cache the public key tokensRoeland Jago Douma2019-10-081-5/+42
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #17445 from nextcloud/db/add-index-on-schedulingobjectsRoeland Jago Douma2019-10-082-0/+20
|\ \ \ \ | | | | | | | | | | Add index on principaluri for schedulingobjects table
| * | | | Check and add index on principaluri for schedulingobjects tableThomas Citharel2019-10-082-0/+20
| |/ / / | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #17462 from gary-kim/fix/noid/check-if-tag-name-emptyRoeland Jago Douma2019-10-081-0/+6
|\ \ \ \ | |/ / / |/| | | Show error if tag name is empty
| * | | Show error if tag name is emptyGary Kim2019-10-081-0/+6
|/ / / | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | Merge pull request #17429 from ↵Roeland Jago Douma2019-10-082-0/+21
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/db/add-index-on-calendar-object-props-calendar-id Add index on calendarid for calendarobject_props table
| * | | Add index on calendarid for calendarobject_props tableThomas Citharel2019-10-072-0/+21
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #17454 from nextcloud/ci/kill/ui-regressionRoeland Jago Douma2019-10-081-55/+0
|\ \ \ \ | | | | | | | | | | Kill ui-regression ci job
| * | | | Kill ui-regression ci jobRoeland Jago Douma2019-10-081-55/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge pull request #17431 from ↵Roeland Jago Douma2019-10-082-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive make TrustedDomainHelper case insensitive
| * | | | | make TrustedDomainHelper case insensitiveJohannes Koenig2019-10-062-1/+6
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Johannes Koenig <mail@jokoenig.de>
* | | | | Merge pull request #17440 from nextcloud/enh/noid/log-json-escapeRoeland Jago Douma2019-10-081-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Do not escape slashes in log json
| * | | | Do not escape slashes in log jsonJulius Härtl2019-10-071-2/+2
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Remove duplicate code (#17451)John Molakvoæ2019-10-081-5/+1
|\ \ \ \ | | | | | | | | | | Remove duplicate code
| * | | | Remove duplicate codeDaniel Kesselberg2019-10-081-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #17414 from gary-kim/enh/15155/delete-icon-in-trashbinRoeland Jago Douma2019-10-086-7/+10
|\ \ \ \ \ | | | | | | | | | | | | Show Delete Icon in Breadcrumb in Trashbin
| * | | | | Show Delete Icon in Breadcrumb in TrashbinGary Kim2019-10-076-7/+10
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-10-0818-10/+44
| |/ / / |/| | |
* | | | Merge pull request #17449 from ↵Roeland Jago Douma2019-10-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/joas-should-know-you-have-to-increaste-the-server-version-for-new-migrations Increase server version to trigger latest migration
| * | | | Increase server version to trigger all migrationsChristoph Wurst2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Do not follow symlinks with webpack (#17448)John Molakvoæ2019-10-071-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Do not follow symlinks with webpack
| * | | | Do not follow symlinks with webpackJohn Molakvoæ (skjnldsv)2019-10-071-1/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #17411 from kinolaev/fix-oauth2-redirectRoeland Jago Douma2019-10-072-3/+12
|\ \ \ \ | |/ / / |/| | | Fix oauth client redirect
| * | | fix oauth client redirectSergej Nikolaev2019-10-042-3/+12
| | | | | | | | | | | | | | | | Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-0720-22/+88
| |/ / |/| |
* | | Merge pull request #17421 from ↵Roeland Jago Douma2019-10-062-4/+4
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.2 Bump handlebars from 4.4.0 to 4.4.2 in /build
| * | | Bump handlebars from 4.4.0 to 4.4.2 in /builddependabot-preview[bot]2019-10-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.0 to 4.4.2. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/v4.4.2/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.0...v4.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Use @nextcloud/paths and deprecate OC helpers (#17392)John Molakvoæ2019-10-0611-454/+95
|\ \ \ \ | | | | | | | | | | Use @nextcloud/paths and deprecate OC helpers
| * | | | Use @nextcloud/paths and deprecate OC helpersChristoph Wurst2019-10-0511-454/+95
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* / / / [tx-robot] updated from transifexNextcloud bot2019-10-0610-34/+122
|/ / /
* | | Fix Axios CSRF token update (#17404)John Molakvoæ2019-10-0555-2156/+1442
|\ \ \ | | | | | | | | Fix Axios CSRF token update
| * | | Switch to @nextcloud/axios for the CSRF update fixChristoph Wurst2019-10-0553-2145/+1411
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 08:06:47 +0000