summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-01-17212-8616/+8712
|
* Merge pull request #13511 from ↵Morris Jobke2019-01-164-1/+98
|\ | | | | | | | | nextcloud/bugfix/noid/remove-orphan-event-and-contact-data Remove orphan event and contacts data
| * Remove orphan event and contacts dataJoas Schilling2019-01-114-1/+98
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #13634 from jospoortvliet/update-linkblizzz2019-01-161-1/+1
|\ \ | | | | | | update URL for federation
| * | 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 require
| * | | Use import instead of requireRoeland Jago Douma2019-01-163-11/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13574 from alion300/masterMorris Jobke2019-01-161-1/+1
|\ \ \ \ | |/ / / |/| | | Fix app navigation flickering on hover
| * | | the bug number #13263 fixed by the xavierando userAlaa Shmalih2019-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | i change the file by xaviterando done and fix and i will do pull request to the solution becouse xavirando did pull request to him self
* | | | Merge pull request #13618 from nextcloud/enh/13608/move_bundlejs_towebpackRoeland Jago Douma2019-01-168-64/+111
|\ \ \ \ | | | | | | | | | | Move from JSCombiner to webpack: merged-share-backend
| * | | | Move merged-share-backend to webpackRoeland Jago Douma2019-01-168-64/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #13608 Since we have webpack anyway it make sense to let webpack do the bundling instead of ourselfs. This leads to minified code (so less transfer). And the webserver can just handle the request. As a bonus we get a map file so debugging is easier than with our JSCombiner stuff. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | 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.0
| * | | | [Security] Bump marked from 0.3.6 to 0.6.0dependabot[bot]2019-01-164-6/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [marked](https://github.com/markedjs/marked) from 0.3.6 to 0.6.0. **This update includes security fixes.** - [Release notes](https://github.com/markedjs/marked/releases) - [Commits](https://github.com/markedjs/marked/compare/v0.3.6...v0.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #13481 from nextcloud/omit_fetching_stateRoeland Jago Douma2019-01-1612-1118/+1159
|\ \ \ \ | | | | | | | | | | Provide initial state for backupcodes in template
| * | | | Bump dependenciesRoeland Jago Douma2019-01-154-542/+370
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Update the git attributesRoeland Jago Douma2019-01-155-9/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump dependenciesRoeland Jago Douma2019-01-154-578/+681
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Provide initial state for backupcodes in templateRoeland Jago Douma2019-01-1511-38/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves a direct request to the server when loading the backup codes. There is no need for this as the data is already known. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [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
|\ \ \ \ \ | |/ / / / |/| | | | Generic message on password reset
| * | | | Fix testsRoeland Jago Douma2019-01-151-9/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Generic message on password resetRoeland Jago Douma2019-01-152-6/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | There is no need to inform the user if the account existed or not. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13607 from nextcloud/fix/backgroundjob-int-idRoeland Jago Douma2019-01-151-1/+1
|\ \ \ \ | | | | | | | | | | Fix integer background job id type error
| * | | | Fix integer background job id type errorChristoph Wurst2019-01-151-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | 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.4
| * | | | Bump clipboard from 1.7.1 to 2.0.4dependabot[bot]2019-01-155-13/+25
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [clipboard](https://github.com/zenorocha/clipboard.js) from 1.7.1 to 2.0.4. - [Release notes](https://github.com/zenorocha/clipboard.js/releases) - [Commits](https://github.com/zenorocha/clipboard.js/compare/v1.7.1...v2.0.4) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | 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.5
| * | | | [3rdparty] Bump pear/archive_tar to 1.4.5Roeland Jago Douma2019-01-151-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #12173 from nextcloud/filename-centerMorris Jobke2019-01-151-18/+20
|\ \ \ \ \ | | | | | | | | | | | | Ensure filename is possibly centered below file icons in grid view
| * | | | | Properly center text inside of the grid containerJulius Härtl2019-01-141-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Ensure filename is possibly centered below file icons in grid viewJan-Christoph Borchardt2019-01-141-0/+1
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | [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
|\ \ \ \ \ | |/ / / / |/| | | | Some twofactor_backupcodes cleanup
| * | | | Switch to OCP background jobsRoeland Jago Douma2019-01-143-6/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Switch to QBMapperRoeland Jago Douma2019-01-141-8/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #13524 from ↵Roeland Jago Douma2019-01-142-11/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/karma-viewport-1.0.4 Bump karma-viewport from 1.0.3 to 1.0.4 in /build
| * | | | | Bump karma-viewport from 1.0.3 to 1.0.4 in /builddependabot[bot]2019-01-122-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [karma-viewport](https://github.com/squidfunk/karma-viewport) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/squidfunk/karma-viewport/releases) - [Changelog](https://github.com/squidfunk/karma-viewport/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/karma-viewport/compare/1.0.3...1.0.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | | Merge pull request #13572 from nextcloud/3rdparty/symfony/process-4.2.2Morris Jobke2019-01-141-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | [3rdparty] Bump symfony/process to 4.2.2
| * | | | | | [3rdparty] Bump symfony/process to 4.2.2Roeland Jago Douma2019-01-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #13468 from rummatee/issue13276Morris Jobke2019-01-141-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | don't close input stream when writing in encrypted file
| * | | | | | don't close input stream when writing in encrypted fileFlorian Schunk2019-01-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
* | | | | | | Merge pull request #13581 from nextcloud/bugfix/13576/correctly-escape-htmlMorris Jobke2019-01-141-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correctly handle displaynames returned from the sharee API
| * | | | | | | Correctly handle displaynames returned from the sharee APIJoas Schilling2019-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #13492 from nextcloud/refactor/es6-shim-babel-polyfillJohn Molakvoæ2019-01-145-36/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use @babel/polyfill instead of es6-shim
| * | | | | | | | Use @babel/polyfill instead of es6-shimChristoph Wurst2019-01-145-36/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | 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 lega…
| * | | | | | | | Principals can be principal/user/<name> or principal/<name> from legacy installsJoas Schilling2019-01-141-1/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #13566 from nextcloud/fix/13519/click-app-namesMorris Jobke2019-01-142-5/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix click app names
| * | | | | | | Fix click app namesMichael Weimann2019-01-142-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | | | | | Merge pull request #13539 from ↵Roeland Jago Douma2019-01-144-38/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.16.2 Bump css-vars-ponyfill from 1.7.2 to 1.16.2
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 13:40:06 +0000