summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove accidental EE additions in CEjej/fix-accidental-ee-directoryJames Edwards-Jones2018-05-102-51/+0
* Backport with_forgery_protection spec helperJames Edwards-Jones2018-05-081-5/+12
* Merge branch 'dm-warden-hook-scope' into 'master'Grzegorz Bizon2018-05-071-5/+5
|\
| * Only run session related Warden hooks for user scopeDouwe Maan2018-05-071-5/+5
* | Merge branch '44427-state-management-with-vuex' into 'master'Tim Zallmann2018-05-073-249/+390
|\ \
| * | Follow up after reviewFilipa Lacerda2018-05-072-1/+18
| * | Merge branch 'master' into 44427-state-management-with-vuextFilipa Lacerda2018-05-042198-30639/+75637
| |\ \
| * | | Update vuex.mdFilipa Lacerda2018-04-061-5/+6
| * | | Changes after reviewFilipa Lacerda2018-04-041-32/+33
| * | | [ci skip] Merge branch 'master' into 44427-state-management-with-vuexFilipa Lacerda2018-04-041224-9785/+25292
| |\ \ \
| * | | | Fixes typos and adds mutations examples44427-state-management-with-vuexFilipa Lacerda2018-03-222-19/+117
| * | | | Improve state management documentationFilipa Lacerda2018-03-222-248/+275
* | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into 'master'Filipa Lacerda2018-05-0767-1406/+1851
|\ \ \ \ \
| * | | | | fixed stageAllChanges testPhil Hughes2018-05-061-0/+1
| * | | | | fixed file action specPhil Hughes2018-05-061-2/+8
| * | | | | added tooltip to bar buttonsPhil Hughes2018-05-061-2/+23
| * | | | | fixed mis-aligned iconPhil Hughes2018-05-044-3/+6
| * | | | | Merge branch 'ide-sidebar-commit-box' into '44846-improve-web-ide-left-panel-...Filipa Lacerda2018-05-0423-300/+618
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-co...Phil Hughes2018-05-0412-79/+160
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'ide-sidebar-merge-request' into '44846-improve-web-ide-left-pan...Filipa Lacerda2018-05-0412-80/+165
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-me...Phil Hughes2018-05-0484-353/+1507
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | create constant for viewer typePhil Hughes2018-05-047-18/+40
| | * | | | | | added specsPhil Hughes2018-05-044-1/+73
| | * | | | | | fixed specsPhil Hughes2018-05-031-0/+1
| | * | | | | | 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-042-36/+30
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | fixed duplicated testsPhil Hughes2018-05-041-31/+29
| * | | | | | | | removed conflict markersPhil Hughes2018-05-041-5/+1
| | | | * | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-co...Phil Hughes2018-05-0485-334/+1494
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modesPhil Hughes2018-05-0484-333/+1493
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | | | * | | | | improve logic of success messagePhil Hughes2018-05-045-12/+36
| | | | * | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-co...Phil Hughes2018-05-030-0/+0
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | fixed specsPhil Hughes2018-05-034-8/+3
| | |/ / / / / / | |/| | | | | |
| | | * | | | | improved success message after commit with new sidebarPhil Hughes2018-05-039-38/+54
| | | * | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-co...Phil Hughes2018-05-03301-5256/+10136
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modesPhil Hughes2018-05-03300-5259/+10138
| |\ \ \ \ \ \ \
| | | | * | | | | removed unused computed propPhil Hughes2018-05-034-26/+26
| | | | * | | | | fixed incorrect computed prop being usedPhil Hughes2018-05-033-13/+10
| | | | * | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-co...Phil Hughes2018-05-0323-167/+368
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'ide-activity-bar-review-mode' into '44846-improve-web-ide-left-...Filipa Lacerda2018-05-0223-166/+367
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixed repo_editor_specPhil Hughes2018-05-021-3/+3
| | * | | | | | | | made path prop in dropdown optionalPhil Hughes2018-05-025-7/+9
| | * | | | | | | | fixed height changing when hiding tabsPhil Hughes2018-05-021-0/+1
| | * | | | | | | | changed which element is hiddenPhil Hughes2018-05-012-6/+48
| | * | | | | | | | hide edit/preview tabs in review & commit modePhil Hughes2018-05-015-15/+37
| | * | | | | | | | fixed karma & eslintPhil Hughes2018-04-301-1/+1
| | * | | | | | | | Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-activity-b...Phil Hughes2018-04-3030-71/+438
| | |\ \ \ \ \ \ \ \
View Lorry Controller Status