Jamie Peabody
06189782de
patch( #104 ): fixes text selection for marked-up diff
2020-01-03 22:33:30 +00:00
Jamie Peabody
5947f1b313
4.0.13
2019-12-21 10:10:39 +00:00
Jamie Peabody
64960c770a
updated changes
2019-12-21 10:10:34 +00:00
Yiqiu Huang
73c1604981
Fix bug during refactor ( #127 )
2019-12-21 10:05:16 +00:00
Andrea
66c4ed650f
Update by adding version 4.0.13 ( #125 )
2019-10-07 13:14:21 +01:00
Andrea
7a123a7ed7
Updates to readme file. ( #124 )
...
* Update README.md
'providing **rich** API that enables you to...' - it's not clear what a rich API means so this doesn't seem helpful, but I couldn't fix it because don't know what you mean.
* Update README.md
Co-Authored-By: Waldir Pimenta <waldyrious@gmail.com >
* Update README.md
Co-Authored-By: Waldir Pimenta <waldyrious@gmail.com >
* Update README.md
Co-Authored-By: Waldir Pimenta <waldyrious@gmail.com >
* Update README.md
Co-Authored-By: Jamie Peabody <jamie.peabody@gmail.com >
* Update README.md
Co-Authored-By: Jamie Peabody <jamie.peabody@gmail.com >
* Update README.md
Co-Authored-By: Jamie Peabody <jamie.peabody@gmail.com >
2019-10-07 13:14:02 +01:00
Jamie Peabody
90ab7f3f5e
patch(issue #115 ): fixes merging deleted line(s) from lhs would munge rhs text ( #117 )
...
* patch(issue #115 ): fixes merging deleted line(s) from lhs would munge rhs text
* updated readme
2019-07-14 12:54:01 +01:00
Edgar Costa
788c5ad17b
Update README.md ( #113 )
2019-07-14 12:39:13 +01:00
Jamie Peabody
09cfb5328e
Merge branch 'johan456789-patch-1'
2019-02-11 21:02:36 +00:00
Jamie Peabody
43ae12269c
bump 4.0.11
2019-02-11 21:01:28 +00:00
johan456789
79608df3fb
fix rhs typo
2019-02-10 20:33:21 +08:00
Jamie Peabody
2474005eab
fixes 4.0.9 artifacts
2019-01-23 22:57:22 +00:00
Jamie Peabody
4498b8bbf5
revert debug code
2019-01-23 22:41:59 +00:00
Jamie Peabody
a2eaef8a13
patch(issue #106 ): fixes merge edge-case with add ( #107 )
...
* patch(issue #106 ): fixes merge edge-case with add
* bump
2019-01-23 22:39:04 +00:00
Jamie Peabody
d9f2edc1ad
chore: webpack upgrade ( #98 )
...
* upgraded to webpack 4.x
* updated webpack
2018-11-17 09:12:45 +00:00
Jamie Peabody
3d44470103
4.0.7
2018-08-06 13:01:19 +01:00
Jamie Peabody
2c8f6cd340
chore: updated docs
2018-08-06 13:01:13 +01:00
Jamie Peabody
6716096215
patch(issue #89 ): fixes missing merge buttons ( #91 )
...
* patch(fix-89): fixes missing merge buttons
* 4.0.6
2018-07-17 13:46:54 -07:00
Jamie Peabody
217674cd07
patch( fix #85 ): better XSS fix ( #87 )
...
* patch(fix #85 ): fixes xss vulnerability
* patch(fix #85 ): better XSS fix
2018-06-23 03:36:38 -07:00
Jamie Peabody
3812dd6026
patch( fix #85 ): fixes xss vulnerability ( #86 )
2018-06-21 14:04:36 -07:00
Jamie Peabody
ead86867c4
fix(issue-83): poor rendering performance
2018-06-17 13:38:52 +01:00
Jamie Peabody
557aa16e23
fix(issue-77): hides both sidebars when initializing with 'sidebar: false' ( #82 )
2018-05-26 12:55:17 -07:00
Jamie Peabody
2d0d7e9ce7
fix(issue-79): rewrote merge to use cm.replaceRange ( #80 )
2018-05-26 12:48:54 -07:00
Jamie Peabody
d7a7ddcd55
fix(issue-77): hides both sidebars when initializing with 'sidebar: false' ( #81 )
2018-05-26 12:48:15 -07:00
Jamie Peabody
157d763af6
fixes bad archive
2018-05-09 21:22:25 +01:00
Jamie Peabody
3ee7b77186
added test
2018-05-09 21:10:04 +01:00
Jamie Peabody
bde295febd
Build improvements ( #73 )
...
* removed editor and initial cleanup
* cleanup
* updated jquery
* tidy up
* moved src and build to lib
* tidy up and fixed webpack
* updated readme
* removed junk
* tidy up
* works with sample and editor
* removed editor_width and editor_height
* auto width and height
* added license feature
* not doing dist
* fixed typo
* added searchcursor
* fixed typo
* doc updates
* improved comment
* updated init for cm settings
* fixed jquery/cm includes
* documentation updates
* updated changes doc
* fixed cmsettings
* updated examples
2017-12-18 21:53:03 +00:00
Jamie Peabody
cd407f9e55
updated bower
2017-11-04 11:11:39 +00:00
Jamie Peabody
eb74874266
Update for 3.4.5
2017-11-04 10:57:31 +00:00
Jamie Peabody
22873b8f62
Merge pull request #70 from wickedest/issue-69
...
issue-69: invalidates changes before editor content is replaced
2017-11-04 10:53:32 +00:00
Jamie Peabody
2bc1229fb9
issue-69: invalidates current set of changes before editor content is replaced
2017-11-04 10:49:48 +00:00
Jamie Peabody
4e5422cf3d
Merge pull request #65 from Ecksters/patch-1
...
Fix closing DIV tag on editor div example
2017-09-03 17:10:44 +01:00
Daniel Eck
2d13f34223
Fix closing DIV tag on editor div example
...
Example code had two opening div tags previously.
2017-09-03 06:18:40 -06:00
Jamie Peabody
c8412d4387
Merge branch 'zhudock-ignorecase-wrapdiff'
2017-02-28 22:34:12 +00:00
Jamie Peabody
f439f257b3
Merge pull request #56 from zhudock/master
...
Add ignorecase option for #39 , wrapdiff option for #57
2017-02-28 22:33:48 +00:00
Jamie Peabody
da41c28fdb
Added ignorecase to editor
2017-02-28 22:32:46 +00:00
zhudock
d761609e54
Add wrapdiff option for scrollToDiff next\prev to wrap to start\end of text. resolves #57
2017-02-28 15:55:52 -05:00
zhudock
6b8c92a8db
Add ignorecase option for case insensitive search #39
2017-02-28 12:31:24 -05:00
Jamie Peabody
1279be2745
Fixed no-conflict jQuery
2016-09-07 19:06:47 +01:00
Jamie Peabody
627b113802
Rewrote update editor options
2016-08-13 22:58:22 +01:00
Jamie Peabody
018391421b
Updated to fix wonky query string
2016-08-13 16:49:02 +01:00
Jamie Peabody
14b9cb8b2e
Made Mergely icon clicable
2016-08-13 16:41:25 +01:00
Jamie Peabody
154c6360e0
Fixes wonky query string
2016-08-13 16:40:15 +01:00
Jamie Peabody
dff2d69783
Updated for 3.4.2
2016-07-25 21:44:19 +01:00
Jamie Peabody
f371fb9085
Current selected diff can now be styled from css.
2016-07-25 20:36:06 +01:00
Jamie Peabody
266e0c7818
Updated 3.4.1
2016-05-25 22:34:26 +01:00
Jamie Peabody
4bbc6c597f
Fix for merge-button and optimize
2016-05-25 22:22:04 +01:00
Jamie Peabody
c3093d7b8f
Merge branch 'Sphinxxxx-Sphinxxxx-patch-1'
2016-05-24 23:10:01 +01:00
Jamie Peabody
5445d5a703
Fixes merge and gutter-click
2016-05-24 23:09:26 +01:00
Jamie Peabody
d8f91e740d
Merge branch 'Sphinxxxx-patch-1' of https://github.com/Sphinxxxx/Mergely into Sphinxxxx-Sphinxxxx-patch-1
2016-05-24 22:53:31 +01:00
