summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Bump settings buildJulius Härtl2018-07-202-2/+2
| * | Add some responsiveness to the user managementJulius Härtl2018-07-201-18/+10
| * | Fix cut-off name input fieldJulius Härtl2018-07-201-1/+1
| * | Remove reset button from new user formJulius Härtl2018-07-201-2/+0
| * | Adjust user table font colorJulius Härtl2018-07-201-2/+2
| * | Only show groups header in the sidebar, if groups are availableJulius Härtl2018-07-201-5/+10
| * | Hide no more results noteJulius Härtl2018-07-201-1/+1
| * | Fix user management field label namingJulius Härtl2018-07-201-4/+4
|/ /
* | Merge pull request #9581 from nextcloud/dav-acl-no-filesRoeland Jago Douma2018-07-201-0/+11
|\ \
| * | disable dav acl plugin for files resourceRobin Appelman2018-05-241-0/+11
* | | Merge pull request #10229 from nextcloud/feature/noid/allow-notifiers-to-know...Morris Jobke2018-07-202-8/+40
|\ \ \
| * | | Add return types and fully qualified function callsJoas Schilling2018-07-131-8/+8
| * | | Allow notifiers to know whether we are preparing push notificationsJoas Schilling2018-07-132-0/+32
* | | | Merge pull request #8188 from arnowelzel/masterMorris Jobke2018-07-201-2/+2
|\ \ \ \
| * | | | Avoid error messages for restricted opcache APIArno Welzel2018-02-051-2/+2
* | | | | Merge pull request #10290 from weeman1337/fix-10234-delete-empty-groupsRoeland Jago Douma2018-07-206-5/+35
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Adds tests for testing removing an empty groupMichael Weimann2018-07-203-1/+31
| * | | | Display the remove item even for elements without a countMichael Weimann2018-07-183-4/+4