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
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
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
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
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
Jamie Peabody
e54a7941f4
Fixed indent.
2014-08-17 15:48:56 +01:00
Jamie Peabody
cd38c10ac9
Use release version.
2014-08-17 15:46:40 +01:00
Jamie Peabody
1b96990b1f
Fixed typo.
2014-08-17 15:39:30 +01:00
Jamie Peabody
e9e0a9d41b
Merge branch 'master' of https://github.com/kljh/Mergely
...
Conflicts:
lib/mergely.js
2014-08-17 15:35:16 +01:00
Jamie Peabody
456da5f2c8
Added 'debug' option to editor to make it easier to switch.
2014-08-17 12:11:03 +01:00
Kljh
3c4fe71683
Editors cursor are now moved to currently selected difference.
2014-08-17 09:14:55 +01:00
Kljh
4f8c91c28a
Morning clean up.
...
Restrict keyboard handler for the Mergely div to play nicely with other element on the page.
Darker grey for active difference.
2014-08-17 08:25:16 +01:00
Kljh
572eb08aaa
Morning clean up.
...
Removed useless function get_changes. Moved current_diff out of this.settings (and along this.changes)
Handle the case where comparing identical files (e.g. changes.length==0).
ajax.html uses https for jquery so that it can be hosted on a https server.
ajax.html uses full available screen width, auto height is trickier (note that call to _auto_height is commented out in mergely.js).
2014-08-17 08:11:13 +01:00
Kljh
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.
I had to update codemirror.css to have the texteditor height match the container. I tested using Opera browser and there seems to be no autosizing.
2014-08-17 00:17:39 +01:00
Kljh
6308a6926a
Added auto scrolling.
...
Current difference is now always in viewport.
Added functions get_changes() and scroll_to_change(change) around line 767. Both new review.
We shouldn't need to rerun the full diff but I couldn't find how to retrieve the diff results.
Scrolling to a given change is quite tricky (musn't break the canvas graph, must have both pane nice).
2014-08-16 20:39:03 +01:00
Kljh
885fcd4e05
Added keyboard shortcuts à la WinMerge.
...
Alt + Up or Down arrow : go to previous or next difference
Alt + Left or Right arrow : merge difference using right or left content
Shift, Ctr, Alt or Meta keys can be used indifferntly (to cope with browser's idiosyncratics).
Event handler is now attached to text editor. This is clearly to review (does not capture all page events and too intrusive).
New state "current_diff" has been added.
Need to scroll the editor to center it on currently active state (scrollToChange function to add).
2014-08-16 17:31:15 +01:00
