lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-04-13 11:18:35 +08:00
Code Issues Projects Releases Wiki Activity
228 Commits 18 Branches 64 Tags
d6c726d3335d9fbf763126600d779ea9db1aa29b
Commit Graph

228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Peabody
d6c726d333 chore: note linting 2022-01-15 16:14:26 +00:00
Jamie Peabody
44580dbfc8 chore: fixed issue with lcs 2022-01-15 16:14:07 +00:00
Jamie Peabody
7024846cb0 chore: note issue with lcs 2022-01-15 15:56:00 +00:00
Jamie Peabody
bdb771acb5 chore: fixed scroll issue when trace not enabled 2022-01-15 15:50:35 +00:00
Jamie Peabody
4f9cf3aa7e refactor: moved cm markup to virtual doc for good performance gain 2022-01-15 14:18:05 +00:00
Jamie Peabody
ddbf594bc7 chore: fixed vertical alignment 2022-01-15 09:03:49 +00:00
Jamie Peabody
3fcfa21629 chore: tidy up 2022-01-09 20:48:30 +00:00
Jamie Peabody
884fccfc1a refactor: scroll performance improved greatly 2022-01-09 20:39:05 +00:00
Jamie Peabody
4264710d70 chore: fixed css for column 2022-01-09 13:21:59 +00:00
Jamie Peabody
aa75880184 chore: stable enough, but scroll is wip 2022-01-09 13:21:32 +00:00
Jamie Peabody
8f1d6481b9 chore: updated examples 2022-01-09 13:16:35 +00:00
Jamie Peabody
0c7fbe3572 chore: fixed broken merge button 2022-01-03 20:20:24 +00:00
Jamie Peabody
095781c81a chore: fixed current diff render and clarified pipeline 2022-01-03 16:59:45 +00:00
Jamie Peabody
06184aaee5 chore: more stable render and removed loops 2022-01-03 14:56:37 +00:00
Jamie Peabody
1dbf0015c9 chore: fixed viewport performance issue 2022-01-03 12:28:31 +00:00
Jamie Peabody
d6982c1925 chore: removed gutter_height 2022-01-02 14:54:25 +00:00
Jamie Peabody
5ea5b0e28e chore: removed fgcolor 2022-01-02 14:53:17 +00:00
Jamie Peabody
cba6524a74 chore: updated todo 2022-01-02 12:02:52 +00:00
Jamie Peabody
fab6c08286 chore: fixed scroll to first change 2022-01-02 12:00:13 +00:00
Jamie Peabody
2fa28df778 chore: fixed merge button 2022-01-02 11:46:41 +00:00
Jamie Peabody
b5561211dd chore: removed scroll to first change and added example 2022-01-01 16:37:42 +00:00
Jamie Peabody
c3fce4045e chore: tweak trace 2022-01-01 15:45:21 +00:00
Jamie Peabody
9aad630042 chore: fixed margin indicator colors 2022-01-01 15:34:21 +00:00
Jamie Peabody
3823b1fc62 chore: fixed initial render issue 2022-01-01 15:28:30 +00:00
Jamie Peabody
e80c788f2c chore: fixed initial render issue for app.html 2021-12-31 16:48:26 +00:00
Jamie Peabody
a7274a9d82 chore: removed option fadein 2021-12-31 16:06:54 +00:00
Jamie Peabody
0c646b275d chore: fixed alignment issue 2021-12-31 15:55:26 +00:00
Jamie Peabody
bfc6bdfae3 chore: change resize 2021-12-31 15:30:37 +00:00
Jamie Peabody
a0c8dad3e2 chore: tweak style for merge button 2021-12-30 20:58:43 +00:00
Jamie Peabody
60d5aabd14 chore: tidy styles 2021-12-30 20:47:05 +00:00
Jamie Peabody
ddd02343b6 chore: tidy styles 2021-12-30 19:58:57 +00:00
Jamie Peabody
ff467a6413 chore: fixed margin marker ratio 2021-12-30 16:45:58 +00:00
Jamie Peabody
cd32046d6e chore: fixed margin change indicators 2021-12-30 15:31:51 +00:00
Jamie Peabody
b6e0f2b481 chore: fixed issues with diff rendering 2021-12-30 14:17:13 +00:00
Jamie Peabody
1874ae0e6c chore: fixed scroll performance 2021-12-30 08:53:16 +00:00
Jamie Peabody
f48a0c3a02 chore: added examples 2021-12-30 08:48:44 +00:00
Jamie Peabody
f8e07526f6 chore: modernize 2021-12-30 08:48:22 +00:00
Jamie Peabody
e0ef4cb9c4 chore: updated some examples 2021-12-29 11:50:13 +00:00
Jamie Peabody
f05e06232a refactor: BREAKING: 5.0.0-rc0 2021-12-18 15:56:17 +00:00
Jamie Peabody
82f32ceb10 refactor(es6): most of jquery removed 2021-11-28 22:12:18 +00:00
Jamie Peabody
c9d11e415e refactor(es6): scroll no longer depends on jquery 2021-11-28 19:17:00 +00:00
Jamie Peabody
3d6193a235 refactor(es6): scroll no longer depends on jquery 2021-11-28 18:57:21 +00:00
Jamie Peabody
daad73a1cc refactor(es6): editor access is simpler lhs/rhs without id 2021-11-28 15:08:25 +00:00
Jamie Peabody
209d634a28 refactor(es6): editor access is simpler lhs/rhs without id 2021-11-28 15:06:56 +00:00
Jamie Peabody
a4dea56879 refactor(es6): resize no longer depends on jQuery 2021-11-28 14:51:11 +00:00
Jamie Peabody
56e490745d refactor(es6): Refactoring for es6 
mostly var => const/let changes
 2021-11-28 14:14:09 +00:00
Jamie Peabody
fdfbf8d131 chore(release): 4.3.8 v4.3.8 2021-11-21 17:23:18 +00:00
Jamie Peabody
79cb0ddd6a refactor: Split code into individual files and tidier code (#160) 
* refactor: split code into separate files

* chore: removed unused test code

* refactor: no longer depends on jQuery.extend

* docs: merged changes into CHANGELOG.md

Co-authored-by: Jamie Peabody <jpeabody@axway.com>
 2021-11-21 17:22:04 +00:00
Jamie Peabody
dfdba3c020 ci: allow merge type 2021-11-21 13:56:30 +00:00
Jamie Peabody
b930b8bbd6 chore(release): 4.3.7 v4.3.7 2021-11-21 13:19:47 +00:00