Commit graph

9 commits

Author SHA1 Message Date
Kushal Pandya
fb3e365412 HAMLLint: Fix SpaceInsideHashAttributes offences 2016-12-31 11:58:36 +05:30
Alfredo Sumaran
6dbca36490 Fix Merge Conflicts app to make it work with Vue 2 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
78c7c11dda VueJS migration, replace {{{ with v-html 2016-11-10 17:53:34 +03:00
Alfredo Sumaran
cdd0dd507d Fix discard message 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
0402a18367 Replace loading text with spinner 2016-10-13 14:16:34 -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