summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not create Application instances directlyChristoph Wurst2019-10-1114-17/+41
* Make sure we create an app's Application class just onceChristoph Wurst2019-10-113-3/+4
* [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 activitiesJulius Härtl2019-10-091-1/+2
* | Merge pull request #17488 from nextcloud/fix/phan-settings-appkesselb2019-10-091-1/+0
|\ \
| * | Remove settings/ from phanDaniel Kesselberg2019-10-091-1/+0
* | | Merge pull request #17276 from nextcloud/storage-id-eqRoeland Jago Douma2019-10-092-2/+10
|\ \ \
| * | | use eq instead of in for loading single storageRobin Appelman2019-09-261-1/+9
| * | | log which storage id can't be insertedRobin Appelman2019-09-261-1/+1
* | | | Merge pull request #17458 from nextcloud/enh/avoid_direct_queryRoeland Jago Douma2019-10-096-19/+24
|\ \ \ \
| * | | | Make renewSessionToken return the new tokenRoeland Jago Douma2019-10-096-19/+24
|/ / / /
* | | | Merge pull request #17480 from nextcloud/enhancement/drone/no-submodule-when-...Roeland Jago Douma2019-10-091-8/+0
|\ \ \ \
| * | | | Remove unwanted submodulesJohn Molakvoæ (skjnldsv)2019-10-091-8/+0
* | | | | [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 parallelRoeland Jago Douma2019-10-081-15/+15
* | | | 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 10kbJohannes Koenig2019-10-081-1/+1
* | | | | Merge pull request #17463 from nextcloud/enh/token/cacheRoeland Jago Douma2019-10-081-5/+42
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cache the public key tokensRoeland Jago Douma2019-10-081-5/+42
| |/ / /
* | | | Merge pull request #17445 from nextcloud/db/add-index-on-schedulingobjectsRoeland Jago Douma2019-10-082-0/+20
|\ \ \ \
| * | | | Check and add index on principaluri for schedulingobjects tableThomas Citharel2019-10-082-0/+20
| |/ / /
* | | | 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 emptyGary Kim2019-10-081-0/+6
|/ / /
* | | Merge pull request #17429 from nextcloud/db/add-index-on-calendar-object-prop...Roeland Jago Douma2019-10-082-0/+21
|\ \ \
| * | | Add index on calendarid for calendarobject_props tableThomas Citharel2019-10-072-0/+21
* | | | Merge pull request #17454 from nextcloud/ci/kill/ui-regressionRoeland Jago Douma2019-10-081-55/+0
|\ \ \ \
| * | | | Kill ui-regression ci jobRoeland Jago Douma2019-10-081-55/+0
* | | | | Merge pull request #17431 from johkoenig/bugfix/17377/trusted_domain_helper_c...Roeland Jago Douma2019-10-082-1/+6
|\ \ \ \ \
| * | | | | make TrustedDomainHelper case insensitiveJohannes Koenig2019-10-062-1/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #17440 from nextcloud/enh/noid/log-json-escapeRoeland Jago Douma2019-10-081-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Do not escape slashes in log jsonJulius Härtl2019-10-071-2/+2
| | |_|/ | |/| |
* | | | Remove duplicate code (#17451)John Molakvoæ2019-10-081-5/+1
|\ \ \ \
| * | | | Remove duplicate codeDaniel Kesselberg2019-10-081-5/+1
* | | | | 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 TrashbinGary Kim2019-10-076-7/+10
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2019-10-0818-10/+44
| |/ / / |/| | |
* | | | Merge pull request #17449 from nextcloud/fix/joas-should-know-you-have-to-inc...Roeland Jago Douma2019-10-071-1/+1
|\ \ \ \
| * | | | Increase server version to trigger all migrationsChristoph Wurst2019-10-071-1/+1
* | | | | Do not follow symlinks with webpack (#17448)John Molakvoæ2019-10-071-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not follow symlinks with webpackJohn Molakvoæ (skjnldsv)2019-10-071-1/+2
|/ / / /
* | | | Merge pull request #17411 from kinolaev/fix-oauth2-redirectRoeland Jago Douma2019-10-072-3/+12
|\ \ \ \ | |/ / / |/| | |
| * | | fix oauth client redirectSergej Nikolaev2019-10-042-3/+12
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-0720-22/+88
| |/ / |/| |
* | | Merge pull request #17421 from nextcloud/dependabot/npm_and_yarn/build/handle...Roeland Jago Douma2019-10-062-4/+4
|\ \ \
| * | | Bump handlebars from 4.4.0 to 4.4.2 in /builddependabot-preview[bot]2019-10-062-4/+4
* | | | Use @nextcloud/paths and deprecate OC helpers (#17392)John Molakvoæ2019-10-0611-454/+95
|\ \ \ \
| * | | | Use @nextcloud/paths and deprecate OC helpersChristoph Wurst2019-10-0511-454/+95
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2019-10-0610-34/+122
|/ / /