aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5998 from nextcloud/drone_mysqlmb4_71Morris Jobke2017-08-071-0/+11
|\
| * Add mysqlmb4 php7.1 drone jobRoeland Jago Douma2017-08-061-0/+11
|/
* Merge pull request #5997 from nextcloud/drone_mysqlmb4_70Morris Jobke2017-08-061-0/+11
|\
| * Add myslqmb4 php 7.0 droneRoeland Jago Douma2017-08-061-0/+11
|/
* Merge pull request #5995 from nextcloud/drone_mysql_71Morris Jobke2017-08-061-0/+11
|\
| * Add PHP 7.1 mysql job to droneRoeland Jago Douma2017-08-061-0/+11
|/
* Merge pull request #5990 from nextcloud/drone_mysql_70Roeland Jago Douma2017-08-061-0/+11
|\
| * Also run mysql test on php7.0Roeland Jago Douma2017-08-051-0/+11
* | [tx-robot] updated from transifexNextcloud bot2017-08-068-4/+16
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-05158-270/+350
* Merge pull request #5550 from andreasjacobsen93/clean-settings-layoutMorris Jobke2017-08-043-240/+265
|\
| * Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-0468-198/+261
| |\
| * \ Merge branch 'clean-settings-layout' of github.com:andreasjacobsen93/nextclou...Marin Treselj2017-08-041011-7186/+12366
| |\ \
| | * \ Merge branch 'master' into clean-settings-layoutMorris Jobke2017-08-031011-7186/+12366
| | |\ \
| * | | | Fix federation icon menu and container paddings.Marin Treselj2017-08-042-48/+11
| |/ / /
| * | | Reintroduce a more compact grid.Marin Treselj2017-08-031-0/+5
| * | | Clean up HTML structure, fix labels.Marin Treselj2017-08-032-60/+26
| * | | Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/...Andreas Jacobsen2017-07-24672-8160/+15570
| |\ \ \
| | * \ \ Merge branch 'master' into clean-settings-layoutAndreas Jacobsen2017-07-15672-8160/+15570
| | |\ \ \
| * | | | | Fixed bug with sharing-settingsAndreas Jacobsen2017-07-242-1/+6
| |/ / / /
| * | | | Personal settings file changedAndreas Jacobsen2017-07-152-422/+347
| * | | | Updated layoutAndreas Jacobsen2017-07-142-17/+26
| * | | | Moved settings to leftAndreas Jacobsen2017-07-142-9/+13
| * | | | Update for settingsAndreas Jacobsen2017-06-292-16/+34
| * | | | Added space between avatar and settingsAndreas Jacobsen2017-06-281-6/+4
| * | | | Fixed typosAndreas Jacobsen2017-06-282-6/+6
| * | | | Merge branch 'clean-settings-layout' of https://github.com/andreasjacobsen93/...Andreas Jacobsen2017-06-280-0/+0
| |\ \ \ \
| | * | | | Cleaned up personal settings pageAndreas Jacobsen2017-06-272-73/+106
| * | | | | Cleaned up personal settings pageAndreas Jacobsen2017-06-282-73/+106
| |/ / / /
* | | | | Merge pull request #5969 from nextcloud/fix-vertical-alignment-of-loading-ico...Morris Jobke2017-08-041-20/+8
|\ \ \ \ \
| * | | | | Fix code styleDaniel Calviño Sánchez2017-08-031-1/+1
| * | | | | Remove superfluous selector partDaniel Calviño Sánchez2017-08-031-1/+1
| * | | | | Align vertically loading icon and status messageDaniel Calviño Sánchez2017-08-031-6/+6
| * | | | | Do not use the same rules for loading icon than for upload iconDaniel Calviño Sánchez2017-08-031-2/+1
| * | | | | Remove ignored rulesDaniel Calviño Sánchez2017-08-031-11/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #5954 from nextcloud/textpreview_rangeLukas Reschke2017-08-041-1/+6
|\ \ \ \ \
| * | | | | Do not fetch the whole text file for the sidebar previewRoeland Jago Douma2017-08-031-1/+6
| |/ / / /
* | | | | Merge pull request #5963 from nextcloud/pre_post_share_eventsLukas Reschke2017-08-044-124/+302
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Move pre_shared and post_shared events to EventDispatcherRoeland Jago Douma2017-08-034-124/+302
* | | | | Merge pull request #5967 from nextcloud/revert-5682-inline-svg-iconMorris Jobke2017-08-046-22/+15
|\ \ \ \ \
| * | | | | Revert "Proof of concept #5593 - inline SVG icon for icon-contacts"Joas Schilling2017-08-036-22/+15
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexNextcloud bot2017-08-0462-176/+246
|/ / / /
* | | | Merge pull request #5738 from nextcloud/comradekingu-patch-3Morris Jobke2017-08-031-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Improve spelling in LDAPAllan Nordhøy2017-08-021-3/+3
* | | | Merge pull request #5959 from nextcloud/drop-logo-claimMorris Jobke2017-08-036-11/+6
|\ \ \ \
| * | | | Logo claim is not used anymoreMorris Jobke2017-08-026-11/+6
* | | | | [tx-robot] updated from transifexNextcloud bot2017-08-0340-6/+158
* | | | | Merge pull request #5953 from nextcloud/theming-lightness-correctionLukas Reschke2017-08-021-4/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-011-4/+7
* | | | | Merge pull request #5816 from nextcloud/fix-oracleMorris Jobke2017-08-0220-98/+215
|\ \ \ \ \