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
199 Commits 18 Branches 64 Tags
60d5aabd146cf9679d13b40fa9e340dc8392a92c
Commit Graph

199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jamie Peabody
4d5c6fa67c chore: removed unused dev-deps 2021-11-21 13:18:16 +00:00
Jamie Peabody
94bee71aea chore(release): 4.3.6 v4.3.6 2021-11-21 13:08:27 +00:00
Jamie Peabody
08e7b9735a ci: update tag latest 2021-11-21 13:06:51 +00:00
Jamie Peabody
26cb3f7220 ci: update tag latest 2021-11-21 13:01:09 +00:00
Jamie Peabody
97dc439cd4 ci: use token 2021-11-21 12:56:32 +00:00
Jamie Peabody
51189f2155 ci: use token 2021-11-21 12:52:50 +00:00
Jamie Peabody
c8e0b8e88a ci: use token 2021-11-21 12:43:01 +00:00
Jamie Peabody
7732f9fab5 ci: update publish CI 2021-11-21 12:29:39 +00:00
Jamie Peabody
e1763b3b9d ci: update publish CI 2021-11-21 12:27:48 +00:00
Jamie Peabody
0de9e87df8 ci: added standard-version 2021-11-21 12:22:50 +00:00
Jamie Peabody
aa4d934cdd chore: removed bower.json 2021-11-21 12:21:11 +00:00
Jamie Peabody
a92b408ce5 chore(ci): added git-conventional-commits 2021-11-21 11:00:15 +00:00
Jamie Peabody
ca1df3e4d4 chore(docs): added contributing.md 2021-11-21 10:59:43 +00:00
Jamie Peabody
addc610457 chore(ci): added workflows 2021-11-21 10:59:22 +00:00
Jamie Peabody
623a93b838 fix build 4.3.5 2021-10-03 16:56:35 +01:00
Jamie Peabody
615e1afd97 patch(#139): fixes inline diff rendering issue with whitespace (#158) 
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
4.3.4 		2021-10-03 16:49:44 +01:00
Jamie Peabody
b9bc901dd2 patch(#152): fixes resize issue when using zoom 4.3.3 2021-10-02 14:19:15 +01:00
Jamie Peabody
b49c9ce40f Updated README.md 
Fixed tgz installation instructions.
 2021-09-30 08:05:07 +01:00
Jamie Peabody
712cbe8472 patch(#151): resets the current diff when setValue, clear, lhs, or rhs are called 4.3.2 2021-06-23 21:57:38 +01:00
Jamie Peabody
8c541ba51c Updated changes and bumped version 4.3.1 2021-05-19 07:57:54 +01:00
david weil
aa36977685 Updated README options : s/ignorews/ignoreaccents/ (#149) 
Fixed option name in documentation
 2021-05-19 07:53:47 +01:00
Jamie Peabody
4610ed3535 feat(#137): added 'summary' method 4.3.0 2021-04-29 21:20:53 +01:00
Jamie Peabody
5deac86ebc Merge branch 'master' into fix-146 2021-04-29 20:36:10 +01:00
Jamie Peabody
d2c41d1ee1 patch(#142): added examples README.md 4.2.4 2021-04-29 20:24:21 +01:00
Jamie Peabody
747bcacf2c patch(#147): fixes selected change style issue (#148) 
Co-authored-by: Jamie Peabody <jpeabody@axway.com>
4.2.3 		2021-04-29 20:09:10 +01:00
ControlBoy38
3f78453640 Update mergely.js 2021-04-28 23:02:36 +02:00
Jamie Peabody
3830cff687 fixes initial change issue 4.2.2 2020-11-23 20:06:09 +00:00
Jamie Peabody
e38cd50037 bump 4.2.1 2020-10-15 20:47:22 +01:00
Jamie Peabody
85b02add89 chore: updated dependencies 2020-10-15 20:46:11 +01:00