Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jul 23, 2010
@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
Commits on Aug 02, 2010
@ugisozols ugisozols added passing cucumber tests for search (available in 'Images', 'File…
…s', 'Inquiries' and 'Pages')
abfad38
@parndt parndt Fixed deprecations in search with how we used acts_as_indexed - updat…
…ed to with_query from find_with_index.
55be5ee
@parndt parndt It's been long enough, goodbye application.rb
This was to make Refinery work under older versions of Phusion Passenger and should no longer be required.
Put it back manually if your project requires it.
cc26323
Commits on Aug 03, 2010
@parndt parndt Fixes superfluous bracket causing error. ca12470
@parndt parndt better note down what happened. 5872039
@parndt parndt We need uploads also. 23caf8a
@parndt parndt Be more specific so we don't get things like "\"/contact\"" as a link…
…_url
d13ed34
@parndt parndt We can't reasonably expect to see this content on the page given that…
… we create the pages with no content.
66ecc1d
@parndt parndt Fixes for Tooltips:
Tooltips were not showing in dialogues, they now are.
Tooltips would not position properly above links, they now do.
The Tooltips' nibs (the arrow) would not sit properly centered above the element if the tooltip had to move for the browser window size, they now do.

Also fixed so that cancel buttons' titles could be completely disabled, before it was buggy.
42e68dc
@bofrede bofrede Made file executable. ac9e830
@bofrede bofrede Make sure the required alt attribute is created. b41d4c6
@bofrede bofrede Fixed invalid HTML in the backend pages listing. d159bd0
Commits on Aug 04, 2010
@parndt parndt Add support for list that passes back full <ul> tags around them. afc9b0e
@parndt parndt Switch HTML5 enabling script to a partial so that it's run by the pag…
…e ASAP otherwise IE *sometimes* doesn't run it.
e46d2b1
@parndt parndt update changelog while trying something new. ed18daa
@parndt parndt bit of formatting c869d3d
@parndt parndt update gemspec and version number [still unreleased] e9e2bfe
@parndt parndt Very important to change the version here, too. 5c53b4c
@djones djones fix XSS vulnerability on page meta information by escaping the releva…
…nt fields properly
1a22834
@ugisozols ugisozols added some cucumber tests. Tried to reduce noise in tests. Introduced…
… :'data-method' => 'delte' to pass 'Delete' tests.
cee7f5f
@ugisozols ugisozols changed wording in cucumber tests cda8e1f
@parndt parndt requires relock? 1ecee35
@parndt parndt Merge remote branch 'ugisozols/master' d68cbb9
@ugisozols ugisozols changed title input field size (when adding new page part) so it woul…
…d fit window
011aab5
@ugisozols ugisozols used translations from locale files and added new rather than hardcod…
…ing titles in views
b235185
@bofrede bofrede Danish translation started. 1caa39c
@bofrede bofrede Danish translation for WYMeditor. 1eb8b4b
@parndt parndt Merge remote branch 'ugisozols/master' 42a80fb
@parndt parndt use CSS class for widest rather than guessing the size 29a4fd3
@parndt parndt Just use the right one instead. Thanks Joe! 3ddbeba
Commits on Aug 05, 2010
@joemsak joemsak Grab the first attribute that is a string, not just the first attribu…
…te, as the dashboard activity reporter
98442ef
Commits on Aug 06, 2010
@parndt parndt Added carousel to admin menu to prevent tab overload. 9696322
@kivanio kivanio added missing translations for pt-BR b11310e
Commits on Aug 07, 2010
@parndt parndt flori has released a new json version (hooray!!) so now we can use th…
…at instead. Closes GH-116
1879a13
@parndt parndt Update changelog and version release date. 696ed19
@parndt parndt Update neglected, forgotten about link. 4ba7138
Commits on Aug 08, 2010
@joemsak joemsak Sortable list connects to '.nested' e4a220e
@joemsak joemsak Placeholder is taller and has some margin 9888d46
@joemsak joemsak Smoother page sorting cc8cc49
@joemsak joemsak Reposition action buttons after smoothing the page sorts 501d05b
@joemsak joemsak Page sorting much less horsey. Maxdepth set to 2 1ca48de
@joemsak joemsak Prevent multiple requests from 'done re-ordering' 58f5c72
@jgdavey jgdavey Refactoring the parse_branch method to speed up update_positions
For something as simple as updating positions, there's no need to instantiate
an AR object. Closer to direct SQL works best here, and speeds up the whole
update_positions action by at least an order of magnitude.

This also seems to help with a infrequent bug where update_positiions with
a tree raises a `stack level too deep` error, in part because the AR objects
are being over-instantiated.
c1a6c7e
@joemsak joemsak Whups forgot the loading icon 0ac3627
@parndt parndt Remove position relative from this div as it interferes with the one …
…on the list item.
da723b6
@parndt parndt Bring back change from rails3 branch for css positioning. f84884a
Commits on Aug 09, 2010
@joemsak joemsak Include plugin factories c1f063d
Commits on Aug 10, 2010
@joemsak joemsak Changelog updates 742aee9
@joemsak joemsak Hiding overflow on dialog boxes is problematic for smaller browser wi…
…ndows
4b89363
@joemsak joemsak Web link insertion binds to paste and change 141e3e4
@joemsak joemsak Changelog updated 5b6ced6
Steven Heidel Copy over most common partials that will be overridden when developin…
…g themes.
9e758ec
Steven Heidel Running refinerycms with -v or --version will now output the version …
…number
4cb1615
@parndt parndt Provide best of both worlds - when your browser window is too small t…
…hen overflow remains on the main document when dialogues are opened. When your browser window is big enough to see the whole window overflow is hidden in the main document.
832b4d0
@parndt parndt Merge remote branch 'stevenheidel/master' 464c95e
@parndt parndt Solves condition where @page[:body] did not exist because the default…
… page parts were changed to something else.
5f8b519
@parndt parndt increment version 91c19e1
@parndt parndt Made the core codebase not rely so heavily on @page[:body] by adding …
…Page.default_parts and using .first on that instead.
77aa0e8
@parndt parndt Document changes, update Gemfile dependency to 0.9.7.12 and relocked. 899d142
@parndt parndt Highlight some key phrases 42ca20b
Commits on Aug 11, 2010
@parndt parndt Suppress an issue with cornering in poor browsers (IE) that would bre…
…ak the rest of the page and strip out whitespacing.
a1b6521
Commits on Aug 12, 2010
@parndt parndt fix issues causing jcarousel to not start properly in IE or other bro…
…wsers that don't return uppercased nodeName by default and no longer have to click twice to navigate right when the carousel first starts in the Refinery backend.
a345900
@parndt parndt Can you believe that if you name anything the same as its DOM id then…
… Internet Explorer 8 will freak out?
ad71267
Commits on Aug 13, 2010
@parndt parndt update wiki link 9358805
Sun added ru locales a238433
Sun added ru locale file 6f7ca32
Sun Merge commit 'origin/i18n' c27a715
Commits on Aug 16, 2010
@parndt parndt Only grab the latest items that are not spam unless the view explicit…
…ly wants spam as well.
61042ca
Sun updated ru locales b91abf8
Sun Merge commit 'origin/i18n' 243c54c
@parndt parndt Merge remote branch 'sunchess/master' 7a4a567
@parndt parndt Get things back to defaults. 89d728b
@parndt parndt Fixed issue with error_404 page where part_symbol didn't exist. (ht: …
…ruprict)
47d48b4
@parndt parndt Fixed reordering for non-tree lists. (ht: ruprict) 4497d38
Commits on Aug 17, 2010
@parndt parndt Rewrote the acts_as_indexed configuration routines to work on Heroku.…
… (ht: ruprict - thanks for testing!)
d4d4b17
@joemsak joemsak Gemfile lock bcdfc7b
@joemsak joemsak For HTML5, <meta charset="utf-8"> is correct and simpler 947fe4c
@joemsak joemsak Semantic HTML5... c745db6
@joemsak joemsak Empty file not referenced in source a06201a
@joemsak joemsak IE7 references correct file 2aa3027
@joemsak joemsak header & footer tags 5fa9562
Commits on Aug 18, 2010
@parndt parndt add back footer div around HTML5 footer tag. df58233
@parndt parndt Sure is useful to put a list inside <ul></ul> tags 75d8cf2
@parndt parndt Use latest versions. 313beb8
@parndt parndt Come on HTML5, let's be better friends <3 7f1804e
Steven Heidel Don't allow html in inquiries to ruin the listing on the front page. …
…Closes GH-146.
ad1e1a2
Commits on Aug 19, 2010
@awagener awagener Search results may as well be paginated too ac67eb3
@joemsak joemsak You can manually toggle the children in menu per rendered partial.
For example, a developer wants her child pages to show up in the
sidebar navigation, but not the main header navigation.

