Mergely

lxm_front/Mergely

Fork 1

mirror of https://github.com/wickedest/Mergely.git synced 2026-11-01 23:16:18 +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-222

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

#225

#227

#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

v5.4.1

v5.4.2

v5.4.3

v5.4.4

v5.4.5

v5.4.6

v5.4.7

5a0cd15ddd feat(#132): added option to ignore accented characters (#136) 4.2.0 1793579380836047295/tmp_refs/tags/4.2.0 1793569536567609338/tmp_refs/tags/4.2.0 1793555729107963619/tmp_refs/tags/4.2.0 1793555286207845557/tmp_refs/tags/4.2.0 Jamie Peabody 2020-10-15 15:13:41 +01:00
577a324d01 release 4.1.2 4.1.2 1793579338551775810/tmp_refs/tags/4.1.2 1793555709400260678/tmp_refs/tags/4.1.2 1793554226016569835/tmp_refs/tags/4.1.2 1793552638144625882/tmp_refs/tags/4.1.2 1793551363580852841/tmp_refs/tags/4.1.2 Jamie Peabody 2020-10-15 14:44:16 +01:00
e38468b2c2 patch(#134): fixes links in readme (#135) Jamie Peabody 2020-10-15 14:39:25 +01:00
bd659adcfd patch(#95): fixes cursor focus on init (#133) 4.1.1 1793582123322805464/tmp_refs/tags/4.1.1 Jamie Peabody 2020-10-15 14:28:46 +01:00
ddeb16ef8b added 'updated' event and fixed 'scrollTo' Jamie Peabody 2020-07-01 22:06:42 +01:00
fd09b9761d patch(#104): fixes rendering beyond change constraint 4.0.16 1793563401305238885/tmp_refs/tags/4.0.16 1793558105440870322/tmp_refs/tags/4.0.16 1793549775935030059/tmp_refs/tags/4.0.16 Jamie Peabody 2020-06-14 20:32:06 +01:00
b3f417e9af patch(#104): fixes rendering beyond change constraint Jamie Peabody 2020-06-14 20:31:08 +01:00
827c9ed8ef removed unnecessary addon Jamie Peabody 2020-01-03 23:10:02 +00:00
06189782de patch(#104): fixes text selection for marked-up diff 4.0.14 1793566849356156600/tmp_refs/tags/4.0.14 1793565761715207323/tmp_refs/tags/4.0.14 1793563477226537307/tmp_refs/tags/4.0.14 1793549779536078188/tmp_refs/tags/4.0.14 Jamie Peabody 2020-01-03 22:33:30 +00:00
5947f1b313 4.0.13 v4.0.13 4.0.13 1793572909635974779/tmp_refs/tags/4.0.13 1793572285074042569/tmp_refs/tags/4.0.13 1793565746352994418/tmp_refs/tags/4.0.13 1793563220250048200/tmp_refs/tags/4.0.13 1793558714696624114/tmp_refs/tags/v4.0.13 1793553148862672344/tmp_refs/tags/v4.0.13 1793552582546421742/tmp_refs/tags/4.0.13 1793547832603779256/tmp_refs/tags/4.0.13 1793547295579852656/tmp_refs/tags/v4.0.13 Jamie Peabody 2019-12-21 10:10:39 +00:00
64960c770a updated changes Jamie Peabody 2019-12-21 10:10:34 +00:00
73c1604981 Fix bug during refactor (#127) Yiqiu Huang 2019-12-21 04:05:16 -06:00
66c4ed650f Update by adding version 4.0.13 (#125) Andrea 2019-10-07 13:14:21 +01:00
7a123a7ed7 Updates to readme file. (#124) Andrea 2019-10-07 13:14:02 +01:00
90ab7f3f5e patch(issue #115): fixes merging deleted line(s) from lhs would munge rhs text (#117) Jamie Peabody 2019-07-14 12:54:01 +01:00
788c5ad17b Update README.md (#113) Edgar Costa 2019-07-14 12:39:13 +01:00
09cfb5328e Merge branch 'johan456789-patch-1' Jamie Peabody 2019-02-11 21:02:36 +00:00
43ae12269c bump 4.0.11 Jamie Peabody 2019-02-11 21:01:28 +00:00
79608df3fb fix rhs typo johan456789 2019-02-10 20:33:21 +08:00
2474005eab fixes 4.0.9 artifacts Jamie Peabody 2019-01-23 22:57:22 +00:00
4498b8bbf5 revert debug code Jamie Peabody 2019-01-23 22:41:59 +00:00
a2eaef8a13 patch(issue #106): fixes merge edge-case with add (#107) Jamie Peabody 2019-01-23 22:39:04 +00:00
d9f2edc1ad chore: webpack upgrade (#98) 4.0.8 1793572214251436194/tmp_refs/tags/4.0.8 1793567252841006847/tmp_refs/tags/4.0.8 1793565746534735490/tmp_refs/tags/4.0.8 1793558065978286501/tmp_refs/tags/4.0.8 1793555193546052983/tmp_refs/tags/4.0.8 1793555158424320539/tmp_refs/tags/4.0.8 1793551757911617686/tmp_refs/tags/4.0.8 Jamie Peabody 2018-11-17 09:12:45 +00:00
c54c2203b3 updated webpack 1793583174931044099/webpack-upgrade 1793583174931044099/tmp_refs/heads/webpack-upgrade 1793567219706041357/webpack-upgrade 1793567219706041357/tmp_refs/heads/webpack-upgrade webpack-upgrade Jamie Peabody 2018-11-17 08:50:05 +00:00
d31879273b upgraded to webpack 4.x Jamie Peabody 2018-10-17 22:43:07 +01:00
3d44470103 4.0.7 v4.0.7 1793584485615048608/tmp_refs/tags/v4.0.7 1793580874232871697/tmp_refs/tags/v4.0.7 Jamie Peabody 2018-08-06 13:01:19 +01:00
2c8f6cd340 chore: updated docs Jamie Peabody 2018-08-06 13:01:13 +01:00
6716096215 patch(issue #89): fixes missing merge buttons (#91) Jamie Peabody 2018-07-17 13:46:54 -07:00
b717abdd1e 4.0.6 4.0.6 1793578447305849327/tmp_refs/tags/4.0.6 1793561537512479075/tmp_refs/tags/4.0.6 1793561261367021193/tmp_refs/tags/4.0.6 1793557656037684504/tmp_refs/tags/4.0.6 1793552496497023457/tmp_refs/tags/4.0.6 1793551159662400760/tmp_refs/tags/4.0.6 Jamie Peabody 2018-07-17 21:41:59 +01:00
d2b38249ae patch(fix-89): fixes missing merge buttons Jamie Peabody 2018-07-17 21:41:07 +01:00
217674cd07 patch(fix #85): better XSS fix (#87) 4.0.5 1793578421842699186/tmp_refs/tags/4.0.5 1793552517692962373/tmp_refs/tags/4.0.5 Jamie Peabody 2018-06-23 03:36:38 -07:00
3812dd6026 patch(fix #85): fixes xss vulnerability (#86) 4.0.4 1793581269207376197/tmp_refs/tags/4.0.4 1793572716313298223/tmp_refs/tags/4.0.4 1793572608396719111/tmp_refs/tags/4.0.4 1793572582654381885/tmp_refs/tags/4.0.4 1793572547685274146/tmp_refs/tags/4.0.4 1793566537055101069/tmp_refs/tags/4.0.4 1793552497444752602/tmp_refs/tags/4.0.4 Jamie Peabody 2018-06-21 14:04:36 -07:00
ead86867c4 fix(issue-83): poor rendering performance 4.0.3 1793578276746863056/tmp_refs/tags/4.0.3 1793567436304885426/tmp_refs/tags/4.0.3 1793567377706033444/tmp_refs/tags/4.0.3 1793560847701496202/tmp_refs/tags/4.0.3 Jamie Peabody 2018-06-17 13:38:52 +01:00
557aa16e23 fix(issue-77): hides both sidebars when initializing with 'sidebar: false' (#82) 4.0.2 1793574882000079703/tmp_refs/tags/4.0.2 1793571718637343485/tmp_refs/tags/4.0.2 1793568788005665154/tmp_refs/tags/4.0.2 1793552904618794556/tmp_refs/tags/4.0.2 1793546657904907596/tmp_refs/tags/4.0.2 Jamie Peabody 2018-05-26 12:55:17 -07:00
2d0d7e9ce7 fix(issue-79): rewrote merge to use cm.replaceRange (#80) Jamie Peabody 2018-05-26 12:48:54 -07:00
d7a7ddcd55 fix(issue-77): hides both sidebars when initializing with 'sidebar: false' (#81) Jamie Peabody 2018-05-26 12:48:15 -07:00
157d763af6 fixes bad archive 4.0.1 1793582189497100981/tmp_refs/tags/4.0.1 1793579645742589538/tmp_refs/tags/4.0.1 1793567149258072999/tmp_refs/tags/4.0.1 1793566770241765881/tmp_refs/tags/4.0.1 1793554870246285688/tmp_refs/tags/4.0.1 Jamie Peabody 2018-05-09 21:22:25 +01:00
3ee7b77186 added test Jamie Peabody 2018-05-09 21:10:04 +01:00
bde295febd Build improvements (#73) Jamie Peabody 2017-12-18 21:53:03 +00:00
cd407f9e55 updated bower Jamie Peabody 2017-11-04 11:11:39 +00:00
eb74874266 Update for 3.4.5 3.4.5 1793566364627514543/tmp_refs/tags/3.4.5 1793565713569159965/tmp_refs/tags/3.4.5 1793558436227135909/tmp_refs/tags/3.4.5 1793554535681636747/tmp_refs/tags/3.4.5 Jamie Peabody 2017-11-04 10:55:48 +00:00
22873b8f62 Merge pull request #70 from wickedest/issue-69 Jamie Peabody 2017-11-04 10:53:32 +00:00
2bc1229fb9 issue-69: invalidates current set of changes before editor content is replaced Jamie Peabody 2017-11-04 10:49:48 +00:00
4e5422cf3d Merge pull request #65 from Ecksters/patch-1 Jamie Peabody 2017-09-03 17:10:44 +01:00
2d13f34223 Fix closing DIV tag on editor div example Daniel Eck 2017-09-03 06:18:40 -06:00
c8412d4387 Merge branch 'zhudock-ignorecase-wrapdiff' Jamie Peabody 2017-02-28 22:34:12 +00:00
f439f257b3 Merge pull request #56 from zhudock/master Jamie Peabody 2017-02-28 22:33:48 +00:00
da41c28fdb Added ignorecase to editor Jamie Peabody 2017-02-28 22:32:46 +00:00
d761609e54 Add wrapdiff option for scrollToDiff next\prev to wrap to start\end of text. resolves #57 zhudock 2017-02-28 15:55:52 -05:00
6b8c92a8db Add ignorecase option for case insensitive search #39 zhudock 2017-02-28 12:31:24 -05:00
1279be2745 Fixed no-conflict jQuery Jamie Peabody 2016-09-07 19:06:47 +01:00
627b113802 Rewrote update editor options Jamie Peabody 2016-08-13 22:58:22 +01:00
018391421b Updated to fix wonky query string Jamie Peabody 2016-08-13 16:49:02 +01:00
14b9cb8b2e Made Mergely icon clicable Jamie Peabody 2016-08-13 16:41:25 +01:00
154c6360e0 Fixes wonky query string Jamie Peabody 2016-08-13 16:40:15 +01:00
dff2d69783 Updated for 3.4.2 3.4.2 1793584377442805559/tmp_refs/tags/3.4.2 1793581809609485534/tmp_refs/tags/3.4.2 1793580814620644253/tmp_refs/tags/3.4.2 1793559486751956395/tmp_refs/tags/3.4.2 1793550186197704128/tmp_refs/tags/3.4.2 Jamie Peabody 2016-07-25 21:44:19 +01:00
f371fb9085 Current selected diff can now be styled from css. Jamie Peabody 2016-07-25 20:36:06 +01:00
266e0c7818 Updated 3.4.1 3.4.1 1793579871846346912/tmp_refs/tags/3.4.1 1793565615947822144/tmp_refs/tags/3.4.1 1793562442907381193/tmp_refs/tags/3.4.1 1793559291870474189/tmp_refs/tags/3.4.1 1793549893404858994/tmp_refs/tags/3.4.1 Jamie Peabody 2016-05-25 22:34:26 +01:00
4bbc6c597f Fix for merge-button and optimize Jamie Peabody 2016-05-25 22:22:04 +01:00
c3093d7b8f Merge branch 'Sphinxxxx-Sphinxxxx-patch-1' Jamie Peabody 2016-05-24 23:10:01 +01:00
5445d5a703 Fixes merge and gutter-click Jamie Peabody 2016-05-24 23:09:26 +01:00
d8f91e740d Merge branch 'Sphinxxxx-patch-1' of https://github.com/Sphinxxxx/Mergely into Sphinxxxx-Sphinxxxx-patch-1 Jamie Peabody 2016-05-24 22:53:31 +01:00
bec45a41a3 Fixed optimize Jamie Peabody 2016-05-24 22:45:26 +01:00
ea1571e0aa Fixes #41: "Scroll to diff" vs "Merge left/right" Sphinxxxx 2016-05-24 14:36:56 +02:00
c4776b1359 Improved UX for reading; added gutter-click; Updated CM 5.11.0 3.4.0 1793584451382714891/tmp_refs/tags/3.4.0 Jamie Peabody 2016-02-07 14:43:43 +00:00
9875d58f15 Merge pull request #38 from scr/polymer wickedest 2015-12-24 08:25:23 +00:00
ddfe77719e Fixes #37: Enable use within shadow-dom by searching beneath this.element. Sheridan C Rawlins 2015-12-23 23:47:10 -08:00
24b75d26dd Merge pull request #33 from nahakiole/fix-xss-issue wickedest 2015-11-10 08:49:04 +00:00
21bd63961b Fixed initialization problem where scroll to first change did not work Jamie Peabody 2015-11-09 09:21:38 +00:00
36eb076648 Fixing XSS security issue. Nahakiole 2015-11-07 10:44:44 +01:00
8883235daa Updated to 3.3.10 3.3.10 1793567193463620201/tmp_refs/tags/3.3.10 1793562312883210331/tmp_refs/tags/3.3.10 1793562259875048288/tmp_refs/tags/3.3.10 Jamie Peabody 2015-06-28 13:54:46 +01:00
370375d35e Updated to use friendly URL and fixes updateHistory params Jamie Peabody 2015-06-28 12:59:43 +01:00
d525f8d05d Updated to 3.3.10 Jamie Peabody 2015-06-28 12:13:12 +01:00
6ef8d2428c Updated documentation for line_numbers and wrap_lines Jamie Peabody 2015-06-28 12:07:26 +01:00
398720ed41 Updated to 3.3.10 Jamie Peabody 2015-06-28 12:06:35 +01:00
e25acfe3b5 Added query params settings to editor Jamie Peabody 2015-06-28 12:06:06 +01:00
aa9c9eaad4 Updated bower to use tag Jamie Peabody 2015-04-21 21:34:15 +01:00
3f0a3b1b4c Undo test 3.3.9 1793578610181090448/tmp_refs/tags/3.3.9 1793567177545035758/tmp_refs/tags/3.3.9 1793567122573611200/tmp_refs/tags/3.3.9 1793552716333675753/tmp_refs/tags/3.3.9 wickedest 2015-03-23 13:51:36 +00:00
5fcf655f7f Test wickedest 2015-03-23 13:50:55 +00:00
deddd74007 Merge pull request #23 from weebygames/bower wickedest 2015-03-17 19:27:20 +00:00
c02a5e773e Update dep versions Chris Harding 2015-03-16 21:15:13 -07:00
13d8e80531 Added bower.json Chris Harding 2015-03-16 20:05:09 -07:00
989afcd4bc Merge pull request #19 from TheT0dd/resize-handler-cleanup wickedest 2015-01-27 20:24:07 +00:00
0a069a061a Removed resize handler on teardown Christopher Varakliotis 2015-01-26 17:31:20 +02:00
3615267899 Updated to 3.3.9 Jamie Peabody 2014-12-07 09:31:41 +00:00
548d8ce24c Fixed scrollbar positions for synced scrolling Niklas Walter 2014-12-03 16:15:10 +01:00
9876a3c841 Changed import order. Jamie Peabody 2014-10-19 21:20:53 +01:00
0df0ef694d Fixes 3.3.8 merge function with new CM 4.6. Now uses uses strict. Jamie Peabody 2014-10-19 21:15:43 +01:00
d501d5656a Now uses CodeMirror 4.6 Jamie Peabody 2014-10-19 14:11:28 +01:00
3494afa89e Added cm to debug Jamie Peabody 2014-10-19 14:09:53 +01:00
64988c1341 Mergely 3.3.7 Jamie Peabody 2014-08-17 16:13:57 +01:00
e54a7941f4 Fixed indent. Jamie Peabody 2014-08-17 15:48:56 +01:00
cd38c10ac9 Use release version. Jamie Peabody 2014-08-17 15:46:40 +01:00
1b96990b1f Fixed typo. Jamie Peabody 2014-08-17 15:39:30 +01:00
e9e0a9d41b Merge branch 'master' of https://github.com/kljh/Mergely Jamie Peabody 2014-08-17 15:35:16 +01:00
456da5f2c8 Added 'debug' option to editor to make it easier to switch. Jamie Peabody 2014-08-17 12:11:03 +01:00
3c4fe71683 Editors cursor are now moved to currently selected difference. Kljh 2014-08-17 09:14:55 +01:00
4f8c91c28a Morning clean up. Kljh 2014-08-17 08:25:16 +01:00
572eb08aaa Morning clean up. Kljh 2014-08-17 08:11:13 +01:00
4128796bfa Played with ajax.html. It's probably no longer simple enough as an example. On the other hand it has a nice drag and drop feature. I couldn't make the "ignorews" checkbos work. Kljh 2014-08-17 00:17:39 +01:00

1 2 3 4 5