summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts
Commit message (Expand)AuthorAgeFilesLines
* require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-092-0/+2
* refactor merge conflicts bundle to reduce side effectsMike Greiling2018-02-271-2/+2
* Merge branch 'axios-diff-file-editor' into 'master'Fatih Acet2018-02-071-10/+11
|\
| * Replace $.get in diff file editor with axiosaxios-diff-file-editorClement Ho2018-02-021-10/+11
* | added missing calls in catch statementsph-axios-2Phil Hughes2018-02-021-0/+1
* | Convert merge_conflict_service.js to axiosPhil Hughes2018-01-302-21/+11
|/
* Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-031-1/+1
* Export old code into es6 modulesFilipa Lacerda2017-12-131-1/+2
* Flash is now a ES6 modulePhil Hughes2017-10-102-2/+2
* Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-271-1/+1
|\
| * fix conflict pluralizedEmilien Mottet2017-07-241-1/+1
* | fixed label subscription & merge conflictsPhil Hughes2017-07-261-0/+3
|/
* update remaining uses of CJS syntax to ES module syntaxMike Greiling2017-05-161-8/+7
* remove Cookies class from global spaceMike Greiling2017-03-221-1/+1
* remove Vue from the global spaceMike Greiling2017-03-205-6/+10
* Remove .es6 from file extensions (!9241)winniehell2017-03-058-0/+0
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-278-48/+33
|\
| * resolve all prefer-const eslint violationsMike Greiling2017-01-182-10/+8
| * resolve all no-dupe-keys eslint violationsMike Greiling2017-01-181-2/+1
| * resolve all x-spacing and no-spaced-x eslint violationsMike Greiling2017-01-181-2/+2
| * resolve all padded-blocks eslint violationsMike Greiling2017-01-187-19/+7
| * resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-184-13/+13
| * resolve all no-plusplus eslint violationsMike Greiling2017-01-181-11/+11
* | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-101-8/+8
|/
* expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-138-9/+26
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-101-1/+16
* Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-102-19/+1
* Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
* Migrate Vue v1 to v2.Fatih Acet2016-11-101-1/+1
* disable ESLint for all JavaScript fileswinniehell2016-10-269-0/+9
* remove manual Cookie.set "path" option in favor of global settingMike Greiling2016-10-241-3/+1
* replace jquery.cookie vendor script with js.cookieMike Greiling2016-10-241-2/+2
* Provide better error message to the usermerge-conflicts-editor-2Alfredo Sumaran2016-10-171-1/+1
* Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
* Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
* Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-1/+3
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-10/+93
* Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
* Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-132-1/+14
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-132-133/+150
* Refactor JS codeAlfredo Sumaran2016-10-134-1/+537
* Replace textarea with Ace editorAlfredo Sumaran2016-10-131-7/+20
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-0/+63
View Lorry Controller Status