Alfredo Sumaran
|
6dbca36490
|
Fix Merge Conflicts app to make it work with Vue 2
|
2016-11-10 17:53:34 +03:00 |
|
Fatih Acet
|
674e9351e1
|
Remove unnecesarry require.
|
2016-11-10 17:53:34 +03:00 |
|
Fatih Acet
|
a1fc04dfad
|
VueJSMigration: Remove parallel-conflict-line component.
It's because Vue says: "Component template should contain exactly one root element".
|
2016-11-10 17:53:34 +03:00 |
|
Fatih Acet
|
0eb21fd840
|
Vue migration fix syntax highlighting.
|
2016-11-10 17:53:34 +03:00 |
|
Fatih Acet
|
99b421da2c
|
Migrate Vue v1 to v2.
|
2016-11-10 17:53:34 +03:00 |
|
winniehell
|
02f94cf038
|
disable ESLint for all JavaScript files
|
2016-10-26 10:02:58 +02:00 |
|
Mike Greiling
|
f8520f5d09
|
remove manual Cookie.set "path" option in favor of global setting
|
2016-10-24 18:09:00 -05:00 |
|
Mike Greiling
|
67d2b2acb3
|
replace jquery.cookie vendor script with js.cookie
|
2016-10-24 18:09:00 -05:00 |
|
Alfredo Sumaran
|
28dbfd5c4c
|
Provide better error message to the user
|
2016-10-17 12:43:17 -05:00 |
|
Alfredo Sumaran
|
f5de2ce3fd
|
Add syntax highlighting to files
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
6141816c23
|
Use plain JS to get elements and data and values
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
54bfe70795
|
Add more tests to check conflicts resolution
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
c4142cf9c0
|
Improve components for PhantomJs compatibility
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
4f76ff0ecd
|
Use .some instead of .find for phantomjs compatibility
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
cebad0fb60
|
Do not show Diff view switcher if all files are can be only resolved with an editor
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
197ac5ebbf
|
Ability to resolve conflicts for files with text-editor as conflict type
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
a8ac9089af
|
Refactor JS code
- Use a store base object to manage application state.
- Add a service to handle ajax requests.
- Load code only when needed
|
2016-10-13 14:16:35 -05:00 |
|
Alfredo Sumaran
|
a3eb39a106
|
Replace textarea with Ace editor
|
2016-10-13 14:16:34 -05:00 |
|
Alfredo Sumaran
|
26f658decd
|
Implement editor to manually resolve merge conflicts
|
2016-10-13 14:16:34 -05:00 |
|