liuxm/Mergely
1
0
Fork 0
forked from lxm_front/Mergely
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 3b300cea85 chore: fixes mostly done modernize Jamie Peabody 2022-02-27 21:18:03 +00:00
  • bb787df2e3 chore: test initial options Jamie Peabody 2022-01-30 12:00:48 +00:00
  • 9416260772 chore: simpler debug Jamie Peabody 2022-01-30 11:52:51 +00:00
  • 0d249b2123 chore: simpler debug Jamie Peabody 2022-01-30 11:51:30 +00:00
  • ce53ccaefd chore: fixed unit tests Jamie Peabody 2022-01-30 11:38:25 +00:00
  • f3e90b7588 chore(release): 4.3.9 master v4.3.9 Jamie Peabody 2022-01-19 21:49:12 +00:00
  • 650daaff63 fix(#161): Fixed issue with options.ignorews (#162) Jamie Peabody 2022-01-19 21:46:43 +00:00
  • 10d57ed42c chore: wip specs Jamie Peabody 2022-01-19 20:26:16 +00:00
  • 8d0ab76a1e chore: remove timer Jamie Peabody 2022-01-16 20:13:48 +00:00
  • fddc781b80 chore: notes Jamie Peabody 2022-01-16 19:50:08 +00:00
  • 5204dc2cb5 chore: bump dependencies Jamie Peabody 2022-01-16 16:18:18 +00:00
  • c7f9116ece feat: added web worker Jamie Peabody 2022-01-16 12:18:13 +00:00
  • 94399bcbf3 chore: start of a webworker Jamie Peabody 2022-01-15 20:01:37 +00:00
  • aa74599361 chore: fixed bg color for removed text Jamie Peabody 2022-01-15 19:24:48 +00:00
  • 46540a9ac2 chore: update todo Jamie Peabody 2022-01-15 19:23:50 +00:00
  • 42406dde54 chore: fixed bg color for removed text Jamie Peabody 2022-01-15 19:23:10 +00:00
  • 2d4362d296 chore: fixed line-diffs for non-alphanumeric characters Jamie Peabody 2022-01-15 19:16:08 +00:00
  • 88eba62ef8 chore: fixed example app height Jamie Peabody 2022-01-15 18:00:22 +00:00
  • e20c2c9496 chore: fixed ignorews Jamie Peabody 2022-01-15 17:48:04 +00:00
  • b11ac1172e chore: fixed splash Jamie Peabody 2022-01-15 17:25:05 +00:00
  • 3d06333dfc chore: fixed issue with lcs Jamie Peabody 2022-01-15 16:38:52 +00:00
  • d6c726d333 chore: note linting Jamie Peabody 2022-01-15 16:14:26 +00:00
  • 44580dbfc8 chore: fixed issue with lcs Jamie Peabody 2022-01-15 16:14:07 +00:00
  • 7024846cb0 chore: note issue with lcs Jamie Peabody 2022-01-15 15:56:00 +00:00
  • bdb771acb5 chore: fixed scroll issue when trace not enabled Jamie Peabody 2022-01-15 15:50:35 +00:00
  • 4f9cf3aa7e refactor: moved cm markup to virtual doc for good performance gain Jamie Peabody 2022-01-15 14:18:05 +00:00
  • ddbf594bc7 chore: fixed vertical alignment Jamie Peabody 2022-01-15 09:03:49 +00:00
  • 3fcfa21629 chore: tidy up Jamie Peabody 2022-01-09 20:48:30 +00:00
  • 884fccfc1a refactor: scroll performance improved greatly Jamie Peabody 2022-01-09 20:39:05 +00:00
  • 4264710d70 chore: fixed css for column Jamie Peabody 2022-01-09 13:21:59 +00:00
  • aa75880184 chore: stable enough, but scroll is wip Jamie Peabody 2022-01-09 13:21:32 +00:00
  • 8f1d6481b9 chore: updated examples Jamie Peabody 2022-01-09 13:16:35 +00:00
  • 0c7fbe3572 chore: fixed broken merge button Jamie Peabody 2022-01-03 20:20:24 +00:00
  • 095781c81a chore: fixed current diff render and clarified pipeline Jamie Peabody 2022-01-03 16:59:45 +00:00
  • 06184aaee5 chore: more stable render and removed loops Jamie Peabody 2022-01-03 14:56:37 +00:00
  • 1dbf0015c9 chore: fixed viewport performance issue Jamie Peabody 2022-01-03 12:28:31 +00:00
  • d6982c1925 chore: removed gutter_height Jamie Peabody 2022-01-02 14:54:25 +00:00
  • 5ea5b0e28e chore: removed fgcolor Jamie Peabody 2022-01-02 14:53:17 +00:00
  • cba6524a74 chore: updated todo Jamie Peabody 2022-01-02 12:02:52 +00:00
  • fab6c08286 chore: fixed scroll to first change Jamie Peabody 2022-01-02 12:00:13 +00:00
  • 2fa28df778 chore: fixed merge button Jamie Peabody 2022-01-02 11:46:41 +00:00
  • b5561211dd chore: removed scroll to first change and added example Jamie Peabody 2022-01-01 16:37:42 +00:00
  • c3fce4045e chore: tweak trace Jamie Peabody 2022-01-01 15:45:21 +00:00
  • 9aad630042 chore: fixed margin indicator colors Jamie Peabody 2022-01-01 15:34:21 +00:00
  • 3823b1fc62 chore: fixed initial render issue Jamie Peabody 2022-01-01 15:28:30 +00:00
  • e80c788f2c chore: fixed initial render issue for app.html Jamie Peabody 2021-12-31 16:48:26 +00:00
  • a7274a9d82 chore: removed option fadein Jamie Peabody 2021-12-31 16:06:54 +00:00
  • 0c646b275d chore: fixed alignment issue Jamie Peabody 2021-12-31 15:55:26 +00:00
  • bfc6bdfae3 chore: change resize Jamie Peabody 2021-12-31 15:30:37 +00:00
  • a0c8dad3e2 chore: tweak style for merge button Jamie Peabody 2021-12-30 20:58:43 +00:00
  • 60d5aabd14 chore: tidy styles Jamie Peabody 2021-12-30 20:47:05 +00:00
  • ddd02343b6 chore: tidy styles Jamie Peabody 2021-12-30 19:58:57 +00:00
  • ff467a6413 chore: fixed margin marker ratio Jamie Peabody 2021-12-30 16:45:58 +00:00
  • cd32046d6e chore: fixed margin change indicators Jamie Peabody 2021-12-30 15:31:51 +00:00
  • b6e0f2b481 chore: fixed issues with diff rendering Jamie Peabody 2021-12-30 14:17:13 +00:00
  • 1874ae0e6c chore: fixed scroll performance Jamie Peabody 2021-12-30 08:53:16 +00:00
  • f48a0c3a02 chore: added examples Jamie Peabody 2021-12-30 08:48:44 +00:00
  • f8e07526f6 chore: modernize Jamie Peabody 2021-12-30 08:48:22 +00:00
  • e0ef4cb9c4 chore: updated some examples Jamie Peabody 2021-12-29 11:50:13 +00:00
  • f05e06232a refactor: BREAKING: 5.0.0-rc0 Jamie Peabody 2021-12-18 15:56:17 +00:00
  • 82f32ceb10 refactor(es6): most of jquery removed Jamie Peabody 2021-11-28 22:12:18 +00:00
  • c9d11e415e refactor(es6): scroll no longer depends on jquery Jamie Peabody 2021-11-28 19:17:00 +00:00
  • 3d6193a235 refactor(es6): scroll no longer depends on jquery Jamie Peabody 2021-11-28 18:57:21 +00:00
  • daad73a1cc refactor(es6): editor access is simpler lhs/rhs without id Jamie Peabody 2021-11-28 15:08:25 +00:00
  • 209d634a28 refactor(es6): editor access is simpler lhs/rhs without id Jamie Peabody 2021-11-28 15:06:56 +00:00
  • a4dea56879 refactor(es6): resize no longer depends on jQuery Jamie Peabody 2021-11-28 14:51:11 +00:00
  • 56e490745d refactor(es6): Refactoring for es6 mostly var => const/let changes Jamie Peabody 2021-11-28 14:14:09 +00:00
  • fdfbf8d131 chore(release): 4.3.8 v4.3.8 Jamie Peabody 2021-11-21 17:23:18 +00:00
  • 79cb0ddd6a refactor: Split code into individual files and tidier code (#160) Jamie Peabody 2021-11-21 17:22:04 +00:00
  • dfdba3c020 ci: allow merge type Jamie Peabody 2021-11-21 13:56:30 +00:00
  • b930b8bbd6 chore(release): 4.3.7 v4.3.7 Jamie Peabody 2021-11-21 13:19:47 +00:00
  • 4d5c6fa67c chore: removed unused dev-deps Jamie Peabody 2021-11-21 13:17:32 +00:00
  • 94bee71aea chore(release): 4.3.6 v4.3.6 Jamie Peabody 2021-11-21 13:08:27 +00:00
  • 08e7b9735a ci: update tag latest Jamie Peabody 2021-11-21 13:06:51 +00:00
  • 26cb3f7220 ci: update tag latest Jamie Peabody 2021-11-21 13:01:09 +00:00
  • 97dc439cd4 ci: use token Jamie Peabody 2021-11-21 12:56:32 +00:00
  • 51189f2155 ci: use token Jamie Peabody 2021-11-21 12:52:50 +00:00
  • c8e0b8e88a ci: use token Jamie Peabody 2021-11-21 12:43:01 +00:00
  • 7732f9fab5 ci: update publish CI Jamie Peabody 2021-11-21 12:29:39 +00:00
  • e1763b3b9d ci: update publish CI Jamie Peabody 2021-11-21 12:27:48 +00:00
  • 0de9e87df8 ci: added standard-version Jamie Peabody 2021-11-21 12:22:50 +00:00
  • aa4d934cdd chore: removed bower.json Jamie Peabody 2021-11-21 12:21:11 +00:00
  • a92b408ce5 chore(ci): added git-conventional-commits Jamie Peabody 2021-11-21 11:00:15 +00:00
  • ca1df3e4d4 chore(docs): added contributing.md Jamie Peabody 2021-11-21 10:59:43 +00:00
  • addc610457 chore(ci): added workflows Jamie Peabody 2021-11-21 10:59:22 +00:00
  • 623a93b838 fix build 4.3.5 Jamie Peabody 2021-10-03 16:56:35 +01:00
  • 615e1afd97 patch(#139): fixes inline diff rendering issue with whitespace (#158) 4.3.4 Jamie Peabody 2021-10-03 16:49:44 +01:00
  • b9bc901dd2 patch(#152): fixes resize issue when using zoom 4.3.3 Jamie Peabody 2021-10-02 14:19:15 +01:00
  • b49c9ce40f Updated README.md Jamie Peabody 2021-09-30 08:05:07 +01:00
  • 712cbe8472 patch(#151): resets the current diff when setValue, clear, lhs, or rhs are called 4.3.2 Jamie Peabody 2021-06-23 21:57:38 +01:00
  • 8c541ba51c Updated changes and bumped version 4.3.1 Jamie Peabody 2021-05-19 07:57:54 +01:00
  • aa36977685 Updated README options : s/ignorews/ignoreaccents/ (#149) david weil 2021-05-19 03:53:47 -03:00
  • 4610ed3535 feat(#137): added 'summary' method 4.3.0 Jamie Peabody 2021-04-29 21:20:53 +01:00
  • 5deac86ebc Merge branch 'master' into fix-146 Jamie Peabody 2021-04-29 20:36:10 +01:00
  • d2c41d1ee1 patch(#142): added examples README.md 4.2.4 Jamie Peabody 2021-04-29 20:24:21 +01:00
  • 747bcacf2c patch(#147): fixes selected change style issue (#148) 4.2.3 Jamie Peabody 2021-04-29 20:09:10 +01:00
  • 3f78453640 Update mergely.js ControlBoy38 2021-04-28 23:02:36 +02:00
  • 3830cff687 fixes initial change issue 4.2.2 Jamie Peabody 2020-11-23 20:06:09 +00:00
  • 6c7e6ca3fa new myers-diff wip new-myers-diff Jamie Peabody 2020-11-23 19:24:26 +00:00
  • e38cd50037 bump 4.2.1 Jamie Peabody 2020-10-15 20:47:22 +01:00