summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | Add since labelsMorris Jobke2019-02-071-0/+13
| * | | | | | | | Switch guest avatars to PNGMichael Weimann2019-02-073-3/+3
| * | | | | | | | Implement guest avatar endpointMichael Weimann2019-02-0725-260/+1130
|/ / / / / / / /
* | | | | | | | Merge pull request #14078 from nextcloud/backport/14076/masterMorris Jobke2019-02-071-0/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Reintroduce status check for external storagesMorris Jobke2019-02-071-0/+11
|/ / / / / / /
* | | | / / / [tx-robot] updated from transifexNextcloud bot2019-02-0640-12/+180
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #12573 from nextcloud/fix/12568/special_handling_of_logoutMorris Jobke2019-02-066-1/+108
|\ \ \ \ \ \
| * | | | | | Do not do redirect handling when loggin outRoeland Jago Douma2019-02-066-1/+108
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-02-06446-2150/+2814
* | | | | | Merge pull request #14057 from nextcloud/bugfix/noid/translation-sync-failuresMorris Jobke2019-02-061-8/+9
|\ \ \ \ \ \
| * | | | | | Ignore compiled assetsMorris Jobke2019-02-061-8/+9
* | | | | | | Merge pull request #14008 from nextcloud/3rdpart/phpseclib-2.0.14Roeland Jago Douma2019-02-061-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [3rdparty] Bump phpseclib to 2.0.14Roeland Jago Douma2019-02-051-0/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #14053 from nextcloud/fix/jstz_is_bundledMorris Jobke2019-02-062-3/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Do not load bundled jstimezonedetectRoeland Jago Douma2019-02-062-3/+0
|/ / / / /
* | | | | Merge pull request #14049 from nextcloud/dependabot/npm_and_yarn/settings/web...Roeland Jago Douma2019-02-062-50/+64
|\ \ \ \ \
| * | | | | Bump webpack from 4.29.0 to 4.29.1 in /settingsdependabot[bot]2019-02-052-50/+64
| | |/ / / | |/| | |
* | | | | Merge pull request #14047 from nextcloud/dependabot/npm_and_yarn/webpack-4.29.1Roeland Jago Douma2019-02-062-50/+64
|\ \ \ \ \
| * | | | | Bump webpack from 4.29.0 to 4.29.1dependabot[bot]2019-02-052-50/+64
| |/ / / /
* | | | | Merge pull request #14046 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2019-02-062-50/+64
|\ \ \ \ \
| * | | | | Bump webpack from 4.29.0 to 4.29.1 in /apps/updatenotificationdependabot[bot]2019-02-052-50/+64
| |/ / / /