summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12303 from nextcloud/grid-for-all-file-templatesJohn Molakvoæ2018-11-0623-28/+94
|\
| * Fix testsJohn Molakvoæ (skjnldsv)2018-11-062-6/+11
| * Fix min trhumbnail sizeJohn Molakvoæ (skjnldsv)2018-11-063-5/+5
| * Add grid toggle for every files viewJohn Molakvoæ (skjnldsv)2018-11-0619-17/+78
* | Merge pull request #11968 from nextcloud/feature/noid/drop-verbose-appscanDaniel Kesselberg2018-11-061-61/+25
|\ \
| * | Revert changes not related to $verboseDaniel Kesselberg2018-10-221-4/+4
| * | Replace $verbose with VERBOSITY_VERBOSE for scanFiles methodDaniel Kesselberg2018-10-211-63/+27
* | | Merge pull request #11831 from nextcloud/feature/noid/drop-verbose-scanMorris Jobke2018-11-061-69/+27
|\ \ \ | |_|/ |/| |
| * | Remove quiet and verbose from Command/ScanDaniel Kesselberg2018-10-211-13/+1
| * | Replace $verbose with VERBOSITY_VERBOSE for scanFiles methodDaniel Kesselberg2018-10-211-56/+26
| |/
* | [tx-robot] updated from transifexNextcloud bot2018-11-0616-10/+62
* | Merge pull request #12128 from tomasz-grobelny/fix_file_moveMorris Jobke2018-11-062-58/+106
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into fix_file_moveTomasz Grobelny2018-11-04111-590/+2190
| |\ \
| * | | Fix move related testsTomasz Grobelny2018-11-032-60/+73
| * | | Fix file move operation for large number of filesTomasz Grobelny2018-10-301-5/+40
* | | | Merge pull request #12289 from nextcloud/ie11-grid-disableRoeland Jago Douma2018-11-052-1/+7
|\ \ \ \
| * | | | Disable grid for ieJohn Molakvoæ (skjnldsv)2018-11-052-1/+7
* | | | | Allow writing an empty file with the new writeStreamRoeland Jago Douma2018-11-051-0/+4
* | | | | Merge pull request #12242 from nextcloud/uid-conccurencyJohn Molakvoæ2018-11-052-25/+125
|\ \ \ \ \
| * | | | | Phpunit testsJohn Molakvoæ (skjnldsv)2018-11-051-25/+112
| * | | | | Add check for vCard uidJohn Molakvoæ (skjnldsv)2018-11-051-0/+13
* | | | | | Merge pull request #12271 from nextcloud/prevent-upload-cancelMorris Jobke2018-11-051-5/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ask before cancelling an ongoing uploadJohn Molakvoæ (skjnldsv)2018-11-051-5/+24
* | | | | | Merge pull request #12185 from nextcloud/cleanup/dicontainerMorris Jobke2018-11-052-2/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix files_sharingRoeland Jago Douma2018-11-021-1/+2
| * | | | | Properly query the methodreflectorRoeland Jago Douma2018-11-021-1/+2
* | | | | | Merge pull request #12004 from nextcloud/dl-vcf-groups-pluginJohn Molakvoæ2018-11-054-0/+126
|\ \ \ \ \ \
| * | | | | | Added multi-get vcf download pluginJohn Molakvoæ (skjnldsv)2018-11-044-0/+126
* | | | | | | Merge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-11-052-102/+102
|\ \ \ \ \ \ \
| * | | | | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibilitydependabot[bot]2018-11-052-102/+102
* | | | | | | | Merge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-11-053-38/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Rebuild assetsRoeland Jago Douma2018-11-051-1/+1
| * | | | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibilitydependabot[bot]2018-11-052-37/+36
* | | | | | | | Merge pull request #12265 from nextcloud/dav-bumpRoeland Jago Douma2018-11-052-7/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | bump dav version for migrationJohn Molakvoæ (skjnldsv)2018-11-052-7/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2John Molakvoæ2018-11-051-0/+4
|\ \ \ \ \ \ \
| * | | | | | | make twofactor .button inlin-blockJonas Sulzer2018-11-041-0/+4
| |/ / / / / /
* | | | | | | Merge pull request #12252 from nextcloud/theming-advanced-h3Roeland Jago Douma2018-11-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Change "Advanced options" to h3Marius Blüm2018-11-041-1/+1
* | | | | | | | Merge pull request #12263 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-11-052-101/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2dependabot[bot]2018-11-052-101/+101
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #12264 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-11-052-29/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2dependabot[bot]2018-11-052-29/+36
| |/ / / / / / /
* | | | | | | | Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-11-052-29/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotificationdependabot[bot]2018-11-052-29/+36
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-11-052-101/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotificationdependabot[bot]2018-11-052-101/+101
| |/ / / / / / /
* | | | | | | | Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_renderRoeland Jago Douma2018-11-051-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Set the filemodel before rending the detailsviewRoeland Jago Douma2018-11-021-1/+1
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-11-0514-6/+42
| |/ / / / / / |/| | | | | |