summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'admin-dispatcher' into 'master'Filipa Lacerda2018-01-1116-22/+93
|\
| * Uses `callDefault`admin-dispatcherPhil Hughes2018-01-111-11/+33
| * Admin dispatcher JS importsPhil Hughes2018-01-1116-22/+71
* | Merge branch 'dispatcher-dashboard-activities' into 'master'Filipa Lacerda2018-01-112-1/+6
|\ \ | |/ |/|
| * Refactor dashboard activities pathdispatcher-dashboard-activitiesClement Ho2018-01-102-1/+6
* | Merge branch 'dispatcher-sessions' into 'master'Phil Hughes2018-01-115-7/+15
|\ \
| * | Fix importClement Ho2018-01-101-1/+1
| * | Refactor dispatcher sessions pathClement Ho2018-01-105-6/+14
| |/
* | Merge branch 'dispatcher-search' into 'master'Phil Hughes2018-01-113-4/+8
|\ \
| * | Refactor dispatcher search pathdispatcher-searchClement Ho2018-01-103-4/+8
| |/
* | Merge branch 'explore-dispatcher-refactor' into 'master'Fatih Acet2018-01-103-15/+28
|\ \
| * | Code improvements and fix bad conflict mergeexplore-dispatcher-refactorClement Ho2018-01-102-5/+1
| * | Merge branch 'master' into 'explore-dispatcher-refactor'Clement Ho2018-01-10196-5330/+6028
| |\ \ | | |/
| * | Fix eslintJacob Schatz2018-01-083-13/+11
| * | Merge branch 'master' into explore-dispatcher-refactorJacob Schatz2018-01-083-6/+9
| |\ \
| * | | Fixes duplicationJacob Schatz2018-01-081-16/+0
| * | | Updating dispatcher without code fixesJacob Schatz2018-01-083-410/+357
| * | | Refactor `explore:*`Jacob Schatz2018-01-083-342/+428
* | | | Fix indention and bad conflict mergeprojects-a-refactorClement Ho2018-01-101-7/+6
* | | | Merge branch 'master' into 'projects-a-refactor'Clement Ho2018-01-10196-5329/+6026
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ph-dispatcher-1' into 'master'Filipa Lacerda2018-01-106-8/+25
| |\ \ \
| | * | | Added admin:conversational_development_index:show import to dispatcherph-dispatcher-1Phil Hughes2018-01-092-1/+4
| | * | | Added import:fogbugz:new_user_map import to dispatcherPhil Hughes2018-01-092-1/+4
| | * | | Added ci:lints import to dispatcherPhil Hughes2018-01-093-2/+4
| | * | | Added import for snippets:show in dispatcherPhil Hughes2018-01-092-4/+13
| | | |/ | | |/|
| * | | Merge branch '34312-eslint-vue-plugin' into 'master'Phil Hughes2018-01-10181-5129/+5776
| |\ \ \
| | * | | Fix broken modalFilipa Lacerda2018-01-101-1/+1
| | * | | Disable rule in modal.vue breaking testsFilipa Lacerda2018-01-091-5/+3
| | * | | Fix broken testsFilipa Lacerda2018-01-092-100/+98
| | * | | Fix broken specsFilipa Lacerda2018-01-095-22/+10
| | * | | Fix broken test for application rowFilipa Lacerda2018-01-091-2/+2
| | * | | Fix broken tests for project list and headerFilipa Lacerda2018-01-092-2/+2
| | * | | Fix application row specsFilipa Lacerda2018-01-091-7/+7
| | * | | [ci skip] Fix pagination specsFilipa Lacerda2018-01-091-4/+3
| | * | | Fix last eslint rulesFilipa Lacerda2018-01-088-155/+167
| | * | | Fix more eslint rulesFilipa Lacerda2018-01-0827-353/+402
| | * | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0817-515/+553
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fixes more eslint rulesFilipa Lacerda2018-01-0627-455/+486
| | * | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0628-531/+593
| | * | | [ci skip] Fix conflictsFilipa Lacerda2018-01-051-28/+4
| | * | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0526-258/+516
| | |\ \ \
| | * | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-057-380/+380
| | * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0534-920/+1035
| | * | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0510-272/+415
| | * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0574-2160/+2377
| | * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0415-469/+464
| | * | | | [ci skip] Fix some rulesFilipa Lacerda2018-01-047-134/+155
| | * | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0419-114/+347
| | |\ \ \ \
| | * | | | | Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-0327-214/+265
| * | | | | | Merge branch 'dispatcher-dashboard-projects' into 'master'Phil Hughes2018-01-102-0/+7
| |\ \ \ \ \ \
View Lorry Controller Status