summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14191 from nextcloud/bugfix/noid/make-testcase-overwrite-...Morris Jobke2019-02-141-0/+4
|\
| * Make TestCase->overwriteService() work with App classesJoas Schilling2019-02-141-0/+4
* | Merge pull request #14167 from nextcloud/techdebt/noid/update-php-parser-for-...Roeland Jago Douma2019-02-144-5/+5
|\ \
| * | Fix AsyncBusTestsRoeland Jago Douma2019-02-141-2/+2
| * | Update PHP-Parser for 7.1 compatibilityJoas Schilling2019-02-143-3/+3
* | | Merge pull request #14186 from nextcloud/enh/systemtags_to_webpackRoeland Jago Douma2019-02-1418-28/+83
|\ \ \
| * | | Update testsRoeland Jago Douma2019-02-141-12/+1
| * | | Move systemtags to common webpackRoeland Jago Douma2019-02-1415-10/+78
| * | | Move systemtags icon to icons.scssRoeland Jago Douma2019-02-143-6/+4
* | | | Merge pull request #14199 from nextcloud/enh/core_scss_to_webpackMorris Jobke2019-02-1413-41/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | Move jquery.ocdialog.scss to bundleRoeland Jago Douma2019-02-145-30/+10
| * | | Move jquery-ui-fixes to bundleRoeland Jago Douma2019-02-1412-21/+26
| |/ /
* | | Merge pull request #13995 from nextcloud/feature/dont-call-get-repair-stepsRoeland Jago Douma2019-02-145-23/+39
|\ \ \
| * | | Fix unit testDaniel Kesselberg2019-02-132-12/+22
| * | | Make $repairSteps & $dispatcher mandatoryDaniel Kesselberg2019-02-131-1/+1
| * | | Do not run getRepairSteps in register_commandsDaniel Kesselberg2019-02-133-11/+17
* | | | Merge pull request #14197 from nextcloud/fix/trashbin_restore_translationRoeland Jago Douma2019-02-143-3/+3
|\ \ \ \
| * | | | Compile assetsRoeland Jago Douma2019-02-142-2/+2
| * | | | Fix trashbin restore translationRoeland Jago Douma2019-02-141-1/+1
* | | | | Merge pull request #14200 from nextcloud/fix/noid/ldap-lowercase-request-attr...blizzz2019-02-142-15/+19
|\ \ \ \ \
| * | | | | ensure attribute names are lower casedArthur Schiwon2019-02-142-15/+19
| | |_|/ / | |/| | |
* | | | | Merge pull request #14160 from nextcloud/update-crlMorris Jobke2019-02-142-54/+57
|\ \ \ \ \
| * | | | | Update CRL to contain revoked files_external_dropbox, passman & paybackMorris Jobke2019-02-142-54/+57
* | | | | | Merge pull request #12652 from tomasz-grobelny/operation_progress_improvements3John Molakvoæ2019-02-1412-288/+525
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' into operation_progress_improvements3Tomasz Grobelny2019-01-291366-60281/+44785
| |\ \ \ \ \
| * | | | | | Fix unit testsTomasz Grobelny2018-11-243-180/+286
| * | | | | | Use reportOperationProgress for removing filesTomasz Grobelny2018-11-241-43/+43
| * | | | | | Properly handle errors (including 500)Tomasz Grobelny2018-11-242-2/+9
| * | | | | | Add progress reporting to move and copy operationsTomasz Grobelny2018-11-244-33/+60
| * | | | | | Fix progress bar labelTomasz Grobelny2018-11-244-14/+21
| * | | | | | Move progress bar to separate componentTomasz Grobelny2018-11-247-28/+108
| * | | | | | Restructuring code in file-upload.jsTomasz Grobelny2018-11-241-27/+37
* | | | | | | Merge pull request #14183 from BrookeDot/patch-2Roeland Jago Douma2019-02-142-10/+2
|\ \ \ \ \ \ \
| * | | | | | | remove googleplus svg see #14183BandonRandon2019-02-131-1/+0
| * | | | | | | Update development.notice.phpBrooke2019-02-131-9/+2
* | | | | | | | Merge pull request #13681 from nextcloud/dependabot/npm_and_yarn/settings/nex...Roeland Jago Douma2019-02-1415-487/+370
|\ \ \ \ \ \ \ \
| * | | | | | | | Adjust Apps and User settings to new Vue componentsChristoph Wurst2019-02-1415-487/+370
| * | | | | | | | Bump nextcloud-vue from 0.5.0 to 0.6.0 in /settingsdependabot[bot]2019-02-142-4/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #14185 from nextcloud/fix/init_shared_storage_for_recentsMorris Jobke2019-02-141-3/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Filter out versions and trashbinRoeland Jago Douma2019-02-131-0/+2
| * | | | | | | | Loop for the recent searchRoeland Jago Douma2019-02-131-3/+26
| * | | | | | | | We need to initialize the storage else the jailed path is always nullRoeland Jago Douma2019-02-131-0/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #14168 from nextcloud/feature/noid/improve-update-channel-...Morris Jobke2019-02-146-57/+157
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix corners that are cut in popup menu in SafariMorris Jobke2019-02-131-0/+1
| * | | | | | | Improve update channel layout to be a popup menuMorris Jobke2019-02-135-57/+156
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-02-14224-382/+494
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #14170 from nextcloud/feature/update-app-password-activityRoeland Jago Douma2019-02-133-19/+131
|\ \ \ \ \ \ \
| * | | | | | | Add test cases for rename / grant / revokeDaniel Kesselberg2019-02-131-4/+94
| * | | | | | | Show more information on update app passwordDaniel Kesselberg2019-02-132-15/+37
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #14005 from nextcloud/enh/versions_to_webpackRoeland Jago Douma2019-02-1320-27/+61
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |