Commit Graph

29 Commits

Author SHA1 Message Date
Ben Atkins e6ba772c95 Merge remote-tracking branch 'fanta/custom_events'
Conflicts:
	lib/paper_trail/has_paper_trail.rb
2013-05-13 11:38:53 -04:00
Ben Atkins 1c9d44e120 Merge branch 'nil_attribute_fix' 2013-05-13 10:37:22 -04:00
Ben Atkins deac77d570 Merge branch 'jruby'
Conflicts:
	.travis.yml
2013-03-26 12:34:38 -04:00
Ben Atkins abd633f5a9 Merge remote-tracking branch 'dwbutler/jruby' into jruby
Conflicts:
	lib/paper_trail/has_paper_trail.rb
	paper_trail.gemspec
	test/unit/serializer_test.rb
2013-03-26 10:54:33 -04:00
Ben Atkins 3a8a21152c Bump to 2.7.1 2013-02-15 13:06:20 -05:00
Ben Atkins 588af563b9 Swapping in :select for :keep_if on changes array in :changes_for_paper_trail method for Ruby1.8.7 compatibility. Close #206 2013-02-11 12:49:08 -05:00
Ben Atkins 143d1ac425 Fixed :next_version method to return the live model when appropriate. Close #200 2013-02-05 13:45:59 -05:00
Ben Atkins 9f9032ae16 Adjusting the methods that dealt with the encoding/decoding data for attributes in ActiveRecord's :serialized_attributes hash so that it will fall back on YAML as the default serializer. Close #197 2013-02-04 16:00:34 -05:00
Ben Atkins 24339a1414 Update CHANGELOG text to be more accurate for pull 180. 2013-02-04 15:47:22 -05:00
Ben Atkins 526e6ae7cc Adding JSON serializer to the gem. Close #194 2013-01-22 18:13:58 -05:00
Ben Atkins fcd96e1a48 Update CHANGELOG. 2013-01-21 19:53:04 -08:00
Ben Atkins bfbb1e87bd Update CHANGELOG. 2013-01-21 19:53:04 -08:00
Ben Atkins 0c3f8e42de Some minor syntax tweaks, updated CHANGELOG. 2013-01-21 19:53:04 -08:00
Ben Atkins 0194eca5e7 Adding setter module method for the 'serializer' config option to PaperTrail module. 2013-01-21 19:53:04 -08:00
Ben Atkins d41d2dde51 Update CHANGELOG. 2013-01-21 11:08:31 -05:00
Ben Atkins f0b10443e0 Update CHANGELOG. 2013-01-21 11:01:09 -05:00
Ben Atkins 1156460b5c Some minor syntax tweaks, updated CHANGELOG. 2013-01-21 10:38:43 -05:00
Ben Atkins 8896d26c08 Adding setter module method for the 'serializer' config option to PaperTrail module. 2013-01-04 10:19:19 -05:00
Ben Atkins bbb7e7ee6d Re-ordering CHANGELOG to be in order of pull requests made. Slight reword of impact resulting from #164. 2012-12-28 14:06:34 -05:00
Ben Atkins bc9c383562 Bump to 2.7.0 2012-12-28 01:19:29 -05:00
Ben Atkins de65a811f9 Update CHANGELOG. 2012-12-28 01:13:18 -05:00
Ben Atkins 656019e512 Update CHANGELOG. 2012-12-17 16:35:52 -05:00
Ben Atkins b6436fcf89 Update CHANGELOG. 2012-11-28 11:18:42 -05:00
Ben Atkins 69425fa9dd Bump to 2.6.4 2012-11-16 12:24:46 -05:00
Ben Atkins 50f94af6b8 Update CHANGELOG. [fixed #181] 2012-11-16 11:54:47 -05:00
Ben Atkins 8e82a3b778 Update CHANGELOG. [fixed #156] 2012-11-06 12:19:31 -05:00
Ben Atkins 8414dd5cfd Fixing the model tests to that they pass for the changes from #168, and updating the CHANGELOG. 2012-11-06 11:34:02 -05:00
Ben Atkins 66072f7eb5 Finalize merge of pull request #178. [ fixed #177 ] 2012-10-30 15:20:47 -04:00
Ben Atkins ca3eedd876 Adding basic template for a changelog. Added some modifications that have been integrated since the last release. 2012-10-16 20:20:44 -04:00