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: resolve/refinerycms
...
head fork: resolve/refinerycms
This comparison is big! We're only showing the most recent 250 commits
Commits on Jul 09, 2010
@parndt parndt Add ability to specify that a page is the home page to fix failing Sc…
…enario: Not logged in in features/refinery/site_bar.feature
ef212a2
@kivanio kivanio missing portuguese translation added 9c4759a
@kivanio kivanio missing english translation added 297a9e0
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  Add ability to specify that a page is the home page to fix failing Scenario: Not logged in in features/refinery/site_bar.feature
  Removing this else clause because it makes zero sense. Why would we want to be rendering the :new action again here?
  Ensure that we have a RefinerySetting to use, fixes failing Scenario: When there are no users, you can create a user in features/refinery/manage_users.feature
  provide find_or_set because the site name may not be set here yet.
  Update dependencies and relock, made sure schema.rb reflected latest version. All tests passing.
  lock the gems in
11236b8
@parndt parndt put upgrade logic that is specific to the main routes file into a con…
…ditional block
bcc3451
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  put upgrade logic that is specific to the main routes file into a conditional block
9ec5635
@parndt parndt Got a bit over eager removing this before. 8dae994
@parndt parndt Gemfile relocked to mirror extra require to acts_as_indexed gem depen…
…dency.
6e7f5fa
@kivanio kivanio missing portuguese translation added a71f2c0
@kivanio kivanio missing english translation added 5ec723f
@parndt parndt mark as html_safe 187ba16
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  mark as html_safe
  missing english translation added
  missing portuguese translation added
  Gemfile relocked to mirror extra require to acts_as_indexed gem dependency.
  Got a bit over eager removing this before.
d773e98
@kivanio kivanio small changes to make more meaning in portuguese 8938cc5
@kivanio kivanio new keys and translations for en and pr-BT dadb764
@kivanio kivanio missing portuguese translations for wymeditor 620332f
@kivanio kivanio missing portuguese translation for dashboard fe7f4e7
@kivanio kivanio adjusted portuguese translation for images e4d8ad2
@kivanio kivanio adjusted portuguese translation for authentication 3d4f5ec
Commits on Jul 11, 2010
@parndt parndt Ensure that pressing cancel on form actions doesn't redirect back to …
…the current form after a create or update action, round entire wym_box and red border it on error. Update example gem versions.
c35deff
Commits on Jul 12, 2010
stevenheidel Switched main install task to 'refinerycms' instead of 'refinery' to …
…avoid conflicts with a gem of the same name.\n\nThe task 'refinery' is still available and simply calls 'refinerycms' to do the work.
699627c
@parndt parndt These are not helpful. 0f481a7
@parndt parndt Refactor rake test:refinery to allow loading tests from registered pl…
…ugins for greater modularity.
4e6906b
@parndt parndt Prepare for a future version release. 3ed74e8
@parndt parndt apparently we need a relock now. d22ed32
@parndt parndt Regenerate gemspec 57dc7e6
stevenheidel Switched main install task to 'refinerycms' instead of 'refinery' to …
…avoid conflicts with a gem of the same name.\n\nThe task 'refinery' is still available and simply calls 'refinerycms' to do the work.
bacaa25
@parndt parndt First, educate users. 9945267
@parndt parndt Document Steven's change 3ab9013
@parndt parndt We'll need the new task in the gemspec, then. 7b31a02
@parndt parndt Automate the generation of bin tasks so that they don't get forgotten. 9601605
@parndt parndt Ensure we update lib/refinery too ddadddf
@parndt parndt only round top left corner when we're not inside tabs. 028a4de
@parndt parndt use more valid CSS. 160041e
stevenheidel Merge conflict resolved. f8c6b22
stevenheidel Fixed a bug preventing new refinery settings from being shown to regu…
…lar users.
377d18d
Commits on Jul 14, 2010
@parndt parndt This should be happening in the Gemfile... a131ae8
@parndt parndt This is the only way that this command will work in Ruby 1.9.2 - by e…
…ntering the directory using 'cd' instead of Dir.chdir

