Douwe Maan
|
4d7c201414
|
Don’t hardcode paths
|
2016-08-12 23:24:50 +03:00 |
|
Fatih Acet
|
f9e0a6dade
|
Dynamically highlight code blocks in merge conflicts widgets.
|
2016-08-12 23:24:49 +03:00 |
|
Fatih Acet
|
1def35100d
|
Update container fludity class if diff view mode is parallel.
|
2016-08-12 23:24:49 +03:00 |
|
Fatih Acet
|
41f7cee991
|
Show loading button while Ajax request is in progress.
|
2016-08-12 23:24:49 +03:00 |
|
Sean McGivern
|
f322c30274
|
Set flash message after conflict is resolved
|
2016-08-12 23:24:48 +03:00 |
|
Fatih Acet
|
8b6a075e6f
|
Implement commit in merge conflicts UI.
|
2016-08-12 23:24:46 +03:00 |
|
Fatih Acet
|
c2295fbdf8
|
Render right sidebar and handle request error.
|
2016-08-12 23:24:46 +03:00 |
|
Fatih Acet
|
5625e8281a
|
Check line lengths and fill missing lines with empty lines.
|
2016-08-12 23:24:45 +03:00 |
|
Fatih Acet
|
5c7a7093b7
|
Added ES6 MergeConflictResolver classes.
|
2016-08-12 23:24:44 +03:00 |
|