summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-02-1134-8/+122
* Merge pull request #14120 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2019-02-102-39/+16
|\
| * Bump webpack from 4.29.1 to 4.29.3 in /apps/accessibilitydependabot[bot]2019-02-092-39/+16
* | Merge pull request #14119 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2019-02-102-37/+12
|\ \
| * | Bump webpack from 4.29.1 to 4.29.3 in /settingsdependabot[bot]2019-02-092-37/+12
| |/
* / [tx-robot] updated from transifexNextcloud bot2019-02-1050-6/+138
|/
* [tx-robot] updated from transifexNextcloud bot2019-02-0928-130/+230
* Merge pull request #14060 from nextcloud/bugfix/noid/use-new-methodMorris Jobke2019-02-081-4/+11
|\
| * Use the new method instead of the deprecated wrapperJoas Schilling2019-02-061-4/+11
* | Merge pull request #13702 from nextcloud/feature/6717/rename-app-passwordsRoeland Jago Douma2019-02-0812-27/+177
|\ \
| * | Mock name for integration testDaniel Kesselberg2019-02-041-0/+1
| * | Don't update token if current session tokenDaniel Kesselberg2019-02-024-4/+5
| * | Improve usabilityDaniel Kesselberg2019-02-024-13/+40
| * | Add interface INamedTokenDaniel Kesselberg2019-02-024-7/+47
| * | Add canRename & name to testsDaniel Kesselberg2019-02-022-5/+9
| * | Make app password description editableDaniel Kesselberg2019-02-014-13/+90
| * | Clipboard -> ClipboardJSDaniel Kesselberg2019-02-011-1/+1
| * | Extend regex to match DAVx5Daniel Kesselberg2019-02-011-1/+1
* | | Merge pull request #14037 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2019-02-084-56/+47
|\ \ \
| * | | Bump vue and vue-template-compiler in /apps/oauth2dependabot[bot]2019-02-074-56/+47
* | | | [tx-robot] updated from transifexNextcloud bot2019-02-0828-58/+204
* | | | Merge pull request #14083 from nextcloud/bugfix/noid/make-sure-the-path-is-al...Morris Jobke2019-02-071-11/+10
|\ \ \ \
| * | | | Fix wrong method callJoas Schilling2019-02-071-1/+0
| * | | | Make sure the relative path is always a stringJoas Schilling2019-02-071-10/+10
* | | | | Merge pull request #14097 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2019-02-071-9/+3
|\ \ \ \ \
| * | | | | [Security] Bump lodash from 4.17.10 to 4.17.11 in /apps/accessibilitydependabot[bot]2019-02-071-9/+3
* | | | | | Merge pull request #14036 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-02-074-39/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump vue and vue-template-compiler in /apps/updatenotificationdependabot[bot]2019-02-074-39/+27
| | |/ / / | |/| | |
* | | | | Merge pull request #13986 from nextcloud/feature/cleanup-job-13843Morris Jobke2019-02-074-5/+113
|\ \ \ \ \
| * | | | | Log exceptionDaniel Kesselberg2019-02-072-5/+10
| * | | | | Repair step to remove "photo." files created by photocacheDaniel Kesselberg2019-02-074-5/+108
* | | | | | Merge pull request #14064 from nextcloud/smb-3.1.0Morris Jobke2019-02-0754-198/+547
|\ \ \ \ \ \
| * | | | | | update icewind/smb to 3.1.0Robin Appelman2019-02-0654-198/+547
* | | | | | | Merge pull request #13819 from nextcloud/bugfix/noid/unify-html-encoding-hand...Morris Jobke2019-02-073-1/+84
|\ \ \ \ \ \ \
| * | | | | | | Update documentation of setParsed* and setRich*Joas Schilling2019-01-252-0/+84
| * | | | | | | Unify the HTML encoding handling with other ROS appsJoas Schilling2019-01-251-1/+0
* | | | | | | | Merge pull request #13748 from nextcloud/cache-insert-eventMorris Jobke2019-02-076-20/+112
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | adjust testsRobin Appelman2019-02-071-10/+20
| * | | | | | | add event for inserting cache entriesRobin Appelman2019-02-075-10/+92
* | | | | | | | Merge pull request #13969 from nextcloud/enh/additional_scripts_no_on_public_...Morris Jobke2019-02-079-22/+98
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add StandaloneTemplateResponseRoeland Jago Douma2019-02-069-22/+79
| * | | | | | | No need to emit additonalscript event on public pagesRoeland Jago Douma2019-02-052-0/+19
* | | | | | | | Merge pull request #14023 from william-p/OS_paramsMorris Jobke2019-02-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix: Check if `$this->params['user']` is an arrayWilliam Pain2019-02-051-1/+1
* | | | | | | | | Merge pull request #14040 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Morris Jobke2019-02-074-11/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump vue and vue-template-compiler in /apps/accessibilitydependabot[bot]2019-02-064-11/+11
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #14041 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Morris Jobke2019-02-073-27/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump webpack from 4.29.0 to 4.29.1 in /apps/oauth2dependabot[bot]2019-02-063-27/+40
| |/ / / / / / / /
* | | | | | | | | Merge pull request #10248 from weeman1337/enhancement/9457-2Morris Jobke2019-02-0725-260/+1133
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove public interface that was only needed for testingMorris Jobke2019-02-072-10/+0