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: refinery/refinerycms
...
head fork: refinery/refinerycms
Commits on Jul 30, 2010
Steven Heidel Locking the bundle. 09833a8
Steven Heidel Fix merge conflict. 1384a0a
@ugisozols ugisozols removed duplicate error message in file validation 1fc4643
@ugisozols ugisozols added missing confirmation message when deleting resource (previously…
… was using wrong translation entry)
4d275fc
@ugisozols ugisozols multiply MAX_SIZE_IN_MB constant in resource validation error message…
… so it returns correct value for kb/mb etc.
5a673c1
@parndt parndt after many frustrating debugging efforts when the simple problem was …
…being logged in, we are now able to disable individual CSS/JS included by the site bar. Example provided in demolicious theme layout (everything not excluded by default, which is to say the status quo is maintained by default).
20c3213
@parndt parndt Reverts a couple of assumptions made in Ruby code and move them to co…
…nditional Javascript code instead.
8a320aa
Steven Heidel Fix another merge conflict with Gemfile.lock e2ec8f7
@ugisozols ugisozols leave commas in translation files as not every language require them …
…in the same place
5b6a313
Steven Heidel Fixed a bug with adding new resources. dcf016f
Steven Heidel Updated schema.rb b4b3a62
@djones djones fix typo in theme documentation 9db0b1c
Commits on Jul 31, 2010
@ugisozols ugisozols Merge remote branch 'resolve/master' 4c6efc5
@ugisozols ugisozols in image and resource model added .megabytes method call on MAX_SIZE_…
…IN_MB in file size validation error message
5e7e537
@parndt parndt Merge remote branch 'stevenheidel/master' f27041f
@parndt parndt Merge remote branch 'ugisozols/master' 856f460
@ugisozols ugisozols added missing confirmation message when deleting inquery (previously …
…was using wrong translatn entry)
5bcfb6f
@ugisozols ugisozols moved 'Inbox' and 'Spam' words to locale files and using their transl…
…ation in inqueries submenu rather than hardcoding them in view
abb1f0e
@ugisozols ugisozols fix 'Upload a file' link not showing in dashboard quick tasks 187e559
Commits on Aug 01, 2010
@parndt parndt Merge remote branch 'ugisozols/master' dba285a
@ugisozols ugisozols removed 'Inbox' and 'Spam' translation entries from all language loca…
…le files (except English locale) as they were in English and in production if translation is missing it falls back to English
0dc2a88
@ugisozols ugisozols fixed search so it actually searches trough inquiries (ham & spam sep…
…erated). Now escaping all search queries when they are shown back to user. Made 'Pages' search messages just like on other pages
79b2925
@parndt parndt Merge remote branch 'ugisozols/master' 96b3b37
@parndt parndt prepare for a future release. d8ad843
@parndt parndt cleanup 74a9fd1
@parndt parndt show how to check e7f6f56
@parndt parndt try nesting lists. 7b6272e
@parndt parndt hyphens hold the answer. 104af95
@parndt parndt Fix confirmation issue on new records. 7948948
@parndt parndt Ok, new version. d311e04
Something went wrong with that request. Please try again.