Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: refinery/refinerycms
...
head fork: refinery/refinerycms
Commits on Jan 27, 2011
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 resolve@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