Age | Commit message (Expand) | Author |
---|---|---|
2016-10-25 | remove manual Cookie.set "path" option in favor of global setting | Mike Greiling |
2016-10-25 | replace jquery.cookie vendor script with js.cookie | Mike Greiling |
2016-10-17 | Provide better error message to the user | Alfredo Sumaran |
2016-10-13 | Add syntax highlighting to files | Alfredo Sumaran |
2016-10-13 | Use plain JS to get elements and data and values | Alfredo Sumaran |
2016-10-13 | Add more tests to check conflicts resolution | Alfredo Sumaran |
2016-10-13 | Improve components for PhantomJs compatibility | Alfredo Sumaran |
2016-10-13 | Use .some instead of .find for phantomjs compatibility | Alfredo Sumaran |
2016-10-13 | Do not show Diff view switcher if all files are can be only resolved with an ... | Alfredo Sumaran |
2016-10-13 | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran |
2016-10-13 | Refactor JS code | Alfredo Sumaran |
2016-10-13 | Replace textarea with Ace editor | Alfredo Sumaran |
2016-10-13 | Implement editor to manually resolve merge conflicts | Alfredo Sumaran |