Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: holli/comfortable-mexican-sofa
...
head fork: holli/comfortable-mexican-sofa
Commits on Feb 14, 2012
@holli injection test added 937d85b
@GBH GBH Merge pull request #151 from holli/injection_example
injection test added
e7ac91c
@GBH GBH tag params are properly escaped 0d74da2
Commits on Feb 21, 2012
@GBH GBH removing fixture files will clear page block e0912a0
@GBH GBH drawing a line 490d7aa
@GBH GBH Version bump to 1.6.12 6906252
@GBH GBH Regenerate gemspec for version 1.6.12 41cd57a
Commits on Feb 23, 2012
@GBH GBH mirroring functionality works now (kinda... but better!) d47e981
@GBH GBH Version bump to 1.6.13 d9bb832
@GBH GBH Regenerate gemspec for version 1.6.13 64d4d14
@GBH GBH locale file update b01f0b7
Commits on Feb 24, 2012
@GBH GBH allowing dots to be a part of the page slug 76ab0af
@GBH GBH Version bump to 1.6.14 2401d08
@GBH GBH Regenerate gemspec for version 1.6.14 4aa5bae
Commits on Feb 28, 2012
@GBH GBH fixing a route, some minor css 75bdea8
Commits on Mar 01, 2012
@GBH GBH bumping testing gemfiles 55155ab
Commits on Mar 02, 2012
@GBH GBH fixed test helper 336e417
Commits on Mar 07, 2012
@igmarin igmarin Small fix to link in spanish 1f691a4
@GBH GBH Merge pull request #158 from igmarin/patch-2
Small fix to link in spanish
75ead2c
Commits on Mar 08, 2012
@rubenfonseca rubenfonseca category name should be scoped on site too b3fb744
Commits on Mar 14, 2012
@cbrunsdon cbrunsdon Add a japanese translation 58f1a31
@cbrunsdon cbrunsdon And actually use the right key for the ja locale... 9ac91a2
Commits on Mar 15, 2012
@GBH GBH Merge pull request #161 from degica/ja_locale
Japanese locale
adc5120
@GBH GBH Merge pull request #160 from rubenfonseca/master
scope category names on site too
cd20a20
@GBH GBH now you can have fields with rich_text 86d8d41
@GBH GBH dealing with rails 3.2 deprecation warning 6da93cb
@GBH GBH different 404 handling 602e51b
@GBH GBH Version bump to 1.6.15 6c32e12
@GBH GBH Regenerate gemspec for version 1.6.15 8caa8f4
@GBH GBH bad test, and adjusting translations a bit 0a4f422
@GBH GBH Version bump to 1.6.16 8a27c92
@GBH GBH Regenerate gemspec for version 1.6.16 accf834