summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | add direct link to the file for user/group sharesBjoern Schiessle2018-07-212-5/+20
| * | fix mail templatesBjoern Schiessle2018-07-212-6/+6
| * | show note on public link pageBjoern Schiessle2018-07-213-0/+11
| * | add note to share object when reading it from the dbBjoern Schiessle2018-07-212-0/+2
| * | improve mail template and escape html codeBjoern Schiessle2018-07-212-24/+10
| * | allow to add a personal note to a shareBjoern Schiessle2018-07-218-6/+286
* | | [tx-robot] updated from transifexNextcloud bot2018-07-2422-4/+70
* | | Merge pull request #10338 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Morris Jobke2018-07-232-80/+26
|\ \ \
| * | | Bump vue-loader from 15.2.4 to 15.2.6 in /apps/updatenotificationdependabot[bot]2018-07-232-80/+26
* | | | Merge pull request #10342 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Morris Jobke2018-07-232-82/+26
|\ \ \ \
| * | | | Bump vue-loader from 15.2.4 to 15.2.6 in /apps/oauth2dependabot[bot]2018-07-232-82/+26
* | | | | Merge pull request #10344 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Morris Jobke2018-07-232-172/+219
|\ \ \ \ \
| * | | | | Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/accessibilitydependabot[bot]2018-07-232-172/+219
| | |/ / / | |/| | |
* | | | | Merge pull request #10356 from nextcloud/bugfix/noid/dont-call-getuid-on-nullMorris Jobke2018-07-231-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't call getUID on null when the app is loaded for a guestJoas Schilling2018-07-231-1/+5
* | | | | Merge pull request #10355 from nextcloud/bugfix/noid/make-sure-error-log-alwa...Roeland Jago Douma2018-07-231-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make sure error_log() always receives a stringJoas Schilling2018-07-231-0/+3
| |/ / /
* | | | Merge pull request #10343 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-07-232-82/+26
|\ \ \ \
| * | | | Bump vue-loader from 15.2.4 to 15.2.6 in /apps/accessibilitydependabot[bot]2018-07-232-82/+26
|/ / / /
* | | | Merge pull request #10341 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-07-232-47/+81
|\ \ \ \
| * | | | Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/oauth2dependabot[bot]2018-07-232-47/+81
|/ / / /
* | | | Merge pull request #10337 from nextcloud/dependabot/npm_and_yarn/settings/vue...Morris Jobke2018-07-232-82/+26
|\ \ \ \
| * | | | Bump vue-loader from 15.2.4 to 15.2.6 in /settingsdependabot[bot]2018-07-232-82/+26
* | | | | Merge pull request #10335 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Morris Jobke2018-07-233-77/+97
|\ \ \ \ \
| * | | | | Update mapRoeland Jago Douma2018-07-231-1/+1
| * | | | | Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/updatenotificationdependabot[bot]2018-07-232-76/+96
| |/ / / /
* | | | | Merge pull request #10340 from nextcloud/dependabot/npm_and_yarn/settings/web...Morris Jobke2018-07-232-47/+81
|\ \ \ \ \
| * | | | | Bump webpack-cli from 3.0.8 to 3.1.0 in /settingsdependabot[bot]2018-07-232-47/+81
| |/ / / /
* | | | | Merge pull request #10325 from nextcloud/lost-password-ldap-fixMorris Jobke2018-07-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not bind reset password link if an url is setJohn Molakvoæ (skjnldsv)2018-07-231-1/+1
|/ / / /
* | | / [tx-robot] updated from transifexNextcloud bot2018-07-2316-2/+74
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2018-07-2234-0/+86
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-07-21162-364/+318
* | Merge pull request #9982 from nextcloud/global-flow-rebuildMorris Jobke2018-07-2027-444/+7866
|\ \
| * | Jsunit fixesJohn Molakvoæ (skjnldsv)2018-07-201-1/+2
| * | Bump karma configJohn Molakvoæ (skjnldsv)2018-07-203-50/+7537
| * | Jsunit fixes 1John Molakvoæ (skjnldsv)2018-07-204-6/+12
| * | Fixed filestable min-widthJohn Molakvoæ (skjnldsv)2018-07-203-1/+3
| * | Widen left navigation to 300px and set max-width of right sidebar to 500pxJan-Christoph Borchardt2018-07-202-9/+6
| * | Fix sidebar close buttonJohn Molakvoæ (skjnldsv)2018-07-201-1/+2
| * | use flex for main contentJohn Molakvoæ (skjnldsv)2018-07-204-35/+14
| * | Adjust acceptance tests to sidebar changes in Files appJohn Molakvoæ (skjnldsv)2018-07-203-89/+73
| * | Fixed sticky controlsJohn Molakvoæ (skjnldsv)2018-07-201-0/+4
| * | Sidebar fixJohn Molakvoæ (skjnldsv)2018-07-2011-105/+111
| * | Cleanup structureJohn Molakvoæ (skjnldsv)2018-07-2010-200/+155
|/ /
* | Merge pull request #10311 from nextcloud/bugfix/8702/ie11-icon-whiteMorris Jobke2018-07-202-285/+105
|\ \
| * | Move icons over to the new mixinJulius Härtl2018-07-201-284/+90
| * | Add icon-black-white mixin to automatically generate icon classesJulius Härtl2018-07-202-9/+23
| |/
* | Merge pull request #10283 from nextcloud/bugfix/10094/user-managementMorris Jobke2018-07-206-36/+31
|\ \
| * | Fix accceptance testsJulius Härtl2018-07-201-1/+1