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
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
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 |
|
Jamie Peabody
|
bec45a41a3
|
Fixed optimize
|
2016-05-24 22:45:26 +01:00 |
|
Sphinxxxx
|
ea1571e0aa
|
Fixes #41: "Scroll to diff" vs "Merge left/right"
|
2016-05-24 14:36:56 +02:00 |
|
Jamie Peabody
|
c4776b1359
|
Improved UX for reading; added gutter-click; Updated CM 5.11.0
3.4.0
|
2016-02-07 14:43:43 +00:00 |
|
wickedest
|
9875d58f15
|
Merge pull request #38 from scr/polymer
Fixes #37: Enable use within shadow-dom by searching beneath this.element.
|
2015-12-24 08:25:23 +00:00 |
|
Sheridan C Rawlins
|
ddfe77719e
|
Fixes #37: Enable use within shadow-dom by searching beneath this.element.
|
2015-12-23 23:51:05 -08:00 |
|
wickedest
|
24b75d26dd
|
Merge pull request #33 from nahakiole/fix-xss-issue
Fixing XSS security issue.
|
2015-11-10 08:49:04 +00:00 |
|
Jamie Peabody
|
21bd63961b
|
Fixed initialization problem where scroll to first change did not work
|
2015-11-09 09:21:38 +00:00 |
|
Nahakiole
|
36eb076648
|
Fixing XSS security issue.
|
2015-11-07 10:44:44 +01:00 |
|
Jamie Peabody
|
8883235daa
|
Updated to 3.3.10
3.3.10
|
2015-06-28 13:54:46 +01:00 |
|
Jamie Peabody
|
370375d35e
|
Updated to use friendly URL and fixes updateHistory params
|
2015-06-28 12:59:43 +01:00 |
|
Jamie Peabody
|
d525f8d05d
|
Updated to 3.3.10
|
2015-06-28 12:13:12 +01:00 |
|
Jamie Peabody
|
6ef8d2428c
|
Updated documentation for line_numbers and wrap_lines
|
2015-06-28 12:07:26 +01:00 |
|
Jamie Peabody
|
398720ed41
|
Updated to 3.3.10
|
2015-06-28 12:06:35 +01:00 |
|
Jamie Peabody
|
e25acfe3b5
|
Added query params settings to editor
|
2015-06-28 12:06:06 +01:00 |
|
Jamie Peabody
|
aa9c9eaad4
|
Updated bower to use tag
|
2015-04-21 21:34:15 +01:00 |
|
wickedest
|
3f0a3b1b4c
|
Undo test
3.3.9
|
2015-03-23 13:51:36 +00:00 |
|
wickedest
|
5fcf655f7f
|
Test
|
2015-03-23 13:50:55 +00:00 |
|
wickedest
|
deddd74007
|
Merge pull request #23 from weebygames/bower
Bower.json added
|
2015-03-17 19:27:20 +00:00 |
|
Chris Harding
|
c02a5e773e
|
Update dep versions
|
2015-03-16 21:19:09 -07:00 |
|
Chris Harding
|
13d8e80531
|
Added bower.json
|
2015-03-16 21:19:09 -07:00 |
|
wickedest
|
989afcd4bc
|
Merge pull request #19 from TheT0dd/resize-handler-cleanup
Removed resize handler on teardown
|
2015-01-27 20:24:07 +00:00 |
|
Christopher Varakliotis
|
0a069a061a
|
Removed resize handler on teardown
|
2015-01-26 17:31:20 +02:00 |
|
Jamie Peabody
|
3615267899
|
Updated to 3.3.9
|
2014-12-07 09:31:41 +00:00 |
|
Niklas Walter
|
548d8ce24c
|
Fixed scrollbar positions for synced scrolling
|
2014-12-04 11:39:49 +01:00 |
|
Jamie Peabody
|
9876a3c841
|
Changed import order.
|
2014-10-19 21:20:53 +01:00 |
|
Jamie Peabody
|
0df0ef694d
|
Fixes 3.3.8 merge function with new CM 4.6. Now uses uses strict.
|
2014-10-19 21:15:43 +01:00 |
|
Jamie Peabody
|
d501d5656a
|
Now uses CodeMirror 4.6
|
2014-10-19 14:11:28 +01:00 |
|
Jamie Peabody
|
3494afa89e
|
Added cm to debug
|
2014-10-19 14:09:53 +01:00 |
|
Jamie Peabody
|
64988c1341
|
Mergely 3.3.7
|
2014-08-17 16:13:57 +01:00 |
|