summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bootstrap4' into 'master'Mike Greiling2018-05-257-17/+17
|\
| * Merge branch 'master' into bootstrap4Clement Ho2018-05-2314-25/+179
| |\
| * \ Merge branch 'master' into bootstrap4Clement Ho2018-05-213-7/+5
| |\ \
| * \ \ Merge branch 'master' into 'bootstrap4'Clement Ho2018-05-112-1/+2
| |\ \ \
| * | | | Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-101-1/+1
| * | | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-05-104-6/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into bootstrap4Clement Ho2018-05-0843-815/+1301
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into bootstrap4Clement Ho2018-04-2612-72/+123
| |\ \ \ \ \ \
| * | | | | | | Fix ide modalClement Ho2018-04-251-13/+12
| * | | | | | | Merge branch 'master' into bootstrap4Clement Ho2018-04-2515-39/+520
| |\ \ \ \ \ \ \
| * | | | | | | | Rename open dropdown class to showClement Ho2018-04-231-1/+1
| * | | | | | | | Merge branch 'master' into bootstrap4Clement Ho2018-04-1928-266/+812
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-186-151/+258
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ [skip ci] Merge branch 'master' into bootstrap4Clement Ho2018-04-172-8/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-161-44/+26
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [skip ci] Convert btn-xs to btn-smClement Ho2018-04-121-4/+4
| * | | | | | | | | | | | [skip ci] .form-horizontal => .form-group.rowClement Ho2018-04-122-3/+2
| * | | | | | | | | | | | Merge branch 'master' into bootstrap4Clement Ho2018-04-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [skip ci] Replace hidden-xsClement Ho2018-04-091-1/+1
| * | | | | | | | | | | | | [skip ci] Replace hidden-smClement Ho2018-04-091-1/+1
| * | | | | | | | | | | | | [skip ci] Replace .pull-right with .float-rightClement Ho2018-04-093-4/+4
| * | | | | | | | | | | | | Replace .pull-left with .float-leftClement Ho2018-04-093-4/+4
| * | | | | | | | | | | | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-095-26/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Rename .btn-default to .btn-secondaryClement Ho2018-04-092-2/+2
| * | | | | | | | | | | | | | Rename col-xs-* to col-*Clement Ho2018-04-092-4/+4
* | | | | | | | | | | | | | | Resolve "Show CI pipeline status in Web IDE"André Luís2018-05-256-25/+126
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Resolve "Web IDE doesn't work for branches with slashes"Tim Zallmann2018-05-234-16/+28
* | | | | | | | | | | | | | Merge branch 'ide-commit-state-bug' into 'master'Filipa Lacerda2018-05-231-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed web IDE review & commit editors getting into incorrect statePhil Hughes2018-05-181-2/+7
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ide-jobs-list' into 'master'Filipa Lacerda2018-05-237-0/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | group jobs into stageside-jobs-listPhil Hughes2018-05-224-12/+41
| * | | | | | | | | | | | | | added getter for checking is their is a pipelinePhil Hughes2018-05-224-7/+12
| * | | | | | | | | | | | | | Show CI jobs in web IDEPhil Hughes2018-05-226-0/+102
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ide-file-finder-improve-order' into 'master'Filipa Lacerda2018-05-232-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | changed what bit of code stops the callbackide-file-finder-improve-orderPhil Hughes2018-05-221-4/+5
| * | | | | | | | | | | | | Fixed IDE file finder orderingPhil Hughes2018-05-142-7/+7
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ide-sidebar-spacing' into 'master'Filipa Lacerda2018-05-183-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | fixed up spacing throughout sidebarsPhil Hughes2018-05-093-7/+5
* | | | | | | | | | | | | Fixed none merge request files not being openable in the web IDEPhil Hughes2018-05-102-1/+2
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | 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
| |/ / / / / / / / / / /
* | | | | | | | | | | | Fix outdated web ide copyjr-46209-web-ide-copyJames Ramsay2018-05-101-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed empty editors in the IDEPhil Hughes2018-05-092-3/+5
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Fixed tooltip & spacing of merge request icon in IDEPhil Hughes2018-05-081-2/+2
* | | | | | | | | | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-071-6/+12
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-0714-55/+188
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-031-6/+9
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Resolve "Clean up bottom status bar Web IDE"André Luís2018-05-077-69/+166
* | | | | | | | | | | added tooltip to bar buttonsPhil Hughes2018-05-061-2/+23