Also ensure that bundler is available before the command runs by telling the user to install it.
ba2e9e9
@parndt parndt We don't need to raise, we can just puts and exit. f02841b
Commits on Jul 15, 2010
@parndt parndt Tightened up security around inserting images and resources (you can …
…no longer upload an image or resource inside the dialogues if you can't access the plugin itself). Also allows users to insert an image or resource that was previously uploaded even if they can't access the rest of the plugin. Fixed pagination on resource dialogues. Closes GH-110
c277395
@parndt parndt Fixes typo introduced with last commit that set pages per dialog to 1…
… not 12.
8427844
@parndt parndt No longer allow users to run this task if their apps already contain …
…a Gemfile as the results could be explosive.
81c654c
@parndt parndt Update changelog and gemspec. 5928049
@parndt parndt Don't run the refinerycms task for the user, make them run it. Copy .…
…gitignore in a rake refinery:update
dd77a75
@parndt parndt Wonder why that wasn't html.erb 1e254f2
@parndt parndt Add support for an extra per page setting for dialogs with sizing opt…
…ions like that used in the wymeditor.
1568ce2
@parndt parndt Bit easier to read, really. Dialog can be a bit smaller. 4315d12
@parndt parndt slight CSS redux a529b85
@parndt parndt Regenerated gemspec to encompass all the changes of late. 16d5b95
@parndt parndt document final change 4cafe27
@parndt parndt Link love d1b72bd
@magpieuk magpieuk Fix for Mysql Specific code 12db7ee
@parndt parndt Fixes singular_name into the interpreted version so that locales work…
… in generated plugins.
99cadf5
@parndt parndt Update changelog d7cc36c
Commits on Jul 16, 2010
@parndt parndt update changelog for Lee's change. 905c13a
Commits on Jul 17, 2010
@djones djones fix broken link a18b365
Commits on Jul 19, 2010
@parndt parndt Rework the way that dialogues work internally and hook into a dialogu…
…e on the greeting message.
8614512
@parndt parndt Report the correct task to run and add separate stylesheets for diffe…
…rent IE versions (sigh). Update version number for when we next release.
ae8cc4a
@parndt parndt Just tidier and easier to read. d1460a2
@parndt parndt Don't need the ternary, it'll return nil if the condition is false an…
…yway.
6a3c645
@parndt parndt Remove sham begin without any rescue and redirect after setting every…
…thing else.
420aa10
@parndt parndt was just too long. 32316b5
@parndt parndt whoops. c04c2da
@parndt parndt readability. 2630d75
Steven Heidel Refactored Version slightly to allow for specific parts of the versio…
…n (major, minor, tiny, or build) to be accessed.

This could be useful for plugin authors to ensure that their plugins are backwards compatible.
7eb61c3
@parndt parndt Support redirecting back to the session[:return_to] when we save a se…
…tting from the dialogue.
0b7548f
@djones djones fix syntax error in existing resource dialog b225f68
@djones djones fix resource picker that just disappears on load. Now it won't do that d1f6f83
Steven Heidel Refactored .gitignore file so that it is easier to read.
Also added ignores for Redcar.
e50bdf5
Steven Heidel Merge branch 'master' of git://github.com/resolve/refinerycms c995d3d
Steven Heidel Moved translation tasks to lib/tasks in order to fix deprecation warn…
…ing.
6a52942
Steven Heidel Added task refinery:test_all to run test_unit, rspec, and cucumber. T…
…ests remain buggy however.
dd36785
@parndt parndt Thanks, Steven. 7244e85
@parndt parndt IE... b31627f
@parndt parndt Use latest placeholder shim from http://github.com/parndt/jquery-html… e5d75f1
@parndt parndt Merge remote branch 'stevenheidel/master' dd4f12b
Commits on Jul 20, 2010
@parndt parndt Refresh gemspec, fix whitespace and translate the user mailer properl…
…y as I18n.translate('.link_to_reset_your_password') doesn't seem to work the same as t('.link_to_reset_your_password')
e1029d9
@joemsak joemsak Positioning bug in dialog boxes 6732842
@parndt parndt Additional to Joe's last commit, it is important that form-actions in…
…side iframes have position: fixed so that scrolling works with the effect of the form-actions still sitting at the bottom of the dialogue window.
f54854e
@parndt parndt Come on, IE. Just because there's something on the page with this dom…
… ID doesn't mean I wanted it unless I document.getElementById() or it.

When selecting something, it helps IE if you don't call your variable the same thing as an existing DOM ID on the page.
2172f6d
@djones djones don't load rake tasks in twice that already belong to this application. c70b15b
@parndt parndt OK, so more stuff happened. Oh and we released a new version. 3c90fd5
@parndt parndt Last minute fix added. 18d1a9a
@djones djones new google group url 0f76986
@djones djones update dashboard feature 459044b
@djones djones the binary is called refinerycms now not refinery a74168f
Steven Heidel Added cucumber and gherkin to the Gemfile. This will ensure that (in …
…/home/steven/refinerycms/master) works correctly.

If you are still having problems then uninstall all other versions of cucumber and gherkin than those specified in the Gemfile.
824c688
@parndt parndt Use a version of cucumber that supports spork and use spork as the de…
…fault on OS that isn't Windows. Remove hardcoded config.gem specified by cucumber as we use Bundler and don't need them.
a0743e3
@parndt parndt put rspec back. a0c08a3
@parndt parndt We need spork to be filtered by OS, not launchy. 94277cf
@parndt parndt relock. ebdba74
@awagener awagener Merge branch 'master' of github.com:awagener/refinerycms 74d150c
@awagener awagener Readded quotes accidentally removed in commit df64890, causes resourc…
…e picker to throw undefined method 'titleize' NoMethodError
6575458
@parndt parndt You know, we seem to be working just fine without locking you to gher…
…kin 2.0.2 since we removed config.gem from cucumber.rb environment file.
69ee5bb
@awagener awagener Add db/seeds directory if it doesn't exist when generating a new plugin 50e554f
@parndt parndt Merge remote branch 'awagener/master' 7239c47
@parndt parndt Merge branch 'cucumber-testing' c1965ea
@jamesfid jamesfid Fixed mswin inclusion/exclusion criteria. 8329ca1
Commits on Jul 21, 2010
@jamesfid jamesfid Fixed inclusion/exclusion for win32 system requirements in Cucumber. 7844f9a
@parndt parndt whitespace b6848ec
Steven Heidel Updated installation steps for Heroku deployment. 7453c36
@parndt parndt Seems I have a new spec_helper.rb modification 3cbe582
@parndt parndt Merge remote branch 'stevenheidel/master' a4a2cec
@joemsak joemsak The stupid password fields keep auto filling in supported browsers...…
… eff that
79da21c
Steven Heidel Remove config/stuff.yml from the .gitignore file on a gem install so …
…that it is easier to deploy.
6a5e226
@parndt parndt Merge remote branch 'stevenheidel/master' 3ce4e49
Steven Heidel That deserves a mention in the changelog. 749b705
@parndt parndt OK, we can use rmagick 2.12.0 - might help out Windows users. 8547e21
@parndt parndt Seems this is required for rake refinery:test_all edcde0b
@parndt parndt DRY up the readme given community resources now available thanks to s…
…tevenheidel.
6436009
@parndt parndt Merge remote branch 'stevenheidel/master' 67c527f
@parndt parndt better test command.. cf7e03a
@djones djones rearranged the readme a little. Will shift the S3 instructions and ho…
…w to update refinery to a tutorial soon so we don't have to put that in our readme file
0b6135b
Commits on Jul 22, 2010
@parndt parndt Renamed rake refinery:test_all to rake test:refinery which was an exi…
…sting task but now runs spec and cucumber and benchmark too.
36537ef
@parndt parndt Make sure that the version is incremented, remove empty rake file and…
… reject more things in the gemspec like log files.
2f5e618
@parndt parndt Encourage testing. 3f953d8
@parndt parndt Only use a fallback when one is specified. 3dd1f7d
@ken-guru ken-guru translated all english text sections to Norsk Bokmål. 0520653
@ken-guru ken-guru fixed one syntax error and one indentation error 36514d0
@ken-guru ken-guru changed wording on Dashboard list e5e011e
@joemsak joemsak When unchecked, settings restrictions save as nil, which still restri…
…cts them from regular users. A before_save callback sets it to false if it is submitted as nil
60e3a01
@parndt parndt Merge remote branch 'ken-guru/master' 834762d
Steven Heidel ToDo's tend to look better when there is less on them.
It looks like mostly everything is covered here, anything more long term can go on the 'suggestions' wiki page.
1f16e72
Steven Heidel Updated the readme, mainly just making links more current. 0dca73c
Commits on Jul 23, 2010
@parndt parndt Settings weren't re-caching when using RefinerySetting[]= 5d2f6df
@parndt parndt Allow delete confirmation prompt to be overriden (and thus localised)…
…, DRYed up the images locales, ensure that delete buttons have titles and fixed issue where the delete button wasn't working in some cases on forms' form_actions. Closes GH-112
c510e1a
@parndt parndt Fix condition where image thumbnail was nil. 8ac2d4b
@parndt parndt Merging Amanda's changes to placeholder shim. bb209ee
@parndt parndt prepare for release today. 13a7a18
@djones djones updated readme to be shorter, moved a few how tos into tutorials on t…
…he tutorial site
054156c
stevenheidel Corrected test rake task. 99ef97d
@parndt parndt How to... c8b4b05
@parndt parndt Merge remote branch 'stevenheidel/master' 65c23a6
@djones djones move testing instructions into a tutorial df824ca
@parndt parndt RSpec now only runs once when you run it. Refactored where the extra …
…load logic went to get it into vendor.
6b03f5f
@parndt parndt Remove lib/refinery from client apps on update. 6653d05
@parndt parndt replace copy logic with rm logic. f942e96
@parndt parndt Dialog was incorrectly sized and closed even on an error on save click. 8daf954
Commits on Jul 24, 2010
Steven Heidel Don't record analytics when a user is logged in and admiring their site. 211f50f
@parndt parndt Disrobe, looks better without it.. 52c0a50
@parndt parndt This more accurately generates what we want to say. fa6f697
Steven Heidel Started to add an .rss feed to the dashboard.
However, recent_activity is very confusing and will probably need to be refactored.
43353d3
Commits on Jul 25, 2010
@parndt parndt The home_page? of any given application is actually when it matches t…
…he root_url against the current request.path so that's what I've changed this to..
54ebb30
@parndt parndt readability win. 1eda791
Steven Heidel Merge branch 'master' of git://github.com/resolve/refinerycms 504e6ef
Steven Heidel Quote: 'The API needs to happen.' d08c8ae
@djones djones updated the todo list to reflect the 1.0 release requirements a321e5e
@parndt parndt Merge remote branch stevenheidel/master and solve conflict(s). 79f3c12
Commits on Jul 26, 2010
@parndt parndt I totally cuked on the plane today. 81a47d9
@andrewhavens andrewhavens Now hiding Eclipse .project files 365e4cf
@parndt parndt Add another feature - creating an invalid inquiry and add more steps …
…to the valid inquiry and its support files.
f025473
@parndt parndt Moved inquiries feature to create_inquiries and create a new manage i…
…nquiries feature for the backend.
8a61be7
@parndt parndt Add feature for seeing the list of inquiries when one exists. 065ca77
@parndt parndt Clean whitespace, terminate double quotes inside cucumber paths and w…
…rote a test for inquiries show feature.
8e40697
@parndt parndt Wrote destroy test for inquiries. This has revealed that the flash no…
…tices for destroys aren't showing up. Todo: fix.
5150fe9
@jamesfid jamesfid Initial cucumber run commit. fd51e14
@jamesfid jamesfid Here are the step files/uploads dir 456bd25
@jamesfid jamesfid Revert "Initial cucumber run commit."
This reverts commit fd51e14.
146af8f
@jamesfid jamesfid We need more Cucumbers. 4a7140f
@jamesfid jamesfid Revert "We need more Cucumbers."
This reverts commit 4a7140f.
de87d42
@jamesfid jamesfid The more cucumbers, the better. d989d7e
@jamesfid jamesfid The more cucumbers, the better. 83cfa51
@parndt parndt document why test fails. 84a55cc
@parndt parndt flash.now was inhibiting destroy flashes as revealed in cucumber feat…
…ures.
76ea26e
@parndt parndt Merge remote branch 'jamesfid/master' fd2d6a6
@parndt parndt relock 0d104b2
Steven Heidel Tag all the cucumber features. 1f28f4f
Commits on Jul 27, 2010
@parndt parndt press not click 203c473
@parndt parndt There may be a log out button 05389cf
@parndt parndt Document language option on dashboard through cucumber a6bdbc0
@parndt parndt Fix some features, still a couple broken because of confirmation dial…
…ogues etc.
49e8b95
@parndt parndt Make this feature do what it is supposed to which fails. ea1e1aa
@parndt parndt logged in user was too ambiguous. 5fc0f7e
@parndt parndt When we change the language to something other than English we have t…
…o change it back or the site remains in say, Slovenian, and throws out all the other features.
1ae42e0
@parndt parndt Add scenario for adding a new page from the Dashboard which should re…
…turn to the Dashboard etc.
9f6052b
@jamesfid jamesfid Added image steps/features. a7cc0c1
@jamesfid jamesfid Cleaned up files/images features. Commented out failing delete scenar…
…ios in each.
98d9047
@jamesfid jamesfid Minor tweaks to images feature. 57085c8
@parndt parndt No wonder cucumber couldn't find the Message label, they were just bo…
…lded text.
f4fc1de
@parndt parndt Should always use path not url 63c0f50
@parndt parndt Whitespace and readability. 5d08362
@parndt parndt Sometimes you end up with 'nothing' commits. de4fc09
Commits on Jul 28, 2010
@parndt parndt Plugin's name is now refinery_pages 0916e9b
@parndt parndt Default url prefix to edit 8532416
@levicole levicole generate basic skeleton of a theme 34efb56
@djones djones fix left over merge tag 74299e3
@djones djones default the acitivity reporting api to use 'title' as the title attri…
…bute. This syncs it up with the same title default used in crud.rb too. Also keep the use of double quotes consistent
4a5c085
@djones djones halfway through renaming the refinery generator to the refinery_plugi…
…n generator and adding in the new refinery_theme generator
93d75a2
@djones djones improving the instructions 65f5c2d
@djones djones Improve the docs a little. lock using latest bundler. 01d8faf
@djones djones moving stuff around to make it work. At this point both generators do…
… work. Just need to tidy up and test
80f05b2
@djones djones use examples that work on Windows too 98efc9f
@djones djones ensure a theme name is supplied before creating a theme 14d8cf0
@djones djones taking out the sexy. Adding better and more accurate coverage of files fe2564a
@djones djones adding in tests. not done yet but basic structure there 1ca2d26
@djones djones fix typo 52deb9c
@djones djones cucumber tests now pass for both generating new themes and plugins bb00224
@djones djones oops this file required for passing tests 3390f33
@djones djones fix missing locale when generating a plugin 18dc810
@djones djones add deprecation instructions to the existing refinery generator bcf4337
@djones djones update documentation about themes to include the new generator b392d35
@djones djones Merge remote branch 'djones/master' 1c3dd06
@djones djones updated changelog to reflect changes made to the generators 635875a
@djones djones Fix typo in changelog 5bf0185
Commits on Jul 29, 2010
@parndt parndt Fix quirks in older versions of Refinery upgrading to this one. a0be695
@parndt parndt tidy up, prepare for new version next time it's due. 2a62284
@parndt parndt new lock bbe32aa
@parndt parndt Refactor to use pathname in far more places, cleaned up code. Closes G… f28b876
@parndt parndt Eradicate page_translations -- where did this come from? We don't use…
… it, no model for it.. gone
5f50283
@parndt parndt ensure the next version contains the correct gem version 5fd8b79
@parndt parndt Updated the dreaded changelog. 7fd5704
@parndt parndt tick tick, tick tick 8dae18a
Commits on Jul 30, 2010
@parndt parndt Support email addresses in the username field using slugs. However, t…
…his doesn't change the fact that you can use either field to login. Relates to and closes GH-101
b118d4e
Steven Heidel Locking the bundle. 09833a8
@parndt parndt Still can't have passing tests, it seems. 26a209f
@parndt parndt This seems like a bad idea. ec20f81
@parndt parndt Appears to fix failing inquiries delete test by using envjs ac4eec0
Steven Heidel Fix merge conflict. 1384a0a
@parndt parndt not worth it just to test delete. cb65ee5
@ugisozols ugisozols workaround in cucumber inquiries feature for iframes. 05b047d
@parndt parndt 32 scenarios (32 passed) 258 steps (258 passed) 58d23d9
@parndt parndt All forms should be able to know whether they are modal or dialog or …
…not just by including the form actions partial.
c3eeb73
@parndt parndt Time for a new version, document recent changes. 5c2a99c
@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