summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Move of files_versions to webpackRoeland Jago Douma2019-02-1320-27/+61
|/ / / / / /
* | | | | | Merge pull request #14166 from nextcloud/enhancement/noid/sharing-tab-pluginsRoeland Jago Douma2019-02-131-0/+6
|\ \ \ \ \ \
| * | | | | | Allow attaching plugins to the ShareTabView and trigger event on renderingJulius Härtl2019-02-121-0/+6
* | | | | | | Merge pull request #14035 from adduxa/patch-1Morris Jobke2019-02-133-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Check in compiled assetsMorris Jobke2019-02-082-2/+2
| * | | | | | Fix expiration date changingAndrey Dyakov2019-02-051-1/+1
* | | | | | | Merge pull request #14177 from nextcloud/bugfix/noid/fix-small-glitchesJohn Molakvoæ2019-02-134-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix style of warning for EoL versionMorris Jobke2019-02-133-6/+3
| * | | | | | | Fix border in update notification sectionMorris Jobke2019-02-131-0/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #14141 from nextcloud/enh/trashbin_to_webpackRoeland Jago Douma2019-02-1310-4/+51
|\ \ \ \ \ \ \
| * | | | | | | Move files_trashbin to webpackRoeland Jago Douma2019-02-1310-4/+51
|/ / / / / / /
* | | | | | | Merge pull request #14148 from nextcloud/enh/single-webpackRoeland Jago Douma2019-02-1316-4765/+271
|\ \ \ \ \ \ \
| * | | | | | | Update expected file listRoeland Jago Douma2019-02-131-0/+3
| * | | | | | | Add proper drone jobRoeland Jago Douma2019-02-131-8/+11
| * | | | | | | Move oauth2 to global webpack configRoeland Jago Douma2019-02-1311-4757/+254
| * | | | | | | Move webpack config to rootRoeland Jago Douma2019-02-135-2/+5
|/ / / / / / /
* | | | / / / [tx-robot] updated from transifexNextcloud bot2019-02-1354-80/+678
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #14149 from nextcloud/fix/throttler_bitmaskRoeland Jago Douma2019-02-122-2/+33
|\ \ \ \ \ \
| * | | | | | Fix the thorrtler whitelist bitmaskRoeland Jago Douma2019-02-112-2/+33
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-02-12214-2054/+1202
|/ / / / / /
* | | | | | Merge pull request #14143 from nextcloud/bugfix/noid/add-link-to-settings-on-...Roeland Jago Douma2019-02-112-4/+26
|\ \ \ \ \ \