summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-2262-52/+272
* Merge pull request #3974 from nextcloud/fix-reshare-activity-messageMorris Jobke2017-03-211-1/+1
|\
| * Fix reshare with user activity messageJoas Schilling2017-03-211-1/+1
|/
* Merge pull request #3937 from nextcloud/downstream-27234Morris Jobke2017-03-211-1/+1
|\
| * fix typo in sftp public keyMartin2017-03-191-1/+1
* | Merge pull request #3975 from nextcloud/remove-dead-codeMorris Jobke2017-03-211-1/+0
|\ \
| * | Remove test codeLukas Reschke2017-03-211-1/+0
|/ /
* | Merge pull request #3844 from nextcloud/unshare_eventJoas Schilling2017-03-216-209/+298
|\ \
| * | Update autoloaderRoeland Jago Douma2017-03-172-0/+2
| * | Add LegacyHooksRoeland Jago Douma2017-03-174-210/+292
| * | Add unshare eventRoeland Jago Douma2017-03-171-0/+5
* | | Merge pull request #3968 from nextcloud/fix-brandingLukas Reschke2017-03-211-1/+1
|\ \ \
| * | | [master] Fix brandingLukas Reschke2017-03-211-1/+1
|/ / /
* | | Merge pull request #3955 from nextcloud/downstream-27113Roeland Jago Douma2017-03-215-5/+17
|\ \ \
| * | | [CI] Can we get some faster phpunit execution? (#27113)Thomas Müller2017-03-205-5/+17
* | | | Merge pull request #3901 from nextcloud/di_ngLukas Reschke2017-03-215-288/+376
|\ \ \ \
| * | | | Core is also a special appRoeland Jago Douma2017-03-211-0/+2
| * | | | Move a lot of stuff over to the ServerContainerRoeland Jago Douma2017-03-212-246/+156
| * | | | Fix NODB tests etcRoeland Jago Douma2017-03-211-4/+4
| * | | | Fix settings testsRoeland Jago Douma2017-03-212-15/+19
| * | | | Add DI intergration testsRoeland Jago Douma2017-03-213-9/+152
| * | | | Extend DI testsRoeland Jago Douma2017-03-212-9/+26
| * | | | More elegant handling of recursionRoeland Jago Douma2017-03-212-4/+8
| * | | | PoC of moving the interface classes to the servercontainerRoeland Jago Douma2017-03-212-10/+10
| * | | | Update query method for DIContainerRoeland Jago Douma2017-03-212-5/+13
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-2144-14/+130
* | | | Merge pull request #3963 from nextcloud/logs-access-to-previewsRoeland Jago Douma2017-03-203-13/+56
|\ \ \ \
| * | | | Log access to preview imagesLukas Reschke2017-03-203-13/+56
* | | | | Merge pull request #3530 from nextcloud/scss-variablesLukas Reschke2017-03-2015-263/+528
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix testsJulius Härtl2017-03-201-1/+1
| * | | | Fix sass compile testsJulius Härtl2017-03-201-1/+6
| * | | | Add tests for SCSSCacherJulius Härtl2017-03-204-54/+205
| * | | | Add variables.scss to sass compile testJulius Haertl2017-03-201-1/+1
| * | | | Add tests for SCSSCacherJulius Haertl2017-03-203-7/+116
| * | | | Replace old color occurences with calculationsJulius Haertl2017-03-205-84/+75
| * | | | Make remaining colors depending on $color-main-text and $color-main-backgroundJulius Haertl2017-03-203-21/+19
| * | | | Remove legacy CSSJulius Haertl2017-03-202-45/+1
| * | | | Merge color tones aaaaaa, bebebe, cccccc in bbbbbbJulius Haertl2017-03-204-14/+7
| * | | | Remove grey tintsJulius Haertl2017-03-202-3/+3
| * | | | Remove separate error colorsJulius Haertl2017-03-202-4/+3
| * | | | Extra variable for loading iconsJulius Haertl2017-03-202-8/+7
| * | | | Merge #666 and #777 to #555Julius Haertl2017-03-203-6/+6
| * | | | Use one box-shadow colorJulius Haertl2017-03-203-5/+5
| * | | | Replace #222 with #333Julius Haertl2017-03-202-3/+3
| * | | | Remove unused old #999Julius Haertl2017-03-201-1/+0
| * | | | Merge colorsJulius Haertl2017-03-204-16/+12
| * | | | Remove rgb color valuesJulius Haertl2017-03-205-16/+15
| * | | | Simplify colorsJulius Haertl2017-03-201-22/+24
| * | | | SCSS colors in tooltip.scssJulius Haertl2017-03-201-6/+6
| * | | | SCSS colors in styles.scssJulius Haertl2017-03-201-67/+67