Alfredo Sumaran
54bfe70795
Add more tests to check conflicts resolution
2016-10-13 14:16:35 -05:00
Alfredo Sumaran
f947972ded
Improve diff view switching and components
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
Sean McGivern
e84f959ae4
Fix editor spec
2016-10-13 14:16:35 -05:00
Alfredo Sumaran
4178ddee18
Add tests to check if files are resolved with Edit Inline mode
2016-10-13 14:16:35 -05:00
Douwe Maan
6af52d7d23
We now support resolving conflicts with ambiguous markers
2016-10-13 14:16:34 -05:00
Sean McGivern
44eb3197a9
Handle non-UTF-8 conflicts gracefully
...
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
2016-08-25 08:27:08 +01:00
Sean McGivern
7cb76ce1c6
Add workaround for JS error in spec
...
These JS errors are only thrown in PhantomJS, and enough of the page is
rendered properly that this spec passes. We should remove this in
future.
2016-08-17 11:15:05 +01:00
Fatih Acet
f6aa91700a
Fix failed test because of a copy change.
2016-08-12 23:24:51 +03:00
Sean McGivern
ce7eb4e492
Add more tests for conflicts
2016-08-12 23:24:48 +03:00
