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 23, 2010
@parndt parndt replace copy logic with rm logic. 37fc1af
@parndt parndt Dialog was incorrectly sized and closed even on an error on save click. 924b962
Commits on Jul 24, 2010
Steven Heidel Don't record analytics when a user is logged in and admiring their site. e39b642
@parndt parndt Disrobe, looks better without it.. a62057b
@parndt parndt This more accurately generates what we want to say. 36e9815
Steven Heidel Started to add an .rss feed to the dashboard.
However, recent_activity is very confusing and will probably need to be refactored.
866209e
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..
82a9c67
@parndt parndt readability win. aae2754
Steven Heidel Merge branch 'master' of git://github.com/resolve/refinerycms e9fe2bf
Steven Heidel Quote: 'The API needs to happen.' 4dc4e87
@djones djones updated the todo list to reflect the 1.0 release requirements 0fff1d3
@parndt parndt Merge remote branch stevenheidel/master and solve conflict(s). 7baae7a
Commits on Jul 26, 2010
@parndt parndt I totally cuked on the plane today. 6e7e038
@andrewhavens andrewhavens Now hiding Eclipse .project files c7af564
@parndt parndt Add another feature - creating an invalid inquiry and add more steps …
…to the valid inquiry and its support files.
8ded35a
@parndt parndt Moved inquiries feature to create_inquiries and create a new manage i…
…nquiries feature for the backend.
98f02f1
@parndt parndt Add feature for seeing the list of inquiries when one exists. e1cb006
@parndt parndt Clean whitespace, terminate double quotes inside cucumber paths and w…
…rote a test for inquiries show feature.
bee40c6
@parndt parndt Wrote destroy test for inquiries. This has revealed that the flash no…
…tices for destroys aren't showing up. Todo: fix.
230f918
@jamesfid jamesfid Initial cucumber run commit. 51dc597
@jamesfid jamesfid Here are the step files/uploads dir 01810dd
@jamesfid jamesfid Revert "Initial cucumber run commit."
This reverts commit fd51e14.
f805b2a
@jamesfid jamesfid We need more Cucumbers. 2be6077
@jamesfid jamesfid Revert "We need more Cucumbers."
This reverts commit 4a7140f.
dd303dc
@jamesfid jamesfid The more cucumbers, the better. 24b0322
@jamesfid jamesfid The more cucumbers, the better. a733977
@parndt parndt document why test fails. 394eeeb
@parndt parndt flash.now was inhibiting destroy flashes as revealed in cucumber feat…
…ures.
cdcf783
@parndt parndt Merge remote branch 'jamesfid/master' 8210bc4
@parndt parndt relock 537a811
Steven Heidel Tag all the cucumber features. 1f11b20
Commits on Jul 27, 2010
@parndt parndt press not click aee59bb
@parndt parndt There may be a log out button e7f43e2
@parndt parndt Document language option on dashboard through cucumber 2c83dec
@parndt parndt Fix some features, still a couple broken because of confirmation dial…
…ogues etc.
1c78b7c
@parndt parndt Make this feature do what it is supposed to which fails. 5d6fcd1
@parndt parndt logged in user was too ambiguous. fbb4a21
@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.
0e2ac88
@parndt parndt Add scenario for adding a new page from the Dashboard which should re…
…turn to the Dashboard etc.
5945301
@jamesfid jamesfid Added image steps/features. 4124f12
@jamesfid jamesfid Cleaned up files/images features. Commented out failing delete scenar…
…ios in each.
53881bf
@jamesfid jamesfid Minor tweaks to images feature. bebc68d
@parndt parndt No wonder cucumber couldn't find the Message label, they were just bo…
…lded text.
f1a049c
@parndt parndt Should always use path not url 82bab5c
@parndt parndt Whitespace and readability. ba308f9
@parndt parndt Sometimes you end up with 'nothing' commits. 9363ac5
Commits on Jul 28, 2010
@parndt parndt Plugin's name is now refinery_pages a025db2
@parndt parndt Default url prefix to edit 31bd7b1
@levicole levicole generate basic skeleton of a theme b3619aa
@djones djones fix left over merge tag 0a83d47
@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
75b34aa
@djones djones halfway through renaming the refinery generator to the refinery_plugi…
…n generator and adding in the new refinery_theme generator
a94fab0
@djones djones improving the instructions 682185d
@djones djones Improve the docs a little. lock using latest bundler. 30945ec
@djones djones moving stuff around to make it work. At this point both generators do…
… work. Just need to tidy up and test
509b394
@djones djones use examples that work on Windows too 35e8772
@djones djones ensure a theme name is supplied before creating a theme 8cb7dca
@djones djones taking out the sexy. Adding better and more accurate coverage of files d0a9211
@djones djones adding in tests. not done yet but basic structure there 41197d1
@djones djones fix typo c5cbaaa
@djones djones cucumber tests now pass for both generating new themes and plugins b5dcc62
@djones djones oops this file required for passing tests 657b354
@djones djones fix missing locale when generating a plugin f7dd007
@djones djones add deprecation instructions to the existing refinery generator cfaa0b3
@djones djones update documentation about themes to include the new generator a0915d6
@djones djones Merge remote branch 'djones/master' c004578
@djones djones updated changelog to reflect changes made to the generators 5a04768
@djones djones Fix typo in changelog 53bbacf
Commits on Jul 29, 2010
@parndt parndt Fix quirks in older versions of Refinery upgrading to this one. 5fb4627
@parndt parndt tidy up, prepare for new version next time it's due. b0c26cb
@parndt parndt new lock 7531e79
@parndt parndt Refactor to use pathname in far more places, cleaned up code. Closes G… 56b990c
@parndt parndt Eradicate page_translations -- where did this come from? We don't use…
… it, no model for it.. gone
e92ae22
@parndt parndt ensure the next version contains the correct gem version 25c05dc
@parndt parndt Updated the dreaded changelog. b60b7e3
@parndt parndt tick tick, tick tick 2c29152
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
723e4e4
Steven Heidel Locking the bundle. c5b4c08
@parndt parndt Still can't have passing tests, it seems. 67307b2
@parndt parndt This seems like a bad idea. df3e5b9
@parndt parndt Appears to fix failing inquiries delete test by using envjs 1a10c15
Steven Heidel Fix merge conflict. a88be26
@parndt parndt not worth it just to test delete. 40a1975
@ugisozols ugisozols workaround in cucumber inquiries feature for iframes. 60cd2f7
@parndt parndt 32 scenarios (32 passed) 258 steps (258 passed) 5733796
@parndt parndt All forms should be able to know whether they are modal or dialog or …
…not just by including the form actions partial.
4afd91d
@parndt parndt Time for a new version, document recent changes. b525e4b
@ugisozols ugisozols removed duplicate error message in file validation 6562bc7
@ugisozols ugisozols added missing confirmation message when deleting resource (previously…
… was using wrong translation entry)
77b96d5
@ugisozols ugisozols multiply MAX_SIZE_IN_MB constant in resource validation error message…
… so it returns correct value for kb/mb etc.
35f2f87
@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).
c46b514
@parndt parndt Reverts a couple of assumptions made in Ruby code and move them to co…
…nditional Javascript code instead.
704067e
Steven Heidel Fix another merge conflict with Gemfile.lock 993c3b1
@ugisozols ugisozols leave commas in translation files as not every language require them …
…in the same place
6bab32b
Steven Heidel Fixed a bug with adding new resources. 41c1cee
Steven Heidel Updated schema.rb 7e570cd
@djones djones fix typo in theme documentation 0885831
Commits on Jul 31, 2010
@ugisozols ugisozols Merge remote branch 'resolve/master' 2c8b912
@ugisozols ugisozols in image and resource model added .megabytes method call on MAX_SIZE_…
…IN_MB in file size validation error message
22a826f
@parndt parndt Merge remote branch 'stevenheidel/master' 80753a0
@parndt parndt Merge remote branch 'ugisozols/master' b034fec
@ugisozols ugisozols added missing confirmation message when deleting inquery (previously …
…was using wrong translatn entry)
7996978
@ugisozols ugisozols moved 'Inbox' and 'Spam' words to locale files and using their transl…
…ation in inqueries submenu rather than hardcoding them in view
e28658f
@ugisozols ugisozols fix 'Upload a file' link not showing in dashboard quick tasks e1b58ba
Commits on Aug 01, 2010
@parndt parndt Merge remote branch 'ugisozols/master' 290204a
@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
35ef030
@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
c886774
@parndt parndt Merge remote branch 'ugisozols/master' 173d510
@parndt parndt prepare for a future release. d873774
@parndt parndt cleanup 21d1f2f
@parndt parndt show how to check 99d087b
@parndt parndt try nesting lists. 10a574a
@parndt parndt hyphens hold the answer. f95d60d
@parndt parndt Fix confirmation issue on new records. 4afd6fb
@parndt parndt Ok, new version. 56b3098
Commits on Aug 02, 2010
@ugisozols ugisozols added passing cucumber tests for search (available in 'Images', 'File…
…s', 'Inquiries' and 'Pages')
decb236
@parndt parndt Fixed deprecations in search with how we used acts_as_indexed - updat…
…ed to with_query from find_with_index.
8c12b2f
@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.
4120ebd
Commits on Aug 03, 2010
@parndt parndt Fixes superfluous bracket causing error. 12b9338
@parndt parndt better note down what happened. 62c3a93
@parndt parndt We need uploads also. 52482b3
@parndt parndt Be more specific so we don't get things like "\"/contact\"" as a link…
…_url
3186e74
@parndt parndt We can't reasonably expect to see this content on the page given that…
… we create the pages with no content.
3c58a6d
@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.
397e8c5
@bofrede bofrede Made file executable. 18096d6
@bofrede bofrede Make sure the required alt attribute is created. ea66f39
@bofrede bofrede Fixed invalid HTML in the backend pages listing. ac50751
Commits on Aug 04, 2010
@parndt parndt Add support for list that passes back full <ul> tags around them. fb8d99c
@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.
467b0e7
@parndt parndt update changelog while trying something new. 18c0935
@parndt parndt bit of formatting 5ec5c62
@parndt parndt update gemspec and version number [still unreleased] 2261543
@parndt parndt Very important to change the version here, too. 65189b2
@djones djones fix XSS vulnerability on page meta information by escaping the releva…
…nt fields properly
bfcfe96
@ugisozols ugisozols added some cucumber tests. Tried to reduce noise in tests. Introduced…
… :'data-method' => 'delte' to pass 'Delete' tests.
bb6af05
@ugisozols ugisozols changed wording in cucumber tests 438bb72
@parndt parndt requires relock? 41f6029
@parndt parndt Merge remote branch 'ugisozols/master' 8647011
@ugisozols ugisozols changed title input field size (when adding new page part) so it woul…
…d fit window
9c4a02f
@ugisozols ugisozols used translations from locale files and added new rather than hardcod…
…ing titles in views
18e2768
@bofrede bofrede Danish translation started. 9f792ae
@bofrede bofrede Danish translation for WYMeditor. a7230a5
@parndt parndt Merge remote branch 'ugisozols/master' ae6186e
@parndt parndt use CSS class for widest rather than guessing the size 546fae6
@parndt parndt Just use the right one instead. Thanks Joe! b4e4073
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
66b1bf5
Commits on Aug 06, 2010
@parndt parndt Added carousel to admin menu to prevent tab overload. 4379d84
@kivanio kivanio added missing translations for pt-BR ea157e6
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
b8972ca
@parndt parndt Update changelog and version release date. b9ff53c
@parndt parndt Update neglected, forgotten about link. 67d13f5
Commits on Aug 08, 2010
@joemsak joemsak Sortable list connects to '.nested' d779976
@joemsak joemsak Placeholder is taller and has some margin 01042cc
@joemsak joemsak Smoother page sorting d601cd7
@joemsak joemsak Reposition action buttons after smoothing the page sorts 82ae53e
@joemsak joemsak Page sorting much less horsey. Maxdepth set to 2 706872a
@joemsak joemsak Prevent multiple requests from 'done re-ordering' fa6fc37
@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.
c6a9411
@joemsak joemsak Whups forgot the loading icon 00fa3f3
@parndt parndt Remove position relative from this div as it interferes with the one …
…on the list item.
8e37f72
@parndt parndt Bring back change from rails3 branch for css positioning. 7b09e6b
Commits on Aug 09, 2010
@joemsak joemsak Include plugin factories 715ac61
Commits on Aug 10, 2010
@joemsak joemsak Changelog updates 757fd56
@joemsak joemsak Hiding overflow on dialog boxes is problematic for smaller browser wi…
…ndows
4d34164
@joemsak joemsak Web link insertion binds to paste and change 0f4be6e
@joemsak joemsak Changelog updated d56024f
Steven Heidel Copy over most common partials that will be overridden when developin…
…g themes.
3b0767d
Steven Heidel Running refinerycms with -v or --version will now output the version …
…number
74d8005
@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.
11c9beb
@parndt parndt Merge remote branch 'stevenheidel/master' e685b16
@parndt parndt Solves condition where @page[:body] did not exist because the default…
… page parts were changed to something else.
b166957
@parndt parndt increment version 0ee3969
@parndt parndt Made the core codebase not rely so heavily on @page[:body] by adding …
…Page.default_parts and using .first on that instead.
8741e80
@parndt parndt Document changes, update Gemfile dependency to 0.9.7.12 and relocked. c3c06e2
@parndt parndt Highlight some key phrases 2718c14
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.
859045f
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.
d7d17df
@parndt parndt Can you believe that if you name anything the same as its DOM id then…
… Internet Explorer 8 will freak out?
8360834
Commits on Aug 13, 2010
@parndt parndt update wiki link 7f1af4b
Sun added ru locales fe9d7af
Sun added ru locale file e8e6a9f
Sun Merge commit 'origin/i18n' bdeb1dc
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.
ac49725
Sun updated ru locales 38999cf
Sun Merge commit 'origin/i18n' e16d97c
@parndt parndt Merge remote branch 'sunchess/master' 160b0f8
@parndt parndt Get things back to defaults. bd97420
@parndt parndt Fixed issue with error_404 page where part_symbol didn't exist. (ht: …
…ruprict)
738fa85
@parndt parndt Fixed reordering for non-tree lists. (ht: ruprict) 7bd9902
Commits on Aug 17, 2010
@parndt parndt Rewrote the acts_as_indexed configuration routines to work on Heroku.…
… (ht: ruprict - thanks for testing!)
fc1a7a0
@joemsak joemsak Gemfile lock 7d26780
@joemsak joemsak For HTML5, <meta charset="utf-8"> is correct and simpler 1ec65c9
@joemsak joemsak Semantic HTML5... 2c501ea
@joemsak joemsak Empty file not referenced in source 0af8f8f
@joemsak joemsak IE7 references correct file 8add3e9
@joemsak joemsak header & footer tags d778f33
Commits on Aug 18, 2010
@parndt parndt add back footer div around HTML5 footer tag. 7ed3676
@parndt parndt Sure is useful to put a list inside <ul></ul> tags 9ef0601
@parndt parndt Use latest versions. 6d06f56
@parndt parndt Come on HTML5, let's be better friends <3 f1db285
Steven Heidel Don't allow html in inquiries to ruin the listing on the front page. …
…Closes GH-146.
c0a5833
Commits on Aug 19, 2010
@awagener awagener Search results may as well be paginated too 348f442
@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.
1e6cb22
@parndt parndt Port fix to #188 from wymeditor into our application too. 0aca005
Commits on Aug 20, 2010
@parndt parndt make like before 1d0aa99
@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)
403642f
Steven Heidel Fix 6 failing tests on Ruby 1.9.2 regarding attachments. 6ee7c55
Commits on Aug 21, 2010
@parndt parndt Merge remote branch 'stevenheidel/master' 2a5579e
@meskyanichi meskyanichi Implemented all Dutch (NL) internationalization translations based on…
… the already existing English (EN) entrees.
b8c565a
@parndt parndt Merge remote branch 'meskyanichi/master' f915e3d
Commits on Aug 23, 2010
Steven Heidel Updated gemspec. f71edb2
@parndt parndt Ensure we include the ru locales too. c158f40
Commits on Aug 24, 2010
@semaperepelitsa semaperepelitsa translating dashboard to Russian 00cd4d5
@semaperepelitsa semaperepelitsa load meta description option title from locale 956ce84
@semaperepelitsa semaperepelitsa correct misspelling 385c715
@semaperepelitsa semaperepelitsa translating pages to Russian d94775b
@semaperepelitsa semaperepelitsa improving Russian translation c55ae43
@semaperepelitsa semaperepelitsa correcting typo in Russian locale 639c549
@semaperepelitsa semaperepelitsa removing unnecessary quotes in Russian locale 152bccd
@semaperepelitsa semaperepelitsa correcting error in Russian locale b384366
@semaperepelitsa semaperepelitsa removing unnecessary quotes in Russian locale d60d96b
@semaperepelitsa semaperepelitsa translating images plugin to Russian 23509a0
@semaperepelitsa semaperepelitsa typography improvements in resources plugin's Russian locale d9ad983
@semaperepelitsa semaperepelitsa improvements in resources plugin's Russian locale c92b5f0
@semaperepelitsa semaperepelitsa improving Russian locales 37bf28d
@semaperepelitsa semaperepelitsa improving refinery_settings plugin's Russian locale af1948e
@semaperepelitsa semaperepelitsa improving auth plugin's Russian locale 1835a59
@semaperepelitsa semaperepelitsa improving inquiries plugin's Russian locale 8ca3a01
@semaperepelitsa semaperepelitsa updating quotes to standard russian quotes 1438311
@semaperepelitsa semaperepelitsa correcting typo in Russian locale 1fb3c2f
@semaperepelitsa semaperepelitsa improving refinery_setting plugin's Russian locale b4c0575
@ruprict ruprict Add view= to a couple of refinery:override example texts 9b73468
@parndt parndt Merge remote branch 'ruprict/master' 95c5002
Commits on Aug 29, 2010
@parndt parndt Update references to the master branch to the rails2-stable branch in…
…stead.
5b788a4
Commits on Aug 30, 2010
@parndt parndt Update the changelog from 0.9.7.12 -> 0.9.7.13 (we forgot, oops) 7d4cc18
@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.
4304ced
Commits on Sep 30, 2010
@parndt parndt re-'bundle install'. 1497b12
@parndt parndt Backport wymeditor changes/fixes. 55863bb
Commits on Oct 05, 2010
@parndt parndt Eventually there will be a 0.9.7.14 so prepare it now. 1302f56
@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.
a7c3441
Commits on Oct 12, 2010
@djones djones fix issue where the dialog doesn't insert images on any wymeditor field 4d7aac5
@djones djones backport the latest wymeditor from master in order to fully fix the i…
…mage insert issue
c0ebed8
@parndt parndt regenerated gemspec 3ea2091
Commits on Oct 13, 2010
@parndt parndt Fix deprecations in i18n so that client apps don't have the complaints. 1cf0594
@parndt parndt Fix deprecation notices from the 'returning' function which is now .t…
…ap on whatever it was using.
541d0a4
@parndt parndt Tell the codebase it's a future version. 447dcaf
@parndt parndt Updated example Gemfile to reference current version number. 1bdfda9
@parndt parndt Note down changes bdb9c4a
Commits on Oct 17, 2010
@parndt parndt Use rails 2.3.10 3ad6763
Commits on Nov 01, 2010
@mariochavez mariochavez Added localization files for es-MX in authentication, dashboard, i18n…
…, images, inquiries, pages, refinery, refinery-settings, resources
8374436