Mergely

lxm_front/Mergely

Fork 1

mirror of https://github.com/wickedest/Mergely.git synced 2026-02-02 09:38:00 +08:00

Commit Graph

Select branches

Hide Pull Requests

bumps

chore-deps

encoder-wip

feat-diacriticals

feat-permissive-height

fix-183

fix-207

fix-209

fix-non-letter-markup

fix-release

fix-trace

issue-220

master

modernize

new-myers-diff

v5.0

webpack-upgrade

#10

#10

#100

#107

#108

#108

#109

#109

#110

#110

#111

#111

#112

#113

#117

#12

#124

#125

#127

#133

#135

#136

#143

#144

#145

#146

#148

#149

#15

#158

#160

#162

#168

#17

#170

#171

#173

#174

#175

#176

#177

#18

#180

#181

#186

#187

#19

#190

#191

#192

#194

#195

#196

#197

#198

#199

#200

#203

#205

#206

#208

#210

#211

#212

#213

#214

#218

#22

#221

#23

#29

#3

#33

#38

#4

#40

#42

#56

#65

#70

#73

#80

#81

#82

#86

#87

#91

#98

#99

3.3.10

3.3.9

3.4.0

3.4.1

3.4.2

3.4.5

4.0.1

4.0.13

4.0.14

4.0.16

4.0.2

4.0.3

4.0.4

4.0.5

4.0.6

4.0.8

4.1.1

4.1.2

4.2.0

4.2.1

4.2.2

4.2.3

4.2.4

4.3.0

4.3.1

4.3.2

4.3.3

4.3.4

4.3.5

v4.0.13

v4.0.7

v4.3.6

v4.3.7

v4.3.8

v4.3.9

v5.0.0

v5.0.0-alpha.1

v5.0.0-alpha.2

v5.0.0-alpha.3

v5.0.1

v5.0.2

v5.0.3

v5.0.4

v5.1.0

v5.1.1

v5.1.2

v5.1.3

v5.1.4

v5.2.0

v5.3.0

v5.3.1

v5.3.2

v5.3.3

v5.3.4

v5.3.5

v5.3.6

v5.4.0

