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

262 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rodrigo Fernandes
8558bab3ca Merge pull request #46 from rtfpessoa/test-html-prefixes 
Test html line prefixes
 2015-12-23 19:54:17 +00:00
Rodrigo Fernandes
57369ae2e4 Add JSCS script and update dependencies 2015-12-23 19:47:09 +00:00
Rodrigo Fernandes
f3d2946aa4 Force JSCS style 2015-12-23 19:34:39 +00:00
Rodrigo Fernandes
7244f07e0a Test html line prefixes 2015-12-23 16:05:30 +00:00
Rodrigo Fernandes
246e459749 Merge pull request #45 from pbu88/side_by_side_prefix_bug 
Fixes prefix bug on side by side diff
 2015-12-23 15:05:36 +00:00
Paulo Bu
7f08de9c67 Fixes prefix bug on side by side diff 2015-12-23 15:34:44 +01:00
Rodrigo Fernandes
598c2d365c Merge pull request #44 from pbu88/add-mocha-tests 
Adds simple tests for utils and diff2html
 2015-12-23 14:18:27 +00:00
Paulo Bu
09d422be79 Adds simple tests for utils and diff2html 2015-12-23 14:14:29 +01:00
Rodrigo Fernandes
d184017bf2 Merge pull request #43 from rtfpessoa/add-mocha-tests 
Start using mocha with istambul to test and setup circleci
 2015-12-22 22:56:31 +00:00
Rodrigo Fernandes
9e550c2b65 Start using mocha with istambul to test and setup circleci 2015-12-22 15:48:33 +00:00
Rodrigo Fernandes
7920de8924 Merge pull request #42 from pbu88/adding_unit_tests 
Adds unit tests using node-unit
 2015-12-22 14:44:22 +00:00
Paulo Bu
678e5147d8 Adds unit tests using node-unit 
First approach to include unit tests in the code using node-unit.

- Adds node unit dependency
- Adds 2 very basic tests for LineByLine and SideBySide printers
 2015-12-22 12:37:39 +01:00
Rodrigo Fernandes
af9d00b56e Merge pull request #41 from pbu88/fixes_wrong_use_of_self 
Use more object oriented style in SideBySidePrinter
 2015-12-21 23:47:55 +00:00
Paulo Bu
c5f54d29f8 Passes config in the SideBySide constructor and uses it from within the class 2015-12-21 15:26:08 +01:00
Paulo Bu
a4cf385a7d Makes SideBySidePrinter more object oriented 2015-12-21 15:26:02 +01:00
Rodrigo Fernandes
a6920cef82 Add css folder to npm release 2015-12-21 00:17:19 +00:00
Rodrigo Fernandes
7fa8292da1 Fix some more CSS and JS style issues 2015-12-20 23:38:16 +00:00
Rodrigo Fernandes
c80a4c6415 Merge pull request #39 from rtfpessoa/improve-code-style 
Update contributors list, add codacy badge and clean code
 2015-12-20 23:01:05 +00:00
Rodrigo Fernandes
011e06d876 Remove conflicting CSS 2015-12-20 22:55:34 +00:00
Rodrigo Fernandes
8d86a15d69 Clean code and force code style 
Since more people are contributing to the code Codacy will help
keep it consistent and easy to maintain, by suggesting improvements
 2015-12-20 22:55:09 +00:00
Rodrigo Fernandes
4d3d752361 Update contributors list, add codacy badge 2015-12-20 22:51:31 +00:00
Rodrigo Fernandes
9dab24ed77 Merge pull request #40 from pbu88/fixes_wrong_use_of_self 
Renames and correctly declares variable 'that' instead of 'self'
 2015-12-20 22:51:16 +00:00
Paulo Bu
068f30c2ce Renames and correctly declares variable 'that' instead of 'self' 2015-12-20 23:42:37 +01:00
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