luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
139 commits 6 branches 181 tags 6.7 MiB
Commit graph

139 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rodrigo Fernandes
af013f1951 Merge pull request #38 from pbu88/more_object_oriented 
A more object oriented approach
 2015-12-20 19:10:23 +00:00
Paulo Bu
e3f572c075 Passes config in the LineByLine constructor and uses it from within the class 2015-12-20 15:56:53 +01:00
Paulo Bu
4a06df6039 Makes LineByLine more object oriented 2015-12-20 15:51:56 +01:00
Rodrigo Fernandes
ff8eca3a7b Enable line matching on side-by-side sample 2015-12-19 22:54:03 +00:00
Rodrigo Fernandes
1dce15ad7a Use line matching as default 2015-12-19 21:14:58 +00:00
Rodrigo Fernandes
20e078334b Prepare for version 1.2.0 release 2015-12-19 21:09:31 +00:00
Rodrigo Fernandes
d2e9f49a0f Merge pull request #36 from escitalopram/f-line-and-word-matching 
Fix bug in change grouping algorithm
 2015-12-19 21:08:09 +00:00
Wolfgang Illmeyer
e41ee3eae8 Fix change grouping algorithm 2015-12-19 21:52:34 +01:00
Rodrigo Fernandes
1ec5cbfc5d Merge pull request #34 from escitalopram/f-line-and-word-matching 
Enhancements for highlighting
 2015-12-14 08:57:50 +00:00
Wolfgang Illmeyer
94516c835b make matching configurable 2015-12-09 23:17:45 +01:00
Wolfgang Illmeyer
8c059d30da Add changetype constant, fix css color for changes 2015-12-06 22:45:58 +01:00
Wolfgang Illmeyer
7335c3bab3 Enhancements for highlighting 
1. Fixed a bug that prevented highlighting when more lines were deleted
from a replacement block than added

2. Added similarity search feature to match similar lines for
highlighting.

3. Highlighting: Support for matching "ins" and "del" markers to allow
for a "change" marker

4. Bugfix: All lines are now split into prefix and content spans
 2015-11-27 11:39:08 +01:00
Rodrigo Fernandes
8b9c2473b2 Merge pull request #32 from rtfpessoa/fix-changes-headers 
fix changes summary on files headers
 2015-10-31 21:58:45 +00:00
Rodrigo Fernandes
54b39158f5 fix changes summary on files headers 
* since the alignment of the changes the file headers lost the style due to css changes
* update diff dependency and add dev dependencies
 2015-10-31 21:55:15 +00:00
Rodrigo Fernandes
45e84c5bc7 Merge pull request #31 from rtfpessoa/fix-credits-typo 
fix typo
 2015-10-29 10:09:51 +00:00
Rodrigo Fernandes
8f9ff37a99 fix typo 2015-10-29 10:09:46 +00:00
Rodrigo Fernandes
0bdaef8513 Merge pull request #30 from rtfpessoa/credits 
add contributors list
 2015-10-29 10:08:57 +00:00
Rodrigo Fernandes
b021466486 add contributors list 2015-10-29 10:07:29 +00:00
Rodrigo Fernandes
63a004fd01 Merge pull request #29 from rtfpessoa/release-1.1.2 
prepare release 1.1.2
 2015-10-28 18:54:36 +00:00
Rodrigo Fernandes
2acee773fb prepare release 1.1.2 2015-10-28 18:54:16 +00:00
Rodrigo Fernandes
d88ff360df Merge pull request #28 from Rantanen/master 
Align the file summary
 2015-10-28 18:52:33 +00:00
Mikko Rantanen
26d349b736 Align the file summary 
Use <table> element to lay out the file summary. The summary is tabular
data anyway so the use of <table> should be justified. First column
contains lines added, justified to right and the second column contains
lines removed, justified to the left. The last column has the file name.

Fixes #27
 2015-10-28 19:43:06 +02:00
Rodrigo Fernandes
90b8892bb3 release version 1.1.1 2015-10-20 19:12:25 +01:00
Rodrigo Fernandes
cc858a24f9 Merge pull request #25 from pbu88/small_perf_improvement 
Extracts variables out of a loop
 2015-10-20 11:29:09 +01:00