aa496078fd chore(release): 5.4.0 [skip ci] master v5.4.0 semantic-release-bot 2025-11-15 15:43:30 +00:00
d6d8d06acc feat(#220): Exposes Mergely's instance of CodeMirror as Mergely.CodeMirror (#221) Jamie Peabody 2025-11-15 15:42:29 +00:00
9dcbd0b910 feat(#220): Exposes Mergely's instance of CodeMirror as Mergely.CodeMirror issue-220 Jamie Peabody 2025-11-15 15:33:30 +00:00
b9aed167f3 Fix documentation for CM modes in README.md (#218) Moritz 2025-01-17 18:10:33 +01:00
da71745c38 chore(release): 5.3.6 [skip ci] v5.3.6 semantic-release-bot 2024-10-11 20:56:16 +00:00
350e5af2e8 fix(#207): Updated documentation for search method. (#214) Jamie Peabody 2024-10-11 21:52:46 +01:00
9a3277de59 fix: Updated documentation for search method fix-207 Jamie Peabody 2024-10-11 21:47:52 +01:00
498746a831 chore(release): 5.3.5 [skip ci] v5.3.5 semantic-release-bot 2024-10-11 19:58:19 +00:00
83df02d967 fix: bump dependencies (#213) Jamie Peabody 2024-10-11 20:57:24 +01:00
014a482984 fix: bump dependencies bumps Jamie Peabody 2024-10-11 20:55:18 +01:00
51799f7dc1 chore(release): 5.3.4 [skip ci] v5.3.4 semantic-release-bot 2024-10-11 19:52:13 +00:00
c36d2a7ba9 Revert "build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203)" Jamie Peabody 2024-10-11 20:51:13 +01:00
b79ac30d4e chore(release): 5.3.3 [skip ci] v5.3.3 semantic-release-bot 2024-10-11 19:49:03 +00:00
4cd8897c6b fix(#209): Fixes issue with options not being preserved when individually set. (#211) Jamie Peabody 2024-10-11 20:47:58 +01:00
049a2719dc fix(#209): Fixes issue with options not being preserved when individually set. fix-209 Jamie Peabody 2024-10-11 20:45:08 +01:00
86593de7d0 build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203) dependabot[bot] 2024-10-11 20:42:06 +01:00
78f68bf904 chore(release): 5.3.2 [skip ci] v5.3.2 semantic-release-bot 2024-07-31 18:45:48 +00:00
c7b0fd03b0 fix: Removed debug code Jamie Peabody 2024-07-31 19:44:47 +01:00
8d56792b37 build(deps-dev): bump braces from 3.0.2 to 3.0.3 (#198) dependabot[bot] 2024-06-19 19:24:23 +01:00
8c1c95284e build(deps): bump ws, engine.io and socket.io-adapter (#200) dependabot[bot] 2024-06-19 19:21:48 +01:00
0bdbfe1078 chore(release): 5.3.1 [skip ci] v5.3.1 semantic-release-bot 2024-06-19 18:19:06 +00:00
c40672c458 fix: Fixed a regression rendering inline markup for numbers, punctuation, and symbols (#199) Jamie Peabody 2024-06-19 19:18:05 +01:00
592725282c fix: Fixed a regression rendering inline markup for numbers, punctuation, and symbols fix-non-letter-markup Jamie Peabody 2024-06-19 19:15:54 +01:00
64a20ee5b1 chore(release): 5.3.0 [skip ci] v5.3.0 semantic-release-bot 2024-06-16 19:37:09 +00:00
a469a65101 feat: Supports unicode diacritical marks when rendering line diff (fixes #169) (#197) Jamie Peabody 2024-06-16 20:36:17 +01:00
5f3034fa7f feat: Supports unicode diacritical marks when rendering line diff (fixes #169) feat-diacriticals Jamie Peabody 2024-06-16 20:19:11 +01:00
65c71be17e chore(release): 5.2.0 [skip ci] v5.2.0 semantic-release-bot 2024-06-09 21:25:57 +00:00
b9e3641c85 feat: Allows height to be not explicit height, e.g. 'inherit' or '100%' (#196) Jamie Peabody 2024-06-09 22:25:04 +01:00
116b014c55 feat: Allows height to be not explicit height, e.g. 'inherit' or '100%' feat-permissive-height Jamie Peabody 2024-06-09 22:19:10 +01:00
6ea7450536 chore(release): 5.1.4 [skip ci] v5.1.4 semantic-release-bot 2024-05-17 19:11:40 +00:00
692d01f165 fix: removed accidental change that enabled code display modes (e.g. javascript, python, html) Jamie Peabody 2024-05-17 20:10:40 +01:00
84c27739ec chore(release): 5.1.3 [skip ci] v5.1.3 semantic-release-bot 2024-05-06 08:39:04 +00:00
c4c6e8abd8 fix(chore): updated deps (#195) Jamie Peabody 2024-05-06 09:37:37 +01:00
d1bad4868f fix(chore): updated deps chore-deps Jamie Peabody 2024-05-06 09:33:10 +01:00
bc54fce1c5 fix(chore): updated deps Jamie Peabody 2024-05-06 09:03:07 +01:00
e7357e4ff1 build(deps-dev): bump express from 4.18.2 to 4.19.2 (#192) dependabot[bot] 2024-05-06 08:46:36 +01:00
a673d33e89 build(deps-dev): bump webpack-dev-middleware from 5.3.3 to 5.3.4 (#191) dependabot[bot] 2024-05-06 08:45:26 +01:00
4818e05d2d build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.6 (#190) dependabot[bot] 2024-05-06 08:43:52 +01:00
07f32b9a7d chore(release): 5.1.2 [skip ci] v5.1.2 semantic-release-bot 2024-05-06 07:42:38 +00:00
60d18f8d5c fix: trace only when debug enabled (#194) Jamie Peabody 2024-05-06 08:41:30 +01:00
3f4e89ae0c fix: trace only when debug enabled fix-trace Jamie Peabody 2024-05-06 08:38:12 +01:00
4bd19c6e2e chore(release): 5.1.1 [skip ci] v5.1.1 semantic-release-bot 2024-03-11 19:46:42 +00:00
02e383d94d fix(#183): fixes undefined 'k' due to scoped 'let' Jamie Peabody 2024-03-11 19:45:47 +00:00
e1db3c4f9e fix: fixes undefined 'k' due to scoped 'let' fix-183 Jamie Peabody 2024-03-11 19:43:28 +00:00
b09671febe build(deps-dev): bump @babel/traverse from 7.21.4 to 7.23.2 (#181) dependabot[bot] 2024-03-11 19:40:31 +00:00
1702bd6e0a build(deps-dev): bump postcss from 8.4.21 to 8.4.31 (#180) dependabot[bot] 2024-03-11 19:40:09 +00:00
5e4dfc9e78 chore(release): 5.1.0 [skip ci] v5.1.0 semantic-release-bot 2023-08-27 13:04:50 +00:00
827487a598 feat: support CM modes: go, javascript, htmlmixed, markdown, python Jamie Peabody 2023-08-27 14:03:41 +01:00
bc46617d5e chore(release): 5.0.4 [skip ci] v5.0.4 semantic-release-bot 2023-08-27 12:17:49 +00:00
dec1e9509d fix: updated CDN example Jamie Peabody 2023-08-27 13:16:01 +01:00
0733f3a6c6 chore(release): 5.0.3 [skip ci] v5.0.3 semantic-release-bot 2023-08-27 10:55:22 +00:00
254adf15ab fix: Updated docs with CDN example Jamie Peabody 2023-08-27 11:53:55 +01:00
a07073a13c docs: Updated docs with CDN example Jamie Peabody 2023-08-27 11:50:00 +01:00
3facfec6b7 build(deps): bump socket.io-parser from 4.2.2 to 4.2.3 (#177) dependabot[bot] 2023-08-27 11:41:03 +01:00
2b561c1856 chore(doc): Update CDN example Jamie Peabody 2023-08-27 11:38:38 +01:00
8c2d68074c feat: new encoder (wip) encoder-wip Jamie Peabody 2023-08-27 11:16:37 +01:00
cd09815b7d build(deps): bump engine.io from 6.4.1 to 6.4.2 (#176) dependabot[bot] 2023-05-04 22:42:42 +01:00
cb46821103 chore(release): 5.0.2 [skip ci] v5.0.2 semantic-release-bot 2023-04-24 07:51:30 +00:00
7b2040c6ad fix(scroll): fixed issue where first rhs scroll was unlinked Jamie Peabody 2023-04-24 08:50:14 +01:00
df7d23244b chore: fix changelog Jamie Peabody 2023-04-23 21:50:20 +01:00
a6751b5957 chore(release): 5.0.1 [skip ci] v5.0.1 semantic-release-bot 2023-04-23 20:44:06 +00:00
a8b497bc9b fix: update release Jamie Peabody 2023-04-23 21:42:58 +01:00
166446c945 chore(ci): fixed branch name Jamie Peabody 2023-04-23 17:01:29 +01:00
caff902c99 chore(ci): fix release (#175) Jamie Peabody 2023-04-23 16:54:56 +01:00
9628d41bd2 chore(ci): fix release fix-release Jamie Peabody 2023-04-23 16:49:27 +01:00
37fedd05c8 v5.0 (#174) v5.0.0 Jamie Peabody 2023-04-23 16:29:59 +01:00
610ae902a0 Merge branch 'master' into alpha v5.0.0-alpha.3 Jamie Peabody 2023-04-23 16:28:04 +01:00
44594a0442 chore: debug Jamie Peabody 2023-04-23 16:21:16 +01:00
10f477a450 chore: fix css Jamie Peabody 2023-04-23 16:02:25 +01:00
ce407dac3f fix: fixes firefox scroll-linked effect issue v5.0.0-alpha.2 Jamie Peabody 2023-04-23 11:30:19 +01:00
a01cadbf64 fix: fixes firefox scroll-linked effect issue Jamie Peabody 2023-04-23 10:29:16 +01:00
fbe670c92a chore(ci): ignore alpha, beta, next on branch Jamie Peabody 2023-04-23 10:28:48 +01:00
88f21e2bc7 chore(ci): package-lock.json v5.0.0-alpha.1 v5.0 Jamie Peabody 2023-04-22 16:01:38 +01:00
4160ab4f6e chore(ci): test Jamie Peabody 2023-04-22 15:59:44 +01:00
16f1d2016d chore(ci): alpha, beta, next branches Jamie Peabody 2023-04-22 15:57:48 +01:00
347a3f56ff chore(ci): updated webpack Jamie Peabody 2023-04-22 14:41:21 +01:00
88d4a62a04 chore: updated examples Jamie Peabody 2023-04-22 14:40:58 +01:00
b3e7b48d11 feat: dark mode Jamie Peabody 2023-04-22 14:13:30 +01:00
fcea4efe2f chore: tweaked no-start/end styles Jamie Peabody 2023-04-22 13:44:33 +01:00
080b8fd7b5 feat: v5 Jamie Peabody 2023-04-22 12:41:12 +01:00
8794bfb055 fixed diff worker modernize Jamie Peabody 2023-04-04 16:55:52 +01:00
6643f48b14 merged master Jamie Peabody 2023-04-02 15:29:25 +01:00
481390f732 use node 16 Jamie Peabody 2023-04-02 15:17:48 +01:00
534bedf355 fixed tests init and sidebars issue Jamie Peabody 2023-04-02 15:16:33 +01:00
3b300cea85 chore: fixes mostly done 1770235276280496807/tmp_refs/heads/modernize 1770235276280496807/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 v4.3.9 1770235272437933219/tmp_refs/heads/master 1770235272437933219/master 1770235272437933219/HEAD 1770235221188023566/tmp_refs/heads/master 1770235221188023566/master 1770235221188023566/HEAD 1770235140897288107/tmp_refs/heads/master 1770235140897288107/master 1770235140897288107/HEAD 1770230775687257648/tmp_refs/tags/v4.3.9 1770229878222489015/tmp_refs/heads/master 1770229878222489015/master 1770229878222489015/HEAD 1770228814473000375/tmp_refs/tags/v4.3.9 1770224788571136534/tmp_refs/tags/v4.3.9 1770216110826698517/tmp_refs/tags/v4.3.9 1770209937104538283/tmp_refs/tags/v4.3.9 1770209915845002529/tmp_refs/tags/v4.3.9 1770209653369905606/tmp_refs/tags/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

1 2 3 4 5