Commits · 4f8a0be608a64dfaaee56a21b064428cbe3f6e47 · open-source / annotate

01 Mar, 2012 38 commits
- Merge remote-tracking branch 'collectiveidea/master' into development · 4f8a0be6
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate_models.rb
```
  4f8a0be6
- Merge remote-tracking branch 'benlangfeld/master' into development · 3c29b0ac
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	annotate.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
```
  3c29b0ac
- Merge remote-tracking branch 'amalc/master' into development · 61b2574d
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	.gitignore
```
  61b2574d
- Merge remote-tracking branch 'alexbuijs/master' into development · 18da6a78
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
```
  18da6a78
- Merge remote-tracking branch 'adamico/master' into development · 5829e243
  Jon Frisby authored Mar 01, 2012
  
  5829e243
- Merge remote-tracking branch 'Satish/master' into development · e417f419
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	lib/annotate_models.rb
```
  e417f419
- Merge remote-tracking branch 'DanCheail/master' into development · 46df45d5
  Jon Frisby authored Mar 01, 2012
```
Conflicts:
	annotate_models.gemspec
	bin/annotate
	lib/annotate/annotate_models.rb
	lib/tasks/annotate.rake
```
  46df45d5
- Yep, I'm tired. · f2a6c320
  Jon Frisby authored Feb 29, 2012
  
  f2a6c320
- Revert "Version bump to 0.0.0" · 7a6c6df9
  Jon Frisby authored Feb 29, 2012
```
... I am clearly tired.

This reverts commit 192808b7.
```
  7a6c6df9
- Version bump to 0.0.0 · 192808b7
  Jon Frisby authored Feb 29, 2012
  
  192808b7
- Changing my mind on project name issue... · 51fda365
  Jon Frisby authored Feb 29, 2012
  
  51fda365
- Making project name match Github project name. · bf3b35a3
  Jon Frisby authored Feb 29, 2012
  
  bf3b35a3
- Bumping version. · 78038454
  Jon Frisby authored Feb 29, 2012
  
  78038454
- Wider type column output, play nice with Rake CLI. · f96592dc
  Jon Frisby authored Feb 29, 2012
  
  f96592dc
- Fixing behavior with some model sub-classes, adding skip-annotations feature. · 809a29f9
  Jon Frisby authored Feb 29, 2012
  
  809a29f9
- Making ActiveSupport dependency float, updating gemspec. · 70206842
  Jon Frisby authored Feb 29, 2012
  
  70206842
- Updating change log, readme and TODO list. · 704eb37e
  Jon Frisby authored Feb 29, 2012
  
  704eb37e
- Update generated .rake file with new options. · e41c7131
  Jon Frisby authored Feb 29, 2012
  
  e41c7131
- Merge remote-tracking branch 'miyucy/restart' · 6e41ec0a
  Jon Frisby authored Feb 29, 2012
```
WARNING: EVIL MERGE.

I'm fixing a number of problems with this branch and ommitting one or two things.


Conflicts:
	.gitignore
	History.txt
	README.rdoc
	Rakefile
	VERSION.yml
	annotate.gemspec
	lib/annotate/annotate_models.rb
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
	lib/tasks/migrate.rake
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb
```
  6e41ec0a
- Renaming bin to avoid conflict with ImageMagick. · cc7f3b15
  Jon Frisby authored Feb 29, 2012
  
  cc7f3b15
- Accept string or symbol for positions. · 25b0f9a5
  Jon Frisby authored Feb 29, 2012
  
  25b0f9a5
- Merge remote-tracking branch 'huerlisi/patch-1' · 3bdb536f
  Jon Frisby authored Feb 29, 2012
```
Conflicts:
	README.rdoc
```
  3bdb536f
- Fix issue during update models · 31089aff
  Jon Frisby authored Feb 29, 2012
```
WARNING: EVIL MERGE!

I had to update the test cases to match the current reality...

Conflicts:

	annotate.gemspec
	lib/annotate/annotate_models.rb
```
  31089aff
- Update TODO list. · 2ff95c25
  Jon Frisby authored Feb 29, 2012
  
  2ff95c25
- Merge remote-tracking branch 'melriffe/master' · 5198f1c2
  Jon Frisby authored Feb 29, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
	spec/annotate/annotate_models_spec.rb
```
  5198f1c2
- Updating changelog. · fd43f23d
  Jon Frisby authored Feb 29, 2012
  
  fd43f23d
- Merge remote-tracking branch 'prophotos/custom_types_compatibility' · 5286f96b
  Jon Frisby authored Feb 29, 2012
```
Conflicts:
	lib/annotate/annotate_models.rb
```
  5286f96b
- Fix for future test-case breakage. · 06ebbd19
  Jon Frisby authored Feb 29, 2012
  
  06ebbd19
- Merge remote-tracking branch 'james2m/master' · f8623135
  Jon Frisby authored Feb 29, 2012
```
Conflicts:
	lib/tasks/annotate_models.rake
	lib/tasks/annotate_routes.rake
```
  f8623135
- Updating documentation. · 33860941
  Jon Frisby authored Feb 29, 2012
  
  33860941
- Merge webhoernchen/master · efa5699a
  Jon Frisby authored Feb 29, 2012
```
Conflicts:
	annotate.gemspec
```
  efa5699a
- Improve rakefile generator. · 22e6d49c
  Jon Frisby authored Feb 29, 2012
  
  22e6d49c
- Merge remote-tracking branch 'rubyjedi/master' · 7f9e974d
  Jon Frisby authored Feb 29, 2012
```
(NOTE: Unfinished.  Will replace rakefile in next commit.)

Conflicts:
	annotate.gemspec
```
  7f9e974d
- Merge remote-tracking branch 'ijcd/master' · 858b4d69
  Jon Frisby authored Feb 29, 2012
  
  858b4d69
- Sorting out dependency generation in gemspec. · 7c4c85ca
  Jon Frisby authored Feb 29, 2012
  
  7c4c85ca
- Add an rvmrc to isolate this when developing/testing. · a1a475b9
  Jon Frisby authored Feb 29, 2012
  
  a1a475b9
- Update gemspec. · 518f8eaf
  Jon Frisby authored Feb 29, 2012
  
  518f8eaf
- Merge remote-tracking branch 'pinnymz/master' · b18abd93
  Jon Frisby authored Feb 29, 2012
  
  b18abd93
27 Feb, 2012 1 commit
- refactor out active_record monkey patch to permit extending without side effects · aae82380
  pinny authored Feb 27, 2012
  
  aae82380
29 Jan, 2012 1 commit
- Fix parenthesis. · fcbec0e2
  Kirill Lashuk authored Jan 29, 2012
  
  fcbec0e2