Permalink
Switch branches/tags
Commits on Oct 10, 2012
  1. Merge branch '2.2.x'

    graemerocher committed Oct 10, 2012
  2. Merge branch '2.1.x' into 2.2.x

    graemerocher committed Oct 10, 2012
    Conflicts:
    	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/query/HibernateQuery.java
  3. fix failing test

    graemerocher committed Oct 10, 2012
  4. Merge branch '2.2.x'

    jeffbrown committed Oct 10, 2012
  5. remove dependencies.txt

    jeffbrown committed Oct 10, 2012
  6. Merge branch '2.2.x'

    jeffbrown committed Oct 10, 2012
  7. GRAILS-9470 - Improve annotation handling for action methods

    jeffbrown committed Oct 8, 2012
    If a controller action method accepts arguments and has annotations applied to it, those annotations should also be applied to the generated no-arg action method.
Commits on Oct 9, 2012
  1. minor grammar fix

    jeffbrown committed Oct 9, 2012
  2. Merge branch '2.2.x'

    graemerocher committed Oct 9, 2012
    Conflicts:
    	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
  3. fix failing test

    graemerocher committed Oct 9, 2012
  4. fix for GRAILS-9419

    graemerocher committed Oct 9, 2012
  5. Merge branch '2.2.x'

    graemerocher committed Oct 9, 2012
    Conflicts:
    	build.gradle
    	build.properties
  6. fix for GRAILS-9419 and GRAILS-9424 - only start the Tomcat kill swit…

    graemerocher committed Oct 9, 2012
    …ch for forked mode, not for embedded run-app and also don't depend on it being set to start the watcher thread
  7. update grails version

    graemerocher committed Oct 9, 2012
Commits on Oct 8, 2012
  1. Merge branch '2.2.x'

    jeffbrown committed Oct 8, 2012
  2. GRAILS-9470 - Improve annotation handling for action methods

    jeffbrown committed Oct 8, 2012
    If a controller action method accepts arguments and has annotations applied to it, those annotations should also be applied to the generated no-arg action method.
  3. Corrected indenting to match existing file

    Scott Horn authored and graemerocher committed Oct 2, 2012
  4. Adjusted to allow I18nGrailsPlugin.groovy to work in a jar

    Scott Horn authored and graemerocher committed Oct 2, 2012
    Conflicts:
    	grails-plugin-i18n/src/main/groovy/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPlugin.groovy
    
    Conflicts:
    	grails-plugin-i18n/src/main/groovy/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPlugin.groovy
  5. Corrected indenting to match existing file

    Scott Horn authored and graemerocher committed Oct 2, 2012
  6. Adjusted to allow I18nGrailsPlugin.groovy to work in a jar

    Scott Horn authored and graemerocher committed Oct 2, 2012
    Conflicts:
    	grails-plugin-i18n/src/main/groovy/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPlugin.groovy
  7. Merge pull request #268 from hdiv/master

    graemerocher committed Oct 8, 2012
    RequestDataValueProcessor interface support
  8. Merge pull request #271 from sjhorn/i18n-in-jar

    graemerocher committed Oct 8, 2012
    Allow I18nGrailsPlugin.groovy to work in a non exploded war, jar or flattened jar
  9. Merge pull request #272 from bobbywarner/2.2.x

    graemerocher committed Oct 8, 2012
    Updated to Groovy 2.0.5
Commits on Oct 5, 2012
  1. Updated to Groovy 2.0.5

    bobbywarner committed Oct 5, 2012