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

330 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rodrigo Fernandes
f0363ecefc Prepare for release and update packages 2016-02-07 14:41:06 +00:00
Rodrigo Fernandes
59914f1a10 Merge pull request #58 from rtfpessoa/fix-file-summary-switch 
Fix file summary switch
 2016-02-07 14:27:48 +00:00
Rodrigo Fernandes
43666f655a Fix file summary switch 
Introduce diff2html-ui to perform any ui anymations or dynamic changes
like hightlight or animations.
 2016-02-07 14:19:23 +00:00
Rodrigo Fernandes
4e9dfa76ba Merge pull request #59 from rtfpessoa/fix-windows-parsing 
Fix parsing on Windows
 2016-02-07 12:56:13 +00:00
Rodrigo Fernandes
93dd322382 Add more eol tests for old os x and mixed eols 2016-02-07 12:47:00 +00:00
Rodrigo Fernandes
269a6268c4 Fix parsing on Windows 
Replace windows EOL by Unix EOL
 2016-02-06 18:50:47 +00:00
Rodrigo Fernandes
6abfbdb6a8 Improve bower.json main field 
* Add dist css and js to main field

Thanks to @fedescarpa
Closes #53
 2016-02-01 09:39:07 +00:00
Rodrigo Fernandes
b00ca04832 Merge pull request #50 from mrfyda/master 
Fix line count when EOF is added to file
 2016-01-16 22:42:39 +00:00
Rafael Cortês
f7bc1552e5 Fix line count when EOF is added to file 
Removes '\\ No newline at end of file' information from the diff lines.
The test case is based on Bitbucket's diff attached to issue #49.
 2016-01-16 21:53:54 +00:00
Rodrigo Fernandes
cc6ed43f25 Remove extra white space 2016-01-10 18:49:16 +00:00
Rodrigo Fernandes
8d738452be Merge pull request #48 from pbu88/refactors_html_code_into_methods 
Refactors html code into methods for SideBySidePrinter
 2016-01-10 18:38:30 +00:00
Paulo Bu
2cdb67d938 Refactors HTML code into their own methods in SideBySidePrinter 2016-01-10 18:16:43 +01:00
Paulo Bu
f6a9ecf450 Add tests to generateSingleLineHtml for SideBySide tests 2015-12-30 22:01:41 +01:00
Rodrigo Fernandes
8955020e9e Merge pull request #47 from pbu88/refactors_html_code_into_methods 
Refactors html code into methods for LineByLinePrinter
 2015-12-27 16:39:06 +00:00
Paulo Bu
a37176cc26 Refactors HTML code into their own methods 2015-12-27 12:29:58 +01:00
Paulo Bu
97eafcd2f7 Add tests to generateLineHtml for LineByLine tests 2015-12-27 11:08:24 +01:00
Rodrigo Fernandes
f5c05aa91e Add more badges 2015-12-24 11:27:07 +00:00
Rodrigo Fernandes
219bcea51b Add contributing docs and help 2015-12-23 20:19:10 +00:00
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