Commit Graph

  • 2e2a746fe8 merve formtastic_input John Bintz 2013-04-10 18:36:02 -0400
  • 7b8cd65a55 fix some slow javascript. oops John Bintz 2013-04-10 18:34:47 -0400
  • 7f6d0c0eb3 Merge branch 'master' of git://github.com/nathanvda/cocoon into formtastic_input John Bintz 2013-01-24 05:57:19 -0500
  • d4f59eb5eb Merge pull request #120 from virusman/rails4 Nathan Van der Auwera 2013-01-22 13:04:08 -0800
  • de1acdf930 Make sure javascript_expansions config option exists virusman 2013-01-23 00:33:44 +0400
  • aac7105f04 Updated history. nathanvda 2013-01-21 08:39:01 +0100
  • c40d9becc3 Regenerate gemspec for version 1.1.2 nathanvda 2013-01-21 08:33:03 +0100
  • bb6ffdbcdb Version bump to 1.1.2 nathanvda 2013-01-21 08:32:52 +0100
  • e4c3fe8023 Merge pull request #118 from ahmozkya/patch-1 Nathan Van der Auwera 2013-01-20 23:30:04 -0800
  • 33f5df9d4c Update app/assets/javascripts/cocoon.js Ahmet Özkaya 2013-01-19 23:48:02 +0200
  • 242d89a3b0 don't automaticaly include jquery ui John Bintz 2013-01-15 21:55:31 -0500
  • 996ccd55f0 update for new jquery-ui-rails gem John Bintz 2013-01-07 12:24:51 -0500
  • d9e94ab3ed remove console.logs, make orderling less specific, add turbolinks support John Bintz 2012-12-13 18:51:47 -0500
  • b40e73734c Merge pull request #111 from andyw8/master Nathan Van der Auwera 2012-12-13 10:40:19 -0800
  • 7ce9fe91f3 Fix broken TravisCI image Andy Waite 2012-12-13 17:04:20 +0000
  • 0484ccbab5 Merge branch 'formtastic_input' of github.com:johnbintz/cocoon into formtastic_input John Bintz 2012-12-10 20:52:42 -0500
  • 003229a558 input html options John Bintz 2012-12-10 20:47:26 -0500
  • 047c671613 Merge 00643beceb into 22cfa784d4 Ari Epstein 2012-12-08 15:20:04 -0800
  • 00643beceb on stop set first item position at 1, not 0 aepstein/patch-1 aepstein/patch-1 Ari Epstein 2012-12-08 18:17:26 -0500
  • 6d85276a4e add cocoon wrapper aepstein/formtastic_input John Bintz 2012-11-27 10:17:53 -0500
  • a7a9147ad4 Version bump to 1.1.1 nathanvda 2012-11-22 01:32:05 +0100
  • 3c0c82ce90 Updated history. nathanvda 2012-11-22 01:31:35 +0100
  • ed8154d2fa Added option :force_non_association_create. nathanvda 2012-11-22 01:31:19 +0100
  • 1c82d74acf Merge remote-tracking branch 'origin/master' nathanvda 2012-11-22 01:33:06 +0100
  • 2350ae3ba2 Regenerate gemspec for version 1.1.1 nathanvda 2012-11-22 01:32:33 +0100
  • 83beb92d4a refactor and make i18n nicer John Bintz 2012-11-01 13:19:36 -0400
  • 09fe15c446 fix broken test John Bintz 2012-10-26 17:59:48 -0400
  • a1715f049b more work to make nested sortable forms work, can now sort forms within forms John Bintz 2012-10-26 17:59:07 -0400
  • 511184a267 fix merge problem John Bintz 2012-10-25 15:27:25 -0400
  • b8f373fd5e add the most basic sanity tests for formtastic input John Bintz 2012-10-25 15:17:47 -0400
  • 042fcc9976 fix dumb bug John Bintz 2012-10-25 15:02:00 -0400
  • 53074502b1 merge in master John Bintz 2012-10-25 14:59:39 -0400
  • 6503f8eafa merge John Bintz 2012-10-25 14:51:07 -0400
  • bfe72bd29f add support for sorting nested forms John Bintz 2012-10-25 14:49:55 -0400
  • 22cfa784d4 Clarified the :wrap_object documentation. master aepstein/master Nathan Van der Auwera 2012-10-25 10:11:33 +0300
  • 215b31cb59 Merge branch 'formtastic_input' of github.com:johnbintz/cocoon into formtastic_input John Bintz 2012-10-21 13:46:00 -0400
  • 663a9f344c some fixes John Bintz 2012-10-21 13:12:29 -0400
  • 2287dddcf9 Updated README to document the :wrap_object option and the changed callback signature (allowing to add animations, effects, markup to the inserted items). nathanvda 2012-10-19 20:00:50 +0200
  • f584e181d2 ensure important John Bintz 2012-10-18 14:02:10 -0400
  • bbba9dc4c0 Add the (to be) inserted or (to be) removed html to the event. nathanvda 2012-10-18 07:28:29 +0200
  • 3f89fff364 add stylesheet for active admin integration John Bintz 2012-10-17 11:21:19 -0400
  • 78b54a1002 hack in formtastic input John Bintz 2012-10-17 10:09:53 -0400
  • 8118a45953 Make sure we handle self-nested forms correctly. Fixes #96 and #74. nathanvda 2012-10-13 00:11:16 +0200
  • 58f538f495 Merge pull request #98 from finist/patch-1 Nathan Van der Auwera 2012-10-12 07:19:15 -0700
  • 646c036258 Update app/assets/javascripts/cocoon.js Nikolay Seskin 2012-10-12 17:54:55 +0400
  • 4f3fce0e9c Regenerate gemspec for version 1.1.0 v1.1.0 Nathan Van der Auwera 2012-10-09 01:13:46 +0200
  • 7e830eea2e Update read me to reflect the new event names. Nathan Van der Auwera 2012-09-25 00:47:41 +0200
  • 5d2446f7e5 Next release will be 1.1.0 because the event names have changed. Nathan Van der Auwera 2012-09-24 23:59:54 +0200
  • a5cc3212a7 Rename the events: use clear collision-free names. Nathan Van der Auwera 2012-09-24 23:58:45 +0200
  • 64fd7e718d Merge pull request #90 from dnagir/create-object-option Nathan Van der Auwera 2012-09-24 14:28:04 -0700
  • 4ad85f2782 Merge branch 'fix-broken-js' into create-object-option Dmytrii Nagirniak 2012-09-24 19:01:46 +1000
  • d4b997a082 Fix broken js at c69c157aff Dmytrii Nagirniak 2012-09-24 19:00:19 +1000
  • bee1a8ba0b Allow to build plural transient associations Dmytrii Nagirniak 2012-09-24 18:20:18 +1000
  • 80f949d15a Allow to create association from build_xyz method on an object Dmytrii Nagirniak 2012-09-24 18:15:25 +1000
  • 3f59065366 Refactor object creating and add pending spec Dmytrii Nagirniak 2012-09-24 18:08:07 +1000
  • a581d0a3ec Raise more describprive error when can't reflect on association Dmytrii Nagirniak 2012-09-24 17:47:47 +1000
  • 7baae8f8c3 Updated README. Nathan Van der Auwera 2012-09-21 00:45:42 +0200
  • 8e3bfa1a29 Bump version to 1.0.23 Nathan Van der Auwera 2012-09-21 00:45:26 +0200
  • c69c157aff Renamed the triggered events to be more clear and symmetric, and added a before-insert. As discussed in #89. Nathan Van der Auwera 2012-09-21 00:34:13 +0200
  • 359e1ac741 Merge pull request #88 from SebastianEdwards/master Nathan Van der Auwera 2012-09-20 02:21:48 -0700
  • c33df6fec5 Allow created objects to be decorated via a callable option. Sebastian Edwards 2012-09-19 22:37:35 +1200
  • c2a0be513d Merge pull request #83 from porecreat/rename-template Nathan Van der Auwera 2012-09-13 05:17:55 -0700
  • 9c1451ec7a Merge pull request #76 from joelcogen/master Nathan Van der Auwera 2012-09-13 05:16:32 -0700
  • 3cc8a56693 Merge pull request #82 from porecreat/master Nathan Van der Auwera 2012-09-13 05:15:24 -0700
  • 5fb2708496 Fix data attributes order in specs Gauthier Delacroix 2012-08-29 10:42:15 +0200
  • 9e3f0436d1 Rename JS 'template' data Gauthier Delacroix 2012-08-29 10:33:40 +0200
  • 3833d9b175 Add relative node selection Gauthier Delacroix 2012-08-28 19:08:57 +0200
  • 6ebb375a67 Merge pull request #78 from ShaneCurcuru/patch-1 Nathan Van der Auwera 2012-08-01 07:30:46 -0700
  • 3b305ed389 Suggest attribution of Apache Cocoon trademark ShaneCurcuru 2012-08-01 10:59:12 -0300
  • ffaaaeefda Merge pull request #77 from DomKM/master Nathan Van der Auwera 2012-07-31 14:20:46 -0700
  • fd230a396d fixes minor typo in README Dom Kiva-Meyer 2012-07-31 11:36:30 -0700
  • 0cd06df780 Updated README with standard Rails forms example Joel Cogen 2012-07-31 14:36:58 +0300
  • c0fd78fea2 Merge pull request #75 from bduc/master Nathan Van der Auwera 2012-07-30 08:39:19 -0700
  • a8e0a64ff0 call insertion-callback on the correct node (in case a specific insertion-node is specified) Bart Duchesne 2012-07-30 10:49:17 +0200
  • 9b61ab50a7 Merge pull request #72 from nick-desteffen/master Nathan Van der Auwera 2012-07-14 01:31:51 -0700
  • 129f7e9836 Merge pull request #73 from jjb/patch-1 Nathan Van der Auwera 2012-07-12 00:03:22 -0700
  • 202df42379 Fix haml/formtastic grammar in example John Joseph Bachir 2012-07-11 13:08:56 -0300
  • 607dad6bc0 Adding complete usage documentation for simple_form Nick DeSteffen 2012-07-07 13:19:53 -0500
  • bb060cd6c2 Merge pull request #71 from eidus/master Nathan Van der Auwera 2012-07-06 14:40:35 -0700
  • b11423e5a0 Modified the documentation to reflect resolved issue #61 Daniel Onggunhao 2012-07-06 11:04:44 -0700
  • d0384d14d6 Regenerate gemspec for version 1.0.22 v1.0.22 nathanvda 2012-05-21 00:57:26 +0200
  • 7d442b6730 Version bump to 1.0.22 nathanvda 2012-05-21 00:57:12 +0200
  • 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. nathanvda 2012-05-21 00:55:33 +0200
  • a8a3328ad9 Regenerate gemspec for version 1.0.21 v1.0.21 nathanvda 2012-05-09 11:03:16 +0200
  • 18f365ac09 Version bump to 1.0.21 nathanvda 2012-05-09 11:02:44 +0200
  • e5e7a1c96d Merge pull request #64 from semanticart/master Nathan Van der Auwera 2012-05-08 14:18:54 -0700
  • 5ddefa399d Use association build methods instead of assoc.klass.new. This avoids mass-assignment errors and other misbehaviors around attribute accessibility. Jeffrey Chupp 2012-05-04 19:25:59 -0400
  • 251d326f31 Merge pull request #58 from michaelkoper/master Nathan Van der Auwera 2012-04-20 13:25:26 -0700
  • 480eb8a3fb fixed formtastic deprecation Michael Koper 2012-04-20 14:07:43 +0200
  • f546a9961b Regenerate gemspec for version 1.0.20 v1.0.20 nathanvda 2012-04-09 12:49:09 +0200
  • ee63272ccd Version bump to 1.0.20 nathanvda 2012-04-09 12:49:03 +0200
  • 8b791b051f Updated History/Changelog. nathanvda 2012-04-09 12:48:12 +0200
  • 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). nathanvda 2012-04-09 12:45:59 +0200
  • 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. nathanvda 2012-04-08 00:56:02 +0200
  • 700c239c26 Regenerate gemspec for version 1.0.19 v1.0.19 nathanvda 2012-04-08 00:03:11 +0200
  • 07cf348477 Version bump to 1.0.19 nathanvda 2012-04-08 00:02:41 +0200
  • c8bf134032 Merge pull request #53 from CuriousCurmudgeon/master Nathan Van der Auwera 2012-04-07 14:23:28 -0700
  • e43a03919c Make sure that locals is always initialized in render_association. If it is not, the call to Hash#merge will fail. Brian Meeker 2012-04-07 16:59:43 -0400
  • 5fa318a7f6 Pass options through to link_to_add_association when calling with block for link text. Brian Meeker 2012-04-07 11:34:57 -0400
  • 1d22eba498 Added a new example that passes options to link_to_add_association with a block for the name. The test fails. Brian Meeker 2012-04-07 11:34:10 -0400