summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-1038-54/+49
* [skip ci] Use default button styles for .btn-secondaryAnnabel Dunstone Gray2018-05-102-5/+5
* [skip ci] Use default button styles for .btn-secondaryAnnabel Dunstone Gray2018-05-101-0/+5
* Merge branch 'master' into 'bootstrap4'Clement Ho2018-05-108-45/+44
|\
| * Merge branch 'ide-hide-merge-request-if-disabled' into 'master'Filipa Lacerda2018-05-101-1/+3
| |\
| | * Hide merge request option in IDE when merge requests are disabledPhil Hughes2018-05-091-1/+3
| * | Merge branch 'jr-46209-web-ide-copy' into 'master'Tim Zallmann2018-05-101-2/+2
| |\ \
| | * | Fix outdated web ide copyjr-46209-web-ide-copyJames Ramsay2018-05-101-2/+2
| | |/
| * | refactor 'cycle_analytics' to use axiosPaul Slaughter2018-05-092-15/+17
| * | refactor "deploy_keys" to use axiosPaul Slaughter2018-05-091-23/+10
| |/
| * Fixed empty editors in the IDEPhil Hughes2018-05-092-3/+5
| * Remove sidebar, flash container, and URLs from print pagesAnnabel Dunstone Gray2018-05-081-1/+7
* | Fix contributors page layoutAnnabel Dunstone Gray2018-05-091-0/+2
* | Fix broken layout on compare branches pageAnnabel Dunstone Gray2018-05-091-1/+1
* | Fix bad merge from masterClement Ho2018-05-081-0/+4
* | Fix positioning of add-to-tree dropdownAnnabel Dunstone Gray2018-05-083-13/+4
* | Fix default link colorAnnabel Dunstone Gray2018-05-081-0/+8
* | Fix right-aligned menus; only display tooltip on hoverAnnabel Dunstone Gray2018-05-081-0/+1
* | Merge branch 'master' into bootstrap4Clement Ho2018-05-08133-4669/+8542
|\ \ | |/
| * Merge branch '44319-remove-gray-buttons' into 'master'Phil Hughes2018-05-082-10/+1
| |\
| | * Remove gray button styleAnnabel Dunstone Gray2018-05-072-10/+1
| * | Fixed tooltip & spacing of merge request icon in IDEPhil Hughes2018-05-081-2/+2
| |/
| * Merge branch '43557-osw-present-merge-sha-commit' into 'master'Robert Speicher2018-05-072-0/+16
| |\
| | * Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-072-0/+16
| * | Resolve "Monitoring graphs - Popover value improvements"Jose Ivan Vargas2018-05-078-30/+92
| * | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-073-29/+59
| |\ \
| | * \ Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-0772-3274/+6355
| | |\ \
| | * | | consolidate main bootstrap entriesMike Greiling2018-05-061-8/+8
| | * | | prettify main.jsMike Greiling2018-05-061-15/+30
| | * | | add better description for resetServiceWorkersPublicPathMike Greiling2018-05-041-1/+4
| | * | | adjust IDE page loading config to ensure web workers are not loaded cross-originMike Greiling2018-05-032-6/+18
| * | | | Fix close keyboard shortcuts dialog using the keyboard shortcutLars Greiss2018-05-071-0/+1
| * | | | Make deploy keys table more clearly structuredLukas Eipert2018-05-0710-360/+556
| * | | | Resolve "Inform users of up to $500 offer for GCP account"Dennis Tang2018-05-076-20/+103
| * | | | Resolve "Clean up bottom status bar Web IDE"André Luís2018-05-079-70/+183
| * | | | Improved commit message body renderingConstance Okoghenun2018-05-071-17/+8
| * | | | Merge branch '10244-ux-improvements-for-group-runners' into 'master'Kamil Trzciński2018-05-071-0/+4
| |\ \ \ \
| | * | | | Make group settings page have expandable menus (#10244)Dylan Griffith2018-05-071-0/+4
| * | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into 'master'Filipa Lacerda2018-05-0740-897/+1208
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | added tooltip to bar buttonsPhil Hughes2018-05-061-2/+23
| | * | | | fixed mis-aligned iconPhil Hughes2018-05-044-3/+6
| | * | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-co...Phil Hughes2018-05-0410-79/+123
| | |\ \ \ \
| | | * \ \ \ Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-me...Phil Hughes2018-05-0414-55/+161
| | | |\ \ \ \
| | | * | | | | create constant for viewer typePhil Hughes2018-05-047-18/+40
| | | * | | | | added specsPhil Hughes2018-05-043-1/+37
| | | * | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-me...Phil Hughes2018-05-034-8/+3
| | | |\ \ \ \ \
| | | * | | | | | updated stylingPhil Hughes2018-05-034-12/+19
| | | * | | | | | Added merge request to IDE sidebarPhil Hughes2018-05-033-68/+51
| | * | | | | | | fixed disabled action sticking around too longPhil Hughes2018-05-042-2/+11
| | * | | | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-co...Phil Hughes2018-05-041-5/+1
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |