Permalink
Commits on Aug 30, 2011
  1. Moved the authentication_keys configuration to the devise model, rath…

    senior committed Aug 30, 2011
    …er than as a global config
Commits on Aug 29, 2011
  1. Show correct path.

    ugisozols committed Aug 29, 2011
  2. Merge branch '1-0-stable' [ci skip]

    parndt committed Aug 29, 2011
    Conflicts:
    	core/config/locales/fr.yml
    	core/config/locales/it.yml
    	core/config/locales/lv.yml
    	core/config/locales/pt-BR.yml
    	core/config/locales/sl.yml
    	pages/config/locales/ru.yml
  3. Ensure that we see the raw output of the javascript disabled flash me…

    parndt committed Aug 29, 2011
    …ssage by using _html convention.
Commits on Aug 26, 2011
  1. Merge pull request #908 from inntran/i18n_zh-CN

    parndt committed Aug 26, 2011
    added 6 translations for zh-CN
  2. added 6 translations for zh-CN

    inntran committed Aug 26, 2011
Commits on Aug 25, 2011
  1. Set per_page globally.

    ugisozols committed Aug 25, 2011
Commits on Aug 24, 2011
  1. Welcome back will_paginate.

    ugisozols committed Aug 24, 2011
  2. Update refinery:override task:

    ugisozols committed Aug 24, 2011
    * now it can copy js and stylesheet files
    * remove theme stuff
    * update usage examples
  3. Reduce time Refinery takes to run on travis

    michaelklishin committed Aug 24, 2011
     * REE is effectively 1.8.7
     * rbx is being replaced by rbx-2.0 soon
Commits on Aug 23, 2011
  1. Merge pull request #905 from michaelklishin/patch-1

    parndt committed Aug 23, 2011
    Reduce time Refinery takes to run on travis
  2. Merge branch '1-0-stable'

    parndt committed Aug 23, 2011
  3. I'm so used to File.expand_path style linking that I forgot temporari…

    parndt committed Aug 23, 2011
    …ly how the web works.
  4. Instead of listing out a huge WYMeditor explanation inside pages.md I…

    parndt committed Aug 23, 2011
    …'m moving it out to its own guide and linking to it.
  5. Merge pull request #902 from enmasse-entertainment/add-missing-require

    parndt committed Aug 23, 2011
    Improve usability for people who are just including controller_macros in
  6. Improve usability for people who are just including controller_macros…

    Jamie Winsor committed Aug 23, 2011
    … in their spec helpers. The user factory is required by these macro files.
Commits on Aug 22, 2011
  1. Update dependencies.

    ugisozols committed Aug 22, 2011
  2. Remove duplicate migrations.

    ugisozols committed Aug 22, 2011
  3. Merge pull request #897 from mirosr/i18n_bg

    ugisozols committed Aug 22, 2011
    Update for Bulgarian translation
  4. Update for Bulgarian translation

    mirosr committed Aug 22, 2011