summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [PoC] JS CombinerRoeland Jago Douma2017-03-243-0/+91
* Merge pull request #4026 from nextcloud/appmenu-fixLukas Reschke2017-03-241-1/+2
|\
| * Fix appmenu issuesJulius Härtl2017-03-241-1/+2
* | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-242-1/+42608
|\ \
| * | Merge vendor jsRoeland Jago Douma2017-03-232-1/+42608
* | | Merge pull request #4022 from nextcloud/downstream-27105Roeland Jago Douma2017-03-242-4/+8
|\ \ \ | |_|/ |/| |
| * | Remove auto-focus on certain input fieldsFelix Heidecke2017-03-232-4/+8
| |/
* | Merge pull request #4025 from nextcloud/downstream-27292Roeland Jago Douma2017-03-242-5950/+1
|\ \
| * | Properly clear heartbeat intervalVincent Petry2017-03-231-1/+1
| * | Update karma, use sinon from npmVincent Petry2017-03-231-5949/+0
| |/
* | Merge pull request #3928 from nextcloud/downstream-17978Morris Jobke2017-03-232-0/+93
|\ \ | |/ |/|
| * Improve error message of charset convert script and behaviourMorris Jobke2017-03-231-4/+5
| * Address commentsMorris Jobke2017-03-211-1/+1
| * Adding tests for 4 byte unicode charactersMorris Jobke2017-03-212-0/+92
* | Merge pull request #3997 from nextcloud/backport-27353Roeland Jago Douma2017-03-232-25/+83
|\ \
| * | Update davclient.js to 0.1.1Vincent Petry2017-03-222-25/+83
* | | [tx-robot] updated from transifexNextcloud bot2017-03-232-0/+20
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-03-2210-4/+46
* | Revert "Bundle vendor js"Roeland Jago Douma2017-03-222-42551/+1
* | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-222-1/+42551
|\ \
| * | Bump core.jsRoeland Jago Douma2017-03-221-1/+2
| * | Bundle more default vendor jsRoeland Jago Douma2017-03-222-2/+4236
| * | Merge vendor jsRoeland Jago Douma2017-03-221-0/+38315
| |/
* | Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltipRoeland Jago Douma2017-03-221-0/+1
|\ \
| * | Remove tooltip of delete button for systemtagsMorris Jobke2017-03-211-0/+1
| |/
* | Merge pull request #3980 from nextcloud/fix-app-menu-triangleChristoph Wurst2017-03-221-1/+1
|\ \
| * | Fix position of triangle in app menuMorris Jobke2017-03-211-1/+1
| |/
* / [tx-robot] updated from transifexNextcloud bot2017-03-228-2/+28
|/
* [tx-robot] updated from transifexNextcloud bot2017-03-2114-4/+26
* Merge pull request #3530 from nextcloud/scss-variablesLukas Reschke2017-03-209-248/+223
|\
| * 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
| * SCSS colors in share.scssJulius Haertl2017-03-201-5/+5
| * SCSS colors in multiselect.scssJulius Haertl2017-03-201-11/+11
| * SCSS colors in inputs.scssJulius Haertl2017-03-201-63/+63
| * SCSS colors in icons.scssJulius Haertl2017-03-201-4/+4