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: resolve/refinerycms
...
head fork: resolve/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 Jan 26, 2011
@parndt parndt Better dependencies
2a4403e
@parndt parndt Include all files in the gem because we still incorporate several cor…
…e gems.
24be479
@parndt parndt This version actually runs because rubygems maps the gem through anot…
…her bin file so $0 becomes that bin file not the refinerycms executable.
a956902
@parndt parndt Updated changelog, added .rspec to gem and .gitignore template.
7610253
@parndt parndt Revert back to the standard source for Refinery.
6fc04ca
@parndt parndt This spec was only going to work unless the developer/user added more…
… settings. Fixed.
af2afa9
@parndt parndt Show/hide the styles box on hover.
051e4af
Commits on Jan 27, 2011
@parndt parndt Update to the new version of truncate_html, thanks so much ugisozols,…
… simx and hgimenez for help with this one. Closes GH-420
1a24818
@parndt parndt Merge remote branch 'pero-ict/master'
ccaaee7
@parndt parndt Protect from missing @page.slug
738cb1e
@tfe tfe Modify gemspec rejection_patterns to exclude non-existent "log".
67ddeb4
@parndt parndt Redirected $stderr to stop ImageMagick yelling at us when we try to m…
…ake it fail by uploading .txt files as images. (ht: htp)
2750e19
@parndt parndt We don't need the See Home Page button because we have a Switch to We…
…bsite button on the site bar.
01fc575
@parndt parndt Merge remote branch 'tfe/master'
48dcdb4
Chris fix image placement in ie7
ae8c7a3
Chris resources are always attachments
2c69113
Chris fixup paste code
e251402
Chris allow link_to arguments to pass through
d905f93
@parndt parndt Don't return false by default though.
804ab6b
@parndt parndt Remove unrequired route
5ced6cc
@parndt parndt And the TODO comment about it
8c2f024
@parndt parndt Re-introduce content_fu for Dragonfly
9ebe179
@parndt parndt Automagically insert image width and height dimensions if the develop…
…er is cropping their image because we can work those out.
b5c061a
@parndt parndt TODONE
ca5f881
@parndt parndt Updated changelog for the just released 0.9.9
0727731
Alexandre Girard add alert in refenirycms command to avoid creating projects with name…
… conflict.
704d006
@parndt parndt Expand on the new code for more graceful exits.
67af335
@parndt parndt whoops
11ff929
Commits on Jan 28, 2011
@parndt parndt Stop failing over nothing
3676fb8
Commits on Jan 31, 2011
@parndt parndt Fix pagination controls on form_actions.
d3a8d7b
@parndt parndt Solve excessive newlines and document paginate.delete(:url).
7ee2371
@parndt parndt Apply consistent style with resource picker
34b4765
@ken-guru ken-guru Fixed two typos
c83e982
@peterz peterz Update wymeditor sl translations.
7379340
@parndt parndt Merge remote branch 'peterz/master'
eaecf1a
Commits on Feb 02, 2011
root update locale for zh-CN
dcb48a9
root update locale for zh-CN
bcb9f63
@orjan orjan - Fixed some swedish spelling errors
- Changed "Lägg till" to "Ladda upp" to make image and file dialogue more concise
b908f57
@parndt parndt result of bundling
1308989
@nbrew nbrew Fix GH-434. Escape anchor and focus node text content when linking.
36c6464
Commits on Feb 03, 2011
@ugisozols ugisozols Engines load locales from config/locales/* automatically. Closes GH-432
2197738
@parndt parndt This dependency update fixes our support for 3.0.4.rc1
24eb761
Commits on Feb 04, 2011
@parndt parndt Well that was silly.
8cec151
@awagener awagener Fix wymeditor formatting in Firefox
82d173b
@parndt parndt Styles dialogue remains open until hover stops and also checks whethe…
…r it's open to apply the right rule rather than using toggle which could get mixed up.
da75bcd
@n5ken n5ken updated locale for simplified Chinese
a316f3c
@n5ken n5ken updated locale for simplified Chinese
518cac5
@n5ken n5ken updated locale for simplified Chinese
3c2d2de
@parndt parndt Merge remote branch 'n5ken/master'
47331ed
Commits on Feb 06, 2011
@parndt parndt differentiate information buttons.
6152bd0
@parndt parndt LPage lcale flags should be clickable to snap straight to the edit fo…
…rm for that locale.
e17d5c3
@parndt parndt Use exit code 1
22a0be0
@parndt parndt Prevent a couple of known Heroku validations from derailing the user.…
… Closes GH-447
cf1b606
@parndt parndt If page routes just specify :path not :id we can simplify the PagesCo…
…ntroller#show significantly.
aad317c
@ugisozols ugisozols Fix incorrect Latvian translation key for wymeditor.
2de5297
Commits on Feb 07, 2011
@BanzaiMan BanzaiMan Fix https://github.com/resolve/refinerycms/issues/#issue/449: refiner…
…ycms-generators is required
2246910
@parndt parndt ensure this happens on every gemspec regeneration.
9a2ad4c
@igmarin igmarin wymeditor lang Spanish update
28ea1e2
@igmarin igmarin Added the update of italian to wymeditor
f887e95
@parndt parndt Update dependency for refinerycms-generators. Closes GH-453
ef171db
@parndt parndt Switch to :path from :id to match aad317c
3269b70
@parndt parndt Refactored to improve legibility and speed, removed deprecation warni…
…ngs and switched to using the newer code instead.
639be57
@parndt parndt Fix refinerycms-generators loading.
15f43f7
@parndt parndt Added path_cache_key for nested_path so that it invalidates like url_…
…cache_key, moved reserved_words logic to just after marketable routes are applied (not consistently working across reloads in development mode) which applies to the issue https://github.com/resolve/refinerycms/issues#issue/428 and required moving use_marketable_urls? to a class method on Page not an instance method.
99ccc47
@parndt parndt We don't use this anymore so remove its specs.
6ab56f2
@parndt parndt Use 'gemspec' to source requirements from the gemspec. This will brea…
…k bin/refinerycms because it assumes too much.

Cleaned up whitespace.
4b4befd
@parndt parndt rspec 2.5 seems to be safe again, 2.4 was causing issues.
ca7e18e
Commits on Feb 08, 2011
@parndt parndt We don't want config etc
c769eba
@othatbrian othatbrian Added error checking during [initial] installation of gems
75ad81f
@parndt parndt We don't want to be removing the application on an update, also made …
…consistent with the above !$?.success?
3391486
@parndt parndt I've decided that it's not appropriate to remove the project on failu…
…re because it's so potentially unsafe but I've expanded on run_command to add a :fail parameter which if present stops execution when failure is detected.
cf58df3
@parndt parndt Oh look, we already support Rails 3.0.4
bab2225
@kenphused kenphused set the this_class variable to the base class of the passed-in model …
…name for crudify's default options - this allows STI implementation by setting the correct table name of the model's base class
f143f50
@parndt parndt Hint at available engine.
ac3bf07
Commits on Feb 10, 2011
@parndt parndt Updated jQuery to 1.5 and jQuery UI to 1.8.9. Updated rails.js to lat…
…est version at 8b8375bbcd1695ba8297e398a68dd743cdcdaea9
41b0f4e
@parndt parndt Fix issue with dashboad reordering (or any AJAX request) after http:/…
e9bf119
@parndt parndt Update per my patch to jquery-ujs [not yet merged]
9cec4fa
@parndt parndt refinerycms gem now requires every other gem explicitly rather than b…
…eing one big project (they will still reside in the same repository, like rails).

Still haven't quite got features/specs working as desired.
4bb175e
@parndt parndt switch to git source
c37e4f2
@parndt parndt New patch
21b452f
@parndt parndt Merge branch 'master' into gemify
a4bed10
@parndt parndt Seems superfluous to have this.
e002b15
@parndt parndt Setup autoload properly.
e54efe4
@parndt parndt require helper here instead.
65575e5
@parndt parndt Let refinerycms-authentication include itself.
4c56ff9
@parndt parndt Remove basic debugging and put in time measurement.
c249ed9
@parndt parndt Firefox chokes on the previous selector
0faaa9c
@parndt parndt Make updating assets a lot easier and removed modernizr, not really r…
…equired inside the iframe.
d6e0381
@parndt parndt Merge branch 'master' into gemify
7e29feb
@parndt parndt Describe what unit
d661727
@parndt parndt Complete time profiling. Core is slowest, obviously. Let's get this d…
…own.
d8a8bb0
@parndt parndt Merge with core rails/jquery-ujs
1c1cef3
@parndt parndt Merge with core rails/jquery-ujs
6be066d
@parndt parndt Merge branch 'master' into gemify
6dff4ec
@parndt parndt Add better suppot for jruby by replacing sqlite3 with activerecord-jd…
…bcsqlite3-adapter if the user installs on RUBY_PLATFORM == 'java'. Closes GH-459
59d9745
@parndt parndt Merge branch 'origin/master'
49973b1
@parndt parndt Update jquery-ujs
1dee74f
@parndt parndt refinerycms-i18n gemify was released, use that.
e6d6c41
Commits on Feb 11, 2011
@parndt parndt The features... They run! They pass!
6897c04
Stefan N pages vi.yml
468a873
Stefan N images vi.yml
4838311
@tiendung tiendung Add Mike's translation files
93b8c3d
@tiendung tiendung change en: to vi:
be45895
@tiendung tiendung Add authentication/config/locales/vi.yml
3edfb10
Mario Nguyen upload vi.yml in core/config/locales
8fd9856
Mario Nguyen add vi.yml to dashboard/config/locales
9e32576
Mario Nguyen [fixed] missing change en: to vi:
62bbc88
Stefan N wymedutir vi.js
3da8a68
@tiendung tiendung FIX
f635954
@parndt parndt The rmagick rejection was from when we used it.
45a896f
@parndt parndt Consistent whitespace and regenerated gemspec.
4ec3673
@parndt parndt Merge branch 'master' into gemify
c394120
@parndt parndt Seems that we don't need these requires like this.
1bf32f2
@parndt parndt Glue to the Refinery::Version.
06c235b
@parndt parndt Epic breakthrough - now we don't need to specify the gems in the Gemf…
…ile. Turns out lib/refinerycms was just loading the wrong 'refinery'
aeb38ae
Commits on Feb 12, 2011
@parndt parndt Simplify gemspec generator.
0949ccb
Commits on Feb 13, 2011
@parndt parndt Added logic to create and build all gemspecs.
03a384b
@parndt parndt Turns out these requires are quite important.
3dc73e2
Commits on Feb 14, 2011
@parndt parndt Made the new structure work with Refinery.root and bin/refinerycms. A…
…lso introduced Refinery.engines and Refinery.roots to handle the default engines' paths internally.
bdc4d9c
@parndt parndt Restructured cucumber.
a4df8b1
@parndt parndt Extracted core testing functionality into new 'testing engine' so tha…
…t you can turn it on or off easily in your application.
5059f5a
@BanzaiMan BanzaiMan use the same Ruby interpreter for scripts
e100067
@parndt parndt Remove update logic that was specific to 0.9.8.9 -> 0.9.9. If you wan…
…t to update from 0.9.8.9 use 0.9.9 to do it.
ed623d8
@parndt parndt Merge remote branch 'BanzaiMan/jruby'
e262634
@parndt parndt Consistency is key.
4bb1308
@parndt parndt We don't want to do updates like that anymore, just wipe the acts_as_…
…indexed index.
55920da
@parndt parndt Always do this
3375b4f
Rachel Graves Fixed typo in Rails::Engine inheritance
272d66a
@sigmike sigmike fixed ApplicationController autoload
12af0e3
@parndt parndt Explain why this is here like this so that I don't go 'refactoring' l…
…ater. Closes GH-467.
9473bac
@parndt parndt Clear up whitespace
203ee43
Commits on Feb 15, 2011
@parndt parndt Now you need to write 'yes' when updating to accept that you were tol…
…d to backup. Sorted out what happens when (update or fresh install)
96cab16
@parndt parndt Fix process of grabbing USER DEFINED section from Refinery's Gemfile.…
… Now rejecting any --gems that start with refinerycms due to the likely collision of migrations. Add them after you've installed, please :)
30dae53
@parndt parndt Change is the only constant.
da174a6
@parndt parndt Change, and dependencies that need updating.
d2df1da
Commits on Feb 16, 2011
@caplod caplod translated dashboard title in :de locale
ec86130
@bryanmtl bryanmtl Merge branch 'master' of git://github.com/resolve/refinerycms
87ccfa8
@parndt parndt Fix issues with creating new applications and dealing with the cached…
…_slug column being added then removed.
79f902d
@parndt parndt Map, don't collect.
cf5335e
Steven Heidel Restructured docs.
f8cf31a
Steven Heidel Added some sample guides to help test things out.
d8d6f43
Steven Heidel Merge conflict.
d5a3ac8
@parndt parndt basename not split.last
277784d
Commits on Feb 17, 2011
@parndt parndt Shorten index name on slugs so that it always works. Apply previous c…
…hanges to cached_slug to db/migrate/ migrations too
42984c9
@parndt parndt Instead of requiring activesupport, simply don't use blank?
092a14f
@parndt parndt Chrome (atleast) got more strict about this and if you have a / in th…
…e selector then you need quotation marks.
c051852
@parndt parndt Fix support for -u and -p for specifying database username and passwo…
…rd. Added note about the installer ceasing to function if the username or password is incorrect. Closes GH-469
715b97c
@parndt parndt Upped version to 0.9.9.2, added changelog entries and regenerated gem…
…specs.
8ff8ade
@parndt parndt Remove dependency on rack-cache because dragonfly already has one. Re…
…-bundled.
8fbc27d
@parndt parndt Well that's going to require a new version.
9ef927e
@parndt parndt So while dragonfly has a dependency of rack-cache it doesn't require …
…it so we should do it according to the docs.
07b437b
@parndt parndt This note won't show in the next version.
1a70fe0
@parndt parndt Reduce line sizes for fixed width editors.
aba071c
Steven Heidel Transfer over guides.
01603ff
@parndt parndt Moved some guides to different sections, updated verbiage
193add9
Steven Heidel Made some corrections for the new guides system.
9ce9035
@parndt parndt Merge remote branch 'stevenheidel/master'
b93a9e0
@parndt parndt Licenses are important.
b37047e
Commits on Feb 18, 2011
@parndt parndt Updated version number of Refinery CMS.
b71ff2f
@parndt parndt Remove to attempt to fix git index
e698e7d
@parndt parndt Really delete them, they'll come back.
38e36e1
@parndt parndt Told you they'd come back.
c22edb1
Steven Heidel Now how did that happen?
b91cd32
Steven Heidel Oops, missed a word that was causing some broken links.
51c8e6c
Commits on Feb 19, 2011
Phil Spitler added 'field' to some of the selectors and javascript to support mult…
…iple resources in a single engine
c6fdef4
Steven Heidel Fairly obvious typo there.
25b2533
Commits on Feb 20, 2011
@parndt parndt Merge remote branch 'philspitler/master'
7c8fbfa
@parndt parndt Added _<%= field %> to current resource link, too. This fixes the iss…
…ue of the download link always being applied to the first resource picker on the form.
dbafc5b
@parndt parndt Update for bugfixes.
04ca47c
Commits on Feb 21, 2011
@parndt parndt null doesn't always remove the background image.
22bb131
@parndt parndt Don't always use ruby executable when running commands. Closes GH-474.
5d62279
Steven Heidel New version of things.
5921457
Commits on Feb 22, 2011
@emptyflask emptyflask upgraded modernizr to 1.7, fixes a chrome issue
00b0c0d
@bryanmtl bryanmtl ability to customize wym editor on a page by page basis
e0c68f1
@bryanmtl bryanmtl Merge branch 'master' of git://github.com/resolve/refinerycms
42a77b6
@bryanmtl bryanmtl ability to customize wym editor on a page by page basis
ea84cf0
@bryanmtl bryanmtl Uses localized cache key if frontend translations are enabled
aa1c49b
@bryanmtl bryanmtl uses after_javascript_libraries block to allow wym editor to be custo…
…mized on a page by page basis
6c4acae
@parndt parndt Merge remote branch 'emptyflask/modernizr'
a91709f
@parndt parndt Updated acts_as_indexed.
6afbb7b
Commits on Feb 23, 2011
@tenderlove tenderlove correcting yaml problems
3cd6cdc
Commits on Feb 24, 2011
@parndt parndt Updated changelog, gemspecs.
026660c
@parndt parndt relocked
57f222c
@parndt parndt Ensure that page parts get appended inside the correct element and cl…
…ean up the dialog after closing it. Closes GH-477
e8eb5b5
@parndt parndt And document the last commit.
9451d7c
Steven Heidel New i18n please.
bf0981b
@parndt parndt Please do use the gems.
e3edae2
Commits on Feb 25, 2011
@caplod caplod body_content columns have padding with nested additional div layer
086abfc
Commits on Feb 27, 2011
@mdesantis mdesantis Improved italian translations
14d83ae
@parndt parndt More succinctly check the presence of a user's role inside has_role?
7c88ed7
Commits on Feb 28, 2011
@whatcould whatcould Menu performance fix: Do not cycle through all pages to find children…
… when current page has no children.

Uses nested_set's #has_descendents?, which uses left/right attributes on Page.
9f41cca
@whatcould whatcould No need to check whether child pages are #in_menu? because the entire…
… collection is only pages in the menu.

By default we fetch: @menu_pages = Page.live.in_menu.order('lft ASC'). So we don't need to re-check later. I think we can rely on users to apply the same checks if they manually fetch a different set of menu pages.
48e7c55
@parndt parndt Merge remote branch 'ProGNOMmers/master'
644ad8e
@whatcould whatcould Page#[] method first checks to see if we'd like an attribute; if not,…
… it tries to fetch a page_part.

Previously any calls to nil attributes (eg page['parent_id']) would force loading of all the page_parts.
bc1bdcc
@whatcould whatcould Do not include :page_parts in default @menu_pages fetch.
It had previously been included as a performance crutch because page#[] inadvertently fetched all page_parts; after previous commit, this becomes unnecessary.
8ce503c
@parndt parndt Merge remote branch 'caplod/general_css_layout'
0c15f38
@parndt parndt Updated the changelog to document the changes we've had recently.
b96948f
@whatcould whatcould Page#[] checks to see if argument passed is an AR attribute, but firs…
…t calling to_s on the argument.

Apparently the attributes hash has string keys. Previous commit was failing on some tests.
2303aaf
@parndt parndt Merge remote branch 'whatcould/master'
f350c4a
@parndt parndt Ensure that rails.js is the correct one that we want. Closes GH-489
a5ccf42
Commits on Mar 01, 2011
@parndt parndt Added spec assertions to ensure that child page urls don't regress ei…
…ther.
875f494
@parndt parndt Removed message from core controller about adding to this file, it di…
…dn't make sense anymore because it's wrapped up in our gem.
63add95
@simi simi Spork is working on Windows now
54bb622
mrstocks Edited doc/guides/7 - Hosting/1 - How to Install Refinery on Heroku.t…
…extile via GitHub
b61e336
mrstocks Edited doc/guides/7 - Hosting/1 - How to Install Refinery on Heroku.t…
…extile via GitHub
3a93f58
@parndt parndt Merge remote branch 'mrstocks/master'
785d75e
Commits on Mar 02, 2011
scambra Fix menu_hide_children setting
e0026aa
@simi simi Spork is working on Windows now
b578b1a
@simi simi Czech Apply_Style wym translation
01d421a
@simi simi Czech translation WYMeditor - Insert
213c67e
@simi simi .gitignore - my favourite E-texteditor
c1e436c
@peterz peterz Update sl locales for dashboard.
2c34152
@parndt parndt Merge remote branch 'simi/master'
8c46bcc
@parndt parndt Merge remote branch 'scambra/master'
dd14920
@parndt parndt Based on latest version
e857372
Commits on Mar 03, 2011
@parndt parndt Removed --update command from bin/refinerycms installer.
This is because we don't mess around with the project's files anymore so we no longer need to automate anything.
Updating happens just like many other gem based projects.
f0e31d5
@parndt parndt Added specs to page which ensure that reserved words are working prop…
…erly.
8ae4a1f
@parndt parndt Reserved words can't have underscores in them because these are dashe…
…rized. Improved specs. Closes GH-428
ecbede8
@simi simi Another WINDOWS and DRY stuff
0246a6b
@simi simi Yoda conditions like matcher in web step. Patch sent to cucumber-rail…
…s also.
e7bba88
@parndt parndt Merge remote branch 'simi/master'
14aed40
Commits on Mar 04, 2011
@djones djones fix 1px line seen below selected menu item in Safari on iOS
ad8faa7
@parndt parndt If there is a link_url assigned to a page and someone visits that pag…
…e they should get redirected to the link_url instead. E.g. /contact-page redirects to /contact which will know better how to present itself.
37d4767
scambra update spanish translation
2208021
@parndt parndt Clean up English YAML for core engine.
7473d66
@parndt parndt Merge remote branch 'scambra/master'
cb86424
Commits on Mar 05, 2011
root Slovak translation
9d8b999
@parndt parndt Added guide on how to attach Refinery CMS to an existing Rails applic…
…ation.
1b29a2d
@parndt parndt Made bundle install more obvious, converted first shell to ruby code.
19c1509
@parndt parndt Pushed rails dependency up to 3.0.5. Closes GH-505
b2cc5a7
Steven Heidel Fix broken links caused by document move. Closes GH-507
9135da1
Commits on Mar 06, 2011
@parndt parndt Merge remote branch 'keram/i18n_sk'
4c407f3
@parndt parndt Fixes so many issues on IE with WYMeditor for example no more resize …
…controls on paragraph tags and also Closes GH-433. (ht: mrlundis)
7c2e471
@parndt parndt Refactored the installer slightly to avoid calling the entire refiner…
…ycms stack on an installation (which usually results in version mismatch for some dependency), regenerated gemspecs to include new files.
206374b
@parndt parndt The config/database.yml.mysql template should contain mysql2 adapter.
8eebdc2
Commits on Mar 07, 2011
@parndt parndt Added support for --ident in the installation task which uses ident a…
…uthentication at the database level by commenting out the username and password credentials. Closes GH-506 (ht: radar)
d21bb7a
@parndt parndt Added custom_title as a field that gets translated. Closes GH-504
326010c
@parndt parndt Fixed the styles dialogue for WYMEditor in IE and made it function mo…
…re consistently in all browsers.
8085483
@parndt parndt Increased friendly_id_globalize3 requirement to 3.2.1 which Closes GH…
092e18d
Commits on Mar 08, 2011
@parndt parndt Switch to the website under the context of the default frontend local…
…e if supported.
9ae8cd1
@parndt parndt Strip out the locale from the path properly so that pages match prope…
…rly in other locales, if supported.
a673cde
@parndt parndt Fix small doc typo
9ca153f
@parndt parndt Switch to file_store as cache store for syncronisation purposes with …
…passenger. Closes GH-462
46f5ef2
@parndt parndt Ensure that the migration doesn't fail if the field already exists.
0d323bb
@parndt parndt Call super and then change behaviours if we need to rather than reimp…
…lementing the method completely and changing it slightly.
aefc294
@parndt parndt add :multithread => true to the Rails.cache calls.
e4ec0f5
@parndt parndt Update version to 0.9.9.5 and update dependencies.
9820f40
@parndt parndt Updated changelog per changes.
04902f6
@parndt parndt We also added --ident support.
6fc94ec
@parndt parndt Added release date
3dee550