aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixes issue #436duccioarmenise2015-05-141-1/+1
|
* Merge pull request #431 from johanb/masterPhilip Arndt2015-05-061-1/+1
|\ | | | | Update engine.rb as per instructions
| * Update engine.rb as per instructionsJohan Bruning2015-05-011-1/+1
| | | | | | | | https://github.com/refinery/refinerycms/issues/2267
* | Merge remote-tracking branch 'origin/fix-specs'Philip Arndt2015-05-031-0/+1
|\ \ | | | | | | | | | | | | This makes the specs wait for the JS to be executed, which seems to take some time, unfortunately.
| * | Fix specsBrice Sanchez2015-05-011-1/+4
| | |
* | | Expect to see 'Author' before accessing it.Philip Arndt2015-05-031-1/+1
| |/ |/|
* | Merge pull request #430 from johanb/masterPhilip Arndt2015-04-281-0/+21
|\ \ | |/ |/| Include Dutch I18n
| * Include Dutch I18nJohan Bruning2015-04-281-0/+21
|/
* Merge pull request #428 from mhtremblay/patch-2Brice Sanchez2015-04-101-1/+1
|\ | | | | typo correction
| * typo correctionMarie-Helene Tremblay2015-04-101-1/+1
|/
* Merge pull request #427 from mhtremblay/patch-1Philip Arndt2015-04-021-1/+1
|\ | | | | | | | | Update fr.yml [ci skip]
| * Update fr.ymlMarie-Helene Tremblay2015-04-011-1/+1
|/
* Use have_selector API for greater test reliability.Philip Arndt2015-03-051-1/+2
|
* Run CI against Ruby 2.2, notify Gitter.Philip Arndt2015-03-051-0/+3
|
* Fixed test failures relating to not finding the title.Philip Arndt2015-03-056-9/+17
|
* Merge remote-tracking branch 'anitagraham/rails-4-2'Philip Arndt2015-02-262-2/+3
|\ | | | | | | Closes #419
| * Switch to poltergeist from seleniumAnita Graham2015-02-242-2/+3
| |
* | Merge pull request #418 from refinery/rails-4-2Philip Arndt2015-02-263-9/+9
|\| | | | | Rails 4.2
| * Updated Gemfile definitionsPhilip Arndt2015-02-201-6/+7
| |
| * Update gem globalize (< 5.2) and fix factory_girlBrice Sanchez2015-02-202-2/+1
| |
| * Merge remote-tracking branch 'kevinsmouts/patch-1'Philip Arndt2015-02-201-1/+1
| |\
| | * change friendly_id version from 5.0.0 to 5.1.0Kevin Smous2015-02-101-1/+1
| | |
* | | Merge pull request #420 from refinery/require_filters_spamPhilip Arndt2015-02-252-1/+2
|\ \ \ | |/ / |/| | Require filters_spam only in comment model
| * | Require filters_spam only in comment modelBrice Sanchez2015-02-242-1/+2
|/ /
* | Merge remote-tracking branch 'ratanachai/patch-2'Philip Arndt2015-02-201-2/+5
|\ \
| * | Order of gems in GemfileRatanachai S.2015-02-131-1/+4
| |/ | | | | Add information that gem 'refinerycms-page-images' should be after gem 'refinerycms-blog' in Gemfile.
* | Merge pull request #414 from adrienrusso/patch-1Philip Arndt2015-02-171-3/+3
|\ \ | |/ |/| Remove Harcoded page_url
| * Remove Harcoded page_urlAdrien Russo2015-02-161-3/+3
|/
* Merge pull request #403 from darmens/patch-3Philip Arndt2014-12-081-1/+1
|\ | | | | ru_page_title is available
| * ru_page_title is availableDuccio Armenise2014-12-081-1/+1
|/
* Merge pull request #402 from refinery/rspec-3-xPhilip Arndt2014-12-0517-190/+194
|\ | | | | Rspec 3 x
| * Switched flags to the new SVG locale iconsPhilip Arndt2014-12-043-22/+26
| |
| * refinerycms-settings 3.0.0 was released.Philip Arndt2014-12-041-1/+0
| |
| * Upgrade translation picker API.Philip Arndt2014-12-041-6/+8
| |
| * Upgraded to rspec 3.xPhilip Arndt2014-12-0414-169/+168
|/
* Merge pull request #401 from refinery/revert-400-patch-2Philip Arndt2014-12-041-2/+1
|\ | | | | | | | | Revert "refinerycms-settings 3.0.0 is a dependency" [ci skip]
| * Revert "refinerycms-settings 3.0.0 is a dependency"Philip Arndt2014-12-041-2/+1
|/
* Merge pull request #400 from darmens/patch-2Philip Arndt2014-12-041-1/+2
|\ | | | | refinerycms-settings 3.0.0 is a dependency
| * refinerycms-settings 3.0.0 is a dependencyDuccio Armenise2014-12-041-1/+2
|/
* Updated locale from 'Ru' to the corrected 'ru'.Philip Arndt2014-11-212-3/+3
|
* Removed 2.0.0 from CI, as it's not supported.Philip Arndt2014-11-211-1/+0
|
* Merge pull request #394 from refinery/bugfix/failing-specsPhilip Arndt2014-11-132-1/+4
|\ | | | | Give the test user access to refinerycms_blog extension.
| * Give the test user access to refinerycms_blog extension.Philip Arndt2014-11-122-1/+4
| | | | | | | | Fixes #392
* | Merge pull request #393 from simi/patch-1Philip Arndt2014-11-121-1/+1
|\ \ | |/ |/| | | | | Add Travis badge to README.md. [ci skip]
| * Add Travis badge to README.md.Josef Šimánek2014-11-131-1/+1
|/ | | [ci skip]
* Fix incorrect spec file introduced in a96ffaf51220e928b3fbdfcc4db969cc810f597bPhilip Arndt2014-11-121-1/+0
|
* The backend needs to require jquery-ui/autocomplete since ↵Philip Arndt2014-11-043-0/+4
| | | | refinery/refinerycms#2735
* Added binstubs to ease dummy application use.Philip Arndt2014-11-042-0/+67
|
* Merge pull request #390 from prokopsimek/patch-1Philip Arndt2014-10-111-2/+2
|\ | | | | Update cs.yml
| * Update cs.ymlProkop Simek2014-10-111-2/+2
| | | | | | fix cs locale