summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-01-17212-8616/+8712
* Merge pull request #13511 from nextcloud/bugfix/noid/remove-orphan-event-and-...Morris Jobke2019-01-164-1/+98
|\
| * Remove orphan event and contacts dataJoas Schilling2019-01-114-1/+98
* | Merge pull request #13634 from jospoortvliet/update-linkblizzz2019-01-161-1/+1
|\ \
| * | update URL for federationJos Poortvliet2018-12-271-1/+1
* | | Merge pull request #13626 from nextcloud/fix/import_not_require_webpack_coreRoeland Jago Douma2019-01-163-11/+11
|\ \ \
| * | | Use import instead of requireRoeland Jago Douma2019-01-163-11/+11
* | | | Merge pull request #13574 from alion300/masterMorris Jobke2019-01-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | the bug number #13263 fixed by the xavierando userAlaa Shmalih2019-01-141-1/+1
* | | | Merge pull request #13618 from nextcloud/enh/13608/move_bundlejs_towebpackRoeland Jago Douma2019-01-168-64/+111
|\ \ \ \
| * | | | Move merged-share-backend to webpackRoeland Jago Douma2019-01-168-64/+111
* | | | | Merge pull request #13462 from nextcloud/dependabot/npm_and_yarn/marked-0.6.0Roeland Jago Douma2019-01-164-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [Security] Bump marked from 0.3.6 to 0.6.0dependabot[bot]2019-01-164-6/+6
|/ / / /
* | | | Merge pull request #13481 from nextcloud/omit_fetching_stateRoeland Jago Douma2019-01-1612-1118/+1159
|\ \ \ \
| * | | | Bump dependenciesRoeland Jago Douma2019-01-154-542/+370
| * | | | Update the git attributesRoeland Jago Douma2019-01-155-9/+15
| * | | | Bump dependenciesRoeland Jago Douma2019-01-154-578/+681
| * | | | Provide initial state for backupcodes in templateRoeland Jago Douma2019-01-1511-38/+142
* | | | | [tx-robot] updated from transifexNextcloud bot2019-01-16158-174/+350
* | | | | Merge pull request #13595 from nextcloud/enh/do_not_leak_user_existenceRoeland Jago Douma2019-01-153-15/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix testsRoeland Jago Douma2019-01-151-9/+23
| * | | | Generic message on password resetRoeland Jago Douma2019-01-152-6/+12
|/ / / /
* | | | Merge pull request #13607 from nextcloud/fix/backgroundjob-int-idRoeland Jago Douma2019-01-151-1/+1
|\ \ \ \
| * | | | Fix integer background job id type errorChristoph Wurst2019-01-151-1/+1
|/ / / /
* | | | Merge pull request #13456 from nextcloud/dependabot/npm_and_yarn/clipboard-2.0.4Morris Jobke2019-01-155-13/+25
|\ \ \ \
| * | | | Bump clipboard from 1.7.1 to 2.0.4dependabot[bot]2019-01-155-13/+25
|/ / / /
* | | | Merge pull request #13592 from nextcloud/3rdparty/pear/archive_tar-1.4.5Morris Jobke2019-01-151-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump pear/archive_tar to 1.4.5Roeland Jago Douma2019-01-151-0/+0
* | | | | Merge pull request #12173 from nextcloud/filename-centerMorris Jobke2019-01-151-18/+20
|\ \ \ \ \
| * | | | | Properly center text inside of the grid containerJulius Härtl2019-01-141-19/+20
| * | | | | Ensure filename is possibly centered below file icons in grid viewJan-Christoph Borchardt2019-01-141-0/+1
| |/ / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2019-01-1598-700/+606
* | | | | Merge pull request #13586 from nextcloud/enh/2fa_backup_codes_improvementsRoeland Jago Douma2019-01-144-14/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Switch to OCP background jobsRoeland Jago Douma2019-01-143-6/+8
| * | | | Switch to QBMapperRoeland Jago Douma2019-01-141-8/+3
* | | | | Merge pull request #13524 from nextcloud/dependabot/npm_and_yarn/build/karma-...Roeland Jago Douma2019-01-142-11/+25
|\ \ \ \ \
| * | | | | Bump karma-viewport from 1.0.3 to 1.0.4 in /builddependabot[bot]2019-01-122-11/+25
* | | | | | Merge pull request #13572 from nextcloud/3rdparty/symfony/process-4.2.2Morris Jobke2019-01-141-0/+0
|\ \ \ \ \ \
| * | | | | | [3rdparty] Bump symfony/process to 4.2.2Roeland Jago Douma2019-01-141-0/+0
* | | | | | | Merge pull request #13468 from rummatee/issue13276Morris Jobke2019-01-141-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | don't close input stream when writing in encrypted fileFlorian Schunk2019-01-101-1/+0
* | | | | | | Merge pull request #13581 from nextcloud/bugfix/13576/correctly-escape-htmlMorris Jobke2019-01-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Correctly handle displaynames returned from the sharee APIJoas Schilling2019-01-141-2/+2
* | | | | | | | Merge pull request #13492 from nextcloud/refactor/es6-shim-babel-polyfillJohn Molakvoæ2019-01-145-36/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Use @babel/polyfill instead of es6-shimChristoph Wurst2019-01-145-36/+17
* | | | | | | | | Merge pull request #13573 from nextcloud/bugfix/noid/one-last-timeMorris Jobke2019-01-141-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Principals can be principal/user/<name> or principal/<name> from legacy installsJoas Schilling2019-01-141-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #13566 from nextcloud/fix/13519/click-app-namesMorris Jobke2019-01-142-5/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix click app namesMichael Weimann2019-01-142-5/+6
* | | | | | | | Merge pull request #13539 from nextcloud/dependabot/npm_and_yarn/css-vars-pon...Roeland Jago Douma2019-01-144-38/+55
|\ \ \ \ \ \ \ \