Commit graph

17 commits

Author SHA1 Message Date
Fatih Acet
8429a57874 Fix hard coded plural text. 2016-08-13 00:30:44 +03:00
Fatih Acet
14888a398c Disable commit button if commit message textarea empty. 2016-08-12 23:24:52 +03:00
Fatih Acet
a1d0b0398b Remove commit button loader and update title while committing. 2016-08-12 23:24:52 +03:00
Fatih Acet
1eaad45e71 Remove unnecessary window exports. 2016-08-12 23:24:52 +03:00
Fatih Acet
c9f94fec4d Change left and right position for parallel lines. 2016-08-12 23:24:51 +03:00
Fatih Acet
0039fcd3ff Update button titles in merge conflicts widget header. 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
Fatih Acet
912cc7b862 Add file icon and blob link. 2016-08-12 23:24:47 +03:00
Fatih Acet
ad0b5ffbb5 Draw side-by-side view only one table. 2016-08-12 23:24:47 +03:00
Fatih Acet
e47e537b07 Handle renamed files in file header. 2016-08-12 23:24:47 +03:00
Sean McGivern
3b84cfdc74 Use same resolution format on FE and BE 2016-08-12 23:24:46 +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
b0b5e9f161 Refactor data parser to remove duplicated objects. 2016-08-12 23:24:45 +03:00
Fatih Acet
85507b25e4 Fixes for match lines in parallel view. 2016-08-12 23:24:45 +03:00
Fatih Acet
5c7a7093b7 Added ES6 MergeConflictResolver classes. 2016-08-12 23:24:44 +03:00