So she can pass :locals => { :hide_children => true } in just the
main navigation rendering.
7208c94
@parndt parndt Port fix to #188 from wymeditor into our application too. efd1304
Commits on Aug 20, 2010
@parndt parndt make like before b765100
@parndt parndt Seems to be loading the page_parts sanely now (i.e. SELECT * FROM pag…
…e_parts WHERE page_parts.page_id IN (1,2,3,4,5) instead of one per query. (ht: Radar)
55b2d60
Steven Heidel Fix 6 failing tests on Ruby 1.9.2 regarding attachments. 0272003
Commits on Aug 21, 2010
@parndt parndt Merge remote branch 'stevenheidel/master' c2db30b
@meskyanichi meskyanichi Implemented all Dutch (NL) internationalization translations based on…
… the already existing English (EN) entrees.
a54ac54
@parndt parndt Merge remote branch 'meskyanichi/master' ea1c192
Commits on Aug 23, 2010
Steven Heidel Updated gemspec. 70f7f77
@parndt parndt Ensure we include the ru locales too. 2ed950a
Commits on Aug 24, 2010
@semaperepelitsa semaperepelitsa translating dashboard to Russian 0b8fdc8
@semaperepelitsa semaperepelitsa load meta description option title from locale 7fe1213
@semaperepelitsa semaperepelitsa correct misspelling a581340
@semaperepelitsa semaperepelitsa translating pages to Russian b1458e5
@semaperepelitsa semaperepelitsa improving Russian translation eb92d1b
@semaperepelitsa semaperepelitsa correcting typo in Russian locale fa48fae
@semaperepelitsa semaperepelitsa removing unnecessary quotes in Russian locale 51ceb63
@semaperepelitsa semaperepelitsa correcting error in Russian locale dedf737
@semaperepelitsa semaperepelitsa removing unnecessary quotes in Russian locale f7c0035
@semaperepelitsa semaperepelitsa translating images plugin to Russian 5964c1b
@semaperepelitsa semaperepelitsa typography improvements in resources plugin's Russian locale a1420b7
@semaperepelitsa semaperepelitsa improvements in resources plugin's Russian locale 8531ed8
@semaperepelitsa semaperepelitsa improving Russian locales 67c2c81
@semaperepelitsa semaperepelitsa improving refinery_settings plugin's Russian locale dc11f8a
@semaperepelitsa semaperepelitsa improving auth plugin's Russian locale f44a6d0
@semaperepelitsa semaperepelitsa improving inquiries plugin's Russian locale bd2cdd2
@semaperepelitsa semaperepelitsa updating quotes to standard russian quotes f8c137b
@semaperepelitsa semaperepelitsa correcting typo in Russian locale 8b851df
@semaperepelitsa semaperepelitsa improving refinery_setting plugin's Russian locale 355fdd5
@ruprict ruprict Add view= to a couple of refinery:override example texts e887e5b
@parndt parndt Merge remote branch 'ruprict/master' 0579c02
Commits on Aug 29, 2010
@parndt parndt Update references to the master branch to the rails2-stable branch in…
…stead.
1b8e0bb
Commits on Aug 30, 2010
@parndt parndt Update the changelog from 0.9.7.12 -> 0.9.7.13 (we forgot, oops) ad1a00c
@frederico frederico when i generate an plugin without attributes with string type this in…
…it file is gettiing fail. the change is check if atributes is an empty array.
bdbb6b5
Commits on Sep 30, 2010
@parndt parndt re-'bundle install'. 4da8628
@parndt parndt Backport wymeditor changes/fixes. ae8fcc7
Commits on Oct 05, 2010
@parndt parndt Eventually there will be a 0.9.7.14 so prepare it now. d883e9a
@parndt parndt Using rails 2.3.9, fixed one deprecation. I'm not bothering with the …
…i18n deprecation as we fixed that in rails3 anyway.
1ae18d1
Commits on Oct 12, 2010
@djones djones fix issue where the dialog doesn't insert images on any wymeditor field 8431dcf
@djones djones backport the latest wymeditor from master in order to fully fix the i…
…mage insert issue
b25b430
@parndt parndt regenerated gemspec dfd5300
Commits on Oct 13, 2010
@parndt parndt Fix deprecations in i18n so that client apps don't have the complaints. 3543a93
@parndt parndt Fix deprecation notices from the 'returning' function which is now .t…
…ap on whatever it was using.
9248a80
@parndt parndt Tell the codebase it's a future version. 82ca654
@parndt parndt Updated example Gemfile to reference current version number. fe70dc1
@parndt parndt Note down changes 4300b5e