Paulo Bu
c1ea2cb3b2 Extracts variables out of a loop 2015-10-20 10:55:22 +02:00
Rodrigo Fernandes
c5671a50f8 prepare release 1.1.0 2015-10-19 15:54:48 +01:00
Rodrigo Fernandes
440a9a4c7c Merge pull request #23 from nmatpt/add_file_list 
Show the list of changed files
 2015-10-19 15:53:02 +01:00
Nuno Teixeira
c2fb4bf1da Use hashcode instead of filename for file list id 2015-10-19 15:43:16 +01:00
Nuno Teixeira
f1db9a9d6f Show the list of changed files 
- Optionally show the file list before the diff
- Change usage to accept configuration instead of multiple methods
 2015-10-19 12:47:49 +01:00
Rodrigo Fernandes
0bb7341d76 one more example in the sample 2015-10-13 11:34:29 +01:00
Rodrigo Fernandes
2077d36760 release 1.0.1 2015-10-05 20:08:39 +01:00
Rodrigo Fernandes
cc73d8ecd4 Merge pull request #21 from pbu88/fixes_white_spaces_being_truncated 
Better regexp to handle unified diff header
 2015-10-05 20:05:39 +01:00
Paulo Bu
a6efdd0f6a Better regexp to handle unified diff header 2015-10-05 20:45:40 +02:00
Rodrigo Fernandes
ca8cfe0528 Merge pull request #18 from rtfpessoa/webpack-for-the-browser 
Webpack for the browser
 2015-09-06 17:07:39 +01:00
Rodrigo Fernandes
ad6905a367 prepare for 1.0.0 release 2015-09-06 17:07:24 +01:00
Rodrigo Fernandes
861459931b fix new and delete line identification 
* add different prefixes for simple and combined diffs
 2015-08-08 01:56:50 +01:00
Rodrigo Fernandes
de13e9506c use webpack for the browser 
* add webpack bundling
* clean bower dependencies since we are using webpack
* add jscs node style support
 2015-08-08 01:11:35 +01:00
Rodrigo Fernandes
9b165a944d remove jquery from README 2015-07-19 22:48:28 +01:00
Rodrigo Fernandes
df6d5bb737 Merge pull request #15 from rtfpessoa/cleaning 
Clean project, better module exposing and documentation
 2015-07-19 22:38:27 +01:00
Rodrigo Fernandes
aac689e0ff prepare for 0.2.6 2015-07-19 22:34:46 +01:00
Rodrigo Fernandes
6514ac7477 clean project, better module exposing and documentation 
* use native JS in example instead of jQuery
 * better module exposing now using exports, module.export, self, window, global and this
 * add example link to bower and npm definition
 * add documentation on how to highlight
 2015-07-19 22:08:17 +01:00
Rodrigo Fernandes
ffeaec2308 prepare for version 0.2.5-1 release 2015-07-19 00:47:00 +01:00
Rodrigo Fernandes
57f56978aa Merge pull request #14 from rtfpessoa/merge-npm 
Merge npm package
 2015-07-19 00:44:14 +01:00
Rodrigo Fernandes
527ecb97c8 add npm and bower folder to gitignore and fix license on npm 2015-07-19 00:32:40 +01:00
Rodrigo Fernandes
759239133f merge npm package into main repo 2015-07-19 00:23:36 +01:00
Rodrigo Fernandes
5ee366a01e update to highlightjs 8.6 2015-07-18 23:38:17 +01:00
Rodrigo Fernandes
029efa4d0a css fix to Y scrollbar on side by side diff 2015-07-18 23:22:36 +01:00
Rodrigo Fernandes
976ec24965 Merge pull request #13 from codingtwinky/patch-1 
css fix to Y scrollbar appearing in some cases.
 2015-07-18 23:20:18 +01:00
CodingTwinky
573f4c29a3 Update diff2html.css 2015-07-14 17:23:21 -07:00
Rodrigo Fernandes
43a0a9c0ad Merge pull request #12 from rtfpessoa/fix-diff-parsing 
diff parser rules matching beginning of line
 2015-07-11 23:42:16 +01:00