github-migration
/
cocoon
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
139 Commits 3 Branches 25 Tags 346 KiB
Commit Graph

139 Commits

Author SHA1 Message Date
Nathan Van der Auwera 6ebb375a67 Merge pull request #78 from ShaneCurcuru/patch-1 
Suggest attribution of Apache Cocoon trademark
 2012-08-01 07:30:46 -07:00
ShaneCurcuru 3b305ed389 Suggest attribution of Apache Cocoon trademark 2012-08-01 10:59:12 -03:00
Nathan Van der Auwera ffaaaeefda Merge pull request #77 from DomKM/master 
This fork fixes a minor typo in README.markdown.
 2012-07-31 14:20:46 -07:00
Dom Kiva-Meyer fd230a396d fixes minor typo in README 2012-07-31 11:36:30 -07:00
Nathan Van der Auwera c0fd78fea2 Merge pull request #75 from bduc/master 
Bugfix : Call insertion-callback on the correct container
 2012-07-30 08:39:19 -07:00
Bart Duchesne a8e0a64ff0 call insertion-callback on the correct node (in case a specific insertion-node is specified) 2012-07-30 10:49:17 +02:00
Nathan Van der Auwera 9b61ab50a7 Merge pull request #72 from nick-desteffen/master 
Adding complete usage documentation for simple_form
 2012-07-14 01:31:51 -07:00
Nathan Van der Auwera 129f7e9836 Merge pull request #73 from jjb/patch-1 
Fix haml/formtastic grammar in example
 2012-07-12 00:03:22 -07:00
John Joseph Bachir 202df42379 Fix haml/formtastic grammar in example 2012-07-11 13:08:56 -03:00
Nick DeSteffen 607dad6bc0 Adding complete usage documentation for simple_form 2012-07-07 13:19:53 -05:00
Nathan Van der Auwera bb060cd6c2 Merge pull request #71 from eidus/master 
Updated documentation in readme to reflect issue #61
 2012-07-06 14:40:35 -07:00
Daniel Onggunhao b11423e5a0 Modified the documentation to reflect resolved issue #61 2012-07-06 11:04:44 -07:00
nathanvda d0384d14d6 Regenerate gemspec for version 1.0.22 2012-05-21 00:57:26 +02:00
nathanvda 7d442b6730 Version bump to 1.0.22 2012-05-21 00:57:12 +02:00
nathanvda 37ab5dd2c5 Make sure it still works if we are working with mongo (use the old code then). We use the class-name so we do not get any issues when Mongoid is not known. Fixes #65. 2012-05-21 00:55:33 +02:00
nathanvda a8a3328ad9 Regenerate gemspec for version 1.0.21 2012-05-09 11:03:16 +02:00
nathanvda 18f365ac09 Version bump to 1.0.21 2012-05-09 11:02:44 +02:00
Nathan Van der Auwera e5e7a1c96d Merge pull request #64 from semanticart/master 
Use association build methods instead of assoc.klass.new
 2012-05-08 14:18:54 -07:00
Jeffrey Chupp 5ddefa399d Use association build methods instead of assoc.klass.new. This avoids mass-assignment errors and other misbehaviors around attribute accessibility. 2012-05-04 19:55:12 -04:00
Nathan Van der Auwera 251d326f31 Merge pull request #58 from michaelkoper/master 
Fixed formtastic deprecation in readme.
 2012-04-20 13:25:26 -07:00
Michael Koper 480eb8a3fb fixed formtastic deprecation 2012-04-20 14:07:43 +02:00
nathanvda f546a9961b Regenerate gemspec for version 1.0.20 2012-04-09 12:49:09 +02:00
nathanvda ee63272ccd Version bump to 1.0.20 2012-04-09 12:49:03 +02:00
nathanvda 8b791b051f Updated History/Changelog. 2012-04-09 12:48:12 +02:00
nathanvda 0225126532 Remove the extra options-hash for the partial, instead use the same html_options hash. Is less confusing, and matches the documentation (I was under the impression it was already like that --ooops). 2012-04-09 12:45:59 +02:00
nathanvda a0c2d6db53 Make sure that we will not regress: when not passing locals to the partial, it should still work. This was reported in #54, but first fixed in #53. 2012-04-08 18:18:46 +02:00
nathanvda 700c239c26 Regenerate gemspec for version 1.0.19 2012-04-08 00:03:11 +02:00
nathanvda 07cf348477 Version bump to 1.0.19 2012-04-08 00:02:41 +02:00
Nathan Van der Auwera c8bf134032 Merge pull request #53 from CuriousCurmudgeon/master 
Options not passed to link_to_add_association when using a block
 2012-04-07 14:23:28 -07:00
Brian Meeker e43a03919c Make sure that locals is always initialized in render_association. If it is not, the call to Hash#merge will fail. 2012-04-07 16:59:43 -04:00
Brian Meeker 5fa318a7f6 Pass options through to link_to_add_association when calling with block for link text. 2012-04-07 11:34:57 -04:00
Brian Meeker 1d22eba498 Added a new example that passes options to link_to_add_association with a block for the name. The test fails. 2012-04-07 11:34:10 -04:00
nathanvda 8c29b122e4 Regenerate gemspec for version 1.0.18 2012-04-07 02:23:23 +02:00
nathanvda 73596e90e6 Version bump to 1.0.18 2012-04-07 02:23:13 +02:00
nathanvda ae21d63679 Pulled in changes from zacstewart (pull #42), but with extra documentation and test. 2012-04-07 02:14:26 +02:00
nathanvda 5047cdf0f1 Pulled in the changes from erwin (pull #51)., with a few changes to clean up and maintain backwards compatibility. 2012-04-07 01:33:30 +02:00
nathanvda 7212a7a13c Update the documentation, to match the availability of some extra options :partial and :render_options. 2012-04-07 01:15:27 +02:00
nathanvda ad87c04d4e When using an overriden assocation-name, we generate correct plurals. 2012-04-07 00:35:57 +02:00
nathanvda 15eaa31e04 Regenerate gemspec for version 1.0.17 2012-03-16 20:09:36 +01:00
nathanvda 58bb493443 Version bump to 1.0.17 2012-03-16 20:09:17 +01:00
nathanvda 7bcd2aa98d Make sure cocoon still works on rails 3.0 (where conditions is not yet supported). Fixes #47. 2012-03-16 20:08:19 +01:00
nathanvda 239790d44c Regenerate gemspec for version 1.0.16 2012-03-12 23:59:10 +01:00
nathanvda 2593194a30 Version bump to 1.0.16 2012-03-12 23:58:49 +01:00
nathanvda d76104f083 Clean up specs: test only one thing, and refrain from using should in titles (better spec-doc). 2012-03-12 23:53:52 +01:00
nathanvda dece4624fb Make sure that the tests can run on all platforms, do not use 1.9 hash syntax. 2012-03-12 23:48:07 +01:00
Nathan Van der Auwera 52525b0715 Merge pull request #45 from fl00r/master 
Added support of "conditions" in associations
 2012-03-12 14:27:58 -07:00
fl00r 3f5e89361f Added custom partial feature 2012-03-12 23:30:11 +04:00
fl00r 04c231570b Few minor fixes: 
- Gemfile.lock is kicked out
- rdoc/task fix

Added support of  in associations
 2012-03-12 23:07:10 +04:00
Nathan Van der Auwera 47b5f678b4 Merge pull request #33 from jqr/fix_formastic_example_url 
Correcting URL to formtastic demo
 2012-01-05 22:57:20 -08:00
Elijah Miller 8225ed4904 Correcting URL to formtastic demo. 2012-01-05 18:18:29 -05:00