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 Jun 08, 2011
@haikalhussein haikalhussein create a guide on how to create multiple data-tables in a single engine b9b0128
@haikalhussein haikalhussein edit some lines in the doc guide 4aac6b6
Commits on Jun 17, 2011
@parndt parndt Fixes #732 and #762 by running 'rails new' with 'bundle exec' and spe…
…cifying the built in Gemfile.
e8ff18a
@parndt parndt Update to Rails 3.0.9 and Uģis Ozols 4653ce2
@parndt parndt Ensure Encoding is set properly to allow for Uģis Ozols a3c0673
@parndt parndt Regenerated gemspecs. fed0423
Steven Heidel This guide had the old paths of vendor/refinerycms, updated to new ro…
…ot level paths
dccd78f
Commits on Jun 21, 2011
@parndt parndt Don't put space before parenthesis ab42666
@joemsak joemsak specs can run in ruby 1.9.x 706210d
@joemsak joemsak string to string f04bcb7
@parndt parndt Merge remote-tracking branch 'neotericdesign/1-0-stable' into 1-0-stable 5b6ba06
@parndt parndt Looks like cucumber 1.0.0 is out. fd46480
@parndt parndt refinerycms-blog is up to 1.6.0 08b2c8d
@parndt parndt cleared whitespace, regenerated gemspecs. 1b7481b
@parndt parndt We actually need to bundle install first, otherwise some gems are mis…
…sing.
d047141
@parndt parndt The databases specified here are for development.
TODO: remove block when building the gem so they don't become a dependency
4e94daa
Steven Heidel Fix merge conflict in Gemfile. b1569c8
@wikyd wikyd Make the catch-all pages route for marketable URLs be controlled by t…
…he configuration switch.
12fc352
@parndt parndt Re-enable building gems, added ability to move them to current direct…
…ory.
c1c16f6
@parndt parndt Specifying version 1.0.1 in the Gemfile and fix issue with installer …
…where the BUNDLE_GEMFILE wasn't being set back for the app to use it.
7f71203
Steven Heidel Phil, Y U NO add encoding to .gemspecs as well? Added encoding to gem…
…spec generators and regenerated all gemspecs.

Conflicts:

	testing/refinerycms-testing.gemspec
0801afe
@parndt parndt Documented changes in the changelog 5a7f88d
Commits on Jun 22, 2011
@parndt parndt Now prepares the gem without testing enabled so that bundle install d…
…oesn't install it thus wasting resources when the user didn't want it. Using --testing while installing enables it again.
f375a3b
@parndt parndt TODO was done d112c59
@parndt parndt Downcase the input (this was already fixed in master) 07a803b
Commits on Jun 23, 2011
@parndt parndt Documented why we're now at version 1.0.2 80fe84d
@parndt parndt 1.0.3 due to corruption in 1.0.2 bf4f5df
@parndt parndt Changelog entry was incomplete. 7f1a91e
Commits on Jun 24, 2011
@parndt parndt Updated lock to get new friendly_id_globalize3 version which fixes #755 8c56ebe
Commits on Jun 25, 2011
@hechacker1 hechacker1 Move and reuse initialization code from older version to fix plugin p…
…aths

Conflicts:

	core/lib/refinery/plugin.rb
fe07ee9
@ovargas27 ovargas27 How to enable testing in your application 85eb675
@ovargas27 ovargas27 typo fixed b190f85
@ovargas27 ovargas27 updated with parndt's feedback d46ee22
@parndt parndt Fixed typo with guide not closing shell tag. e4203f2
@parndt parndt Ignore coverage dir 612792f
@parndt parndt fixed typo - environment 8d49d29
Commits on Jun 29, 2011
@parndt parndt Fixed typo - affect instead of effect c29f57e
scambra Use asset_host for url returned from image picker dialog. Now it will…
… return a url with host when asset_host is defined, and it will continue returning a path when asset_host is not defined
ec22824
@parndt parndt Merge pull request #790 from scambra/1-0-stable
Use asset_host for url returned from image picker dialog
c932f55
Commits on Jul 05, 2011
@djones djones We don't use /admin anymore so no need to include it in robots.txt 6129bde
Commits on Jul 09, 2011
@parndt parndt Ensure that pages reset column information when seeding just incase. af537ed
@mhaylock mhaylock Changed 'User-agent' casing to maximise crawler compatibility. fe46db2
Commits on Jul 11, 2011
@joemsak joemsak this little line is malformed, produces an error in console, shows as…
… raw code in IE
16951a1
@ugisozols ugisozols Merge pull request #813 from neotericdesign/1-0-stable
this little line is malformed, produces an error in console, shows as raw
f718a5c
Commits on Jul 12, 2011
@joemsak joemsak reorder icon was getting effed when used in a multilist 51a0de3
Commits on Jul 17, 2011
@parndt parndt Ignoring public/refinery
Conflicts:

	.gitignore
a69f803
@parndt parndt Regenerated gemspecs. 5684e9a
@joemsak joemsak reorder icon was getting effed when used in a multilist 6d3bcc8
@parndt parndt Fixes #806 by adding pages_list class back to resource picker. (thanks 6d25043
@parndt parndt Experimenting with the load path analyzer by Xavier Shay. 95871da
@parndt parndt Backport b02a7e0 from master for #807 ffc2ca9
Commits on Jul 20, 2011
@joemsak joemsak Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
58042d2
Commits on Jul 21, 2011
@parndt parndt Duostack is not accepting new apps anymore. 0f63245
@joemsak joemsak Image fu: get the height and width in any case da31382
@joemsak joemsak Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
2cab556
@ugisozols ugisozols Merge pull request #827 from neotericdesign/1-0-stable
image_fu should get image.height and image.width with any geometry string
6314668
@joemsak joemsak Closes GH-828. Removing this code fixed this issue. Tested on zebra a…
…nd tree
eee0a85
@joemsak joemsak Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
4d6c597
@joemsak joemsak WIP: image_fu changes d492c5c
Commits on Jul 25, 2011
@parndt parndt page[:something] is no longer recommended. ebbd0fe
@parndt parndt Figure out what the image size is going to be based on geometry string. 3fbdc34
@parndt parndt Instead of returning an array returning an OpenStruct makes more sense. e16eea5
@parndt parndt Moved image_dimensions_for_geometry to an instance method on the Imag…
…e model called thumbnail_dimensions.
646a377
@parndt parndt Added basic specs for thumbnail_dimensions which show a failure. 35fc767
@parndt parndt Removed old variable c0ad693
@parndt parndt Changed the return type to a hash so that we can inline it to the ima…
…ge_tag options.
5c8be96
@lancecarlson lancecarlson Edited doc/guides/7 - Hosting/2 - How to use Amazon S3 for storage.te…
…xtile via GitHub
adcafd6
Commits on Jul 26, 2011
@parndt parndt fixed whitespace be511fa
@parndt parndt Fixes Issue #816 where new page parts don't get added with a fully fu…
…nctional WYMeditor.
33a2415
Commits on Jul 28, 2011
@parndt parndt Let's see if we can get this thing running on lots of rubies. 5d35d10
Commits on Jul 30, 2011
@parndt parndt ::Refinery.i18n_enabled? when not enabled now returns false, not nil. a833d3e
@parndt parndt Updated getting started to mention 1.0.3 0a44287
@ugisozols ugisozols Cucumber requires database_cleaner if it's available so we don't need…
… to do it ourselves.

Conflicts:

	Gemfile.lock
	testing/lib/gemspec.rb
	testing/refinerycms-testing.gemspec
fe51509
@parndt parndt Reimplemented the image geometry size guess algorithm. 10e1c9e
Commits on Jul 31, 2011
@krisf krisf locked will_paginate at pre2 due to issues with pre4 5e982d0
@parndt parndt Regenerated core gemspec aa372e0
Commits on Aug 02, 2011
@ugisozols ugisozols Patch required_label helper so it would pick up I18n model attribute …
…translations.
d9bf6e0
Commits on Aug 04, 2011
@parndt parndt Ensure that we're really locking to will_paginate pre2. 607b46e
@ugisozols ugisozols Lock will_paginate to 3.0.pre2 in core gemspec. #850 5c13361
@ugisozols ugisozols Refactor require_label form helper in order to use it with namespaced…
… classes.
8c9b76a
@parndt parndt Revert "Refactor require_label form helper in order to use it with na…
…mespaced classes." We can't change APIs in 1.0.x

This reverts commit 8c9b76a.
c5f70ed
Commits on Aug 07, 2011
@krisf krisf Fixed search & add image for page-images and portfolio engines 16bc45f
@parndt parndt Merge pull request #856 from krisf/1-0-stable
Fixed search & add image for page-images and portfolio engines
06fff88
Commits on Aug 09, 2011
@parndt parndt Regenerated gemspecs. bbe0be0
@parndt parndt Added ability to specify a different database host per http://groups.… 85c455a
@parndt parndt No longer need to force mysql2 0.2.x 447f0e9
Commits on Aug 10, 2011
@parndt parndt Not using bundler anymore to install Rails and instead allowing the u…
…ser to override which version we're using and failing when the version is too-future which fixes #798.
24ccc26
@parndt parndt Fixed the -h --database-host option 8965b07
@ugisozols ugisozols I was approaching problem from the wrong side. We don't need an order…
…ed hash… just change the specs.

Conflicts:

	images/app/models/refinery/image.rb
	images/spec/models/refinery/image_spec.rb
4e51a81
@parndt parndt It's antisocial to require rcov when platforms like rbx and jruby don…
…'t like it.

Conflicts:

	Gemfile
	Gemfile.lock
	testing/refinerycms-testing.gemspec
216ba82
@parndt parndt Documented changes since 1.0.3 and regenerated the gemspecs. 69f0725
@parndt parndt Turns out rails generates a different database.yml than I was expecting. 8441edd
Commits on Aug 11, 2011
@parndt parndt Oh hey as it turns out not everyone will be using mysql2. c891a61
@parndt parndt Regenerated gemspecs for release of 1.0.4 f3dbf4e
@ugisozols ugisozols Update jQuery UI. a5f70fc
@ugisozols ugisozols Remove html code when we close dialog either with cancel button or x …
…icon at the top of dialog. Closes #860.
63b24ee
@ugisozols ugisozols will_paginate 3.0.0 is out and everything is working nice and smooth. #… 645f845
Commits on Aug 12, 2011
@ugisozols ugisozols Swap words. 346ca19
Commits on Aug 13, 2011
@Anatortoise Anatortoise Adding new guide for attaching refinery to existing devise app a318f08
@parndt parndt Merge pull request #867 from Anatortoise/1-0-stable
1 0 stable
beaefa4
@Anatortoise Anatortoise fixed a bad textile tag in guide bf375ed
@parndt parndt Merge pull request #868 from Anatortoise/1-0-stable
1 0 stable
84b3fd3
@Anatortoise Anatortoise adding missing textile tag e4685c8
@parndt parndt Merge pull request #869 from Anatortoise/1-0-stable
1 0 stable
97afad6
Commits on Aug 15, 2011
@qevodude qevodude Fixed incorrect path on config/initializers. It is not under the "app…
…" tree.
29f0b9c
Commits on Aug 18, 2011
@parndt parndt Removed duostack hosting option because duostack doesn't seem to work…
… anymore.
71aabd8
Commits on Aug 22, 2011
@gogogarrett gogogarrett Added a quick tip to show how to generate refinery running on a speci…
…fic version of rails.
78ca898
@gogogarrett gogogarrett Added more specific details about how to view a list of possible comm…
…ands with "rake refinery:override"
344cb73
Commits on Aug 23, 2011
@ugisozols ugisozols Fix link and email insertion. Closes #901. 0421b86
@ugisozols ugisozols Merge branch '1-0-stable' of https://github.com/resolve/refinerycms i…
…nto 1-0-stable
519c9d9
@parndt parndt Instead of listing out a huge WYMeditor explanation inside pages.md I…
…'m moving it out to its own guide and linking to it.
b560596
@parndt parndt I'm so used to File.expand_path style linking that I forgot temporari…
…ly how the web works.
1147794
@parndt parndt My usage of English grammar is usually better than this. ad2f25e
Commits on Aug 29, 2011
@parndt parndt Ensure that we see the raw output of the javascript disabled flash me…
…ssage by using _html convention. [ci skip]
d91416f
Commits on Aug 30, 2011
@JohnSmall JohnSmall Edited doc/guides/8 - Tips and Tricks/3 - How to test Refinery.textil…
…e via GitHub
0047fae
@parndt parndt Updated gemspecs, changelog etc for a 1.0.5 release. f249acd
Commits on Aug 31, 2011
@parndt parndt Json updated it seems 524bf0f
@parndt parndt Added support for devise 1.4.3 7068745
@parndt parndt We don't actually need to depend on all of Rails..... 5387456
@parndt parndt It seems that gems are far happier when we depend on activerecord in …
…all the right places (the ones that use it).
c26d94c
@parndt parndt Updated changelog f5f60a3
@parndt parndt *****SIGH***** e48db26
Commits on Sep 01, 2011
@mattmate mattmate Updated version number and added a tip on upgrading to major, minor a…
…nd bugfix releases.
8dee976
@parndt parndt Merge pull request #923 from mattmate/patch-1
Updated upgrade guide
8ef69a9
@parndt parndt Fixes #915 by specifically specifying rails as a dependency of refine…
…rycms-core
2613b22
@parndt parndt Not specifying autotest as a dependency of refinerycms-testing, if yo…
…u want it just add it to your app's Gemfile.
21c6818
@parndt parndt Improved 'wrong rails version' error message. 1723076
@mirosr mirosr Added bg locales in 1-0-stable 5e870ed
@parndt parndt Merge pull request #925 from mirosr/1-0-stable
Added bg locales in 1-0-stable
353f6c8
Commits on Sep 02, 2011
@parndt parndt Updated syntax from @page[:something] to @page.content_for(:something…
…) as the former is deprecated.
d4741be
Commits on Sep 03, 2011
@parndt parndt This guide may as well be based on 1.0.8 now. 934b49b
@parndt parndt Fixed typo which was breaking the URL for testing. (ht: tdelam) 245e9d9
@parndt parndt Sentences should end with a fullstop. 4ad6cc0
@gogogarrett gogogarrett fixes #932 - allows for easy deployment to heroku 547dcee
@parndt parndt Merge pull request #935 from gogogarrett/patch-10
Patch 10
afe69ba
@parndt parndt This spec really is supposed to test forceful destroy! 84aea17
Commits on Sep 06, 2011
@parndt parndt bundle updated 50cab35
Commits on Sep 07, 2011
@mirosr mirosr Added Bulgarian translation for wymeditor. 1afa8c2
@ugisozols ugisozols Regenerate gemspec [ci skip] f907508
Lake Denman The header 'Changing Part Parts for a single page' should be 'Changin…
…g Page Parts for a single page'
a7c1194
@mirosr mirosr Added Bulgarian translation for wymeditor. 78c6667
@parndt parndt Merge pull request #958 from mirosr/1-0-stable
Added Bulgarian translation for wymeditor
bafaa54
@gogogarrett gogogarrett Fixed typeo to Getting Started ReadMe 47e097f
@ugisozols ugisozols Merge pull request #960 from gogogarrett/1-0-stable
Fixed typeo to Getting Started ReadMe
b61235c
Commits on Sep 09, 2011
scambra fix seeds for ruby 1.8, instance_methods return array of strings, in …
…ruby 1.9 it returns array of symbols
ae95bff
scambra validate html 95ad7d3
scambra remove help for non-existing settings a7c98c1
scambra Translate settings into spanish and put them in a scope 031a135
Commits on Sep 12, 2011
scambra convert methods to sym instead of checking RUBY_VERSION 9142052
Commits on Sep 13, 2011
@parndt parndt Merge pull request #966 from scambra/1-0-stable
fix seeds for ruby 1.8, instance_methods return array of strings, in ruby
e338460
@linjunpop linjunpop Edited doc/guides/8 - Tips and Tricks/3 - How to test Refinery.textil…
…e via GitHub
09c7140
Nic Haynes Fixed a bug in the editor dropdown. Something like a 5px gap prevente…
…d easy access to the dropdown menu.
d8ffbec
@parndt parndt Merge pull request #986 from nicinabox/1-0-stable
Fixed a bug in the editor dropdown.
2237eee
Commits on Sep 14, 2011
Justin Edwards updated sass documentation bd42bb6
Commits on Sep 15, 2011
@parndt parndt Merge pull request #996 from vertjustin/1-0-stable
1 0 stable
a83e5e6
@joemsak joemsak Closes GH-824. Just update the core plugin to include pages_dialogs i…
…n menu match
ebe34ef
Commits on Sep 16, 2011
@rilla rilla Use modern factory_girl syntax. Closes GH-975. fb2b901
@parndt parndt Merge pull request #1004 from rilla/1-0-stable
Use modern factory_girl syntax. Closes GH-975.
d222b73
Commits on Sep 18, 2011
@ugisozols ugisozols When using refnerycms app generator wrap db password in quotes becaus…
…e if the password consists only of numbers the installation will fail with an error "can't convert Fixnum into String".
cb131a6
@ugisozols ugisozols Instruct user to add gem "fog" in Gemfile because it isn't there when…
… we generate app.
bd1b211
Commits on Sep 20, 2011
@ugisozols ugisozols Merge pull request #1001 from neotericdesign/1-0-stable
Closes GH-824. Just update the core plugin to include pages_dialogs in me
10bb873
Commits on Sep 22, 2011
@linjunpop linjunpop Add example for using find_or_set in controller 58a477c
@gogogarrett gogogarrett Added how to override javascript guide e3cedf5
@gogogarrett gogogarrett Updated custom javascript guide 8af0bfc
@gogogarrett gogogarrett Updated javascript guide fda84f3
@gogogarrett gogogarrett removed unneeded .swp and .org files 6d966cd
@gogogarrett gogogarrett changed filetype to .textile fc07fb3
@gogogarrett gogogarrett Improved guide with proper information 2c8c1de
@parndt parndt Ignore Rubinius' .rbx directory. 3668d2e
@robyurkowski robyurkowski Added section on configuring Pow. 499a6a5
@parndt parndt Merge pull request #1024 from robyurkowski/documentation/add-pow-doc-…
…to-s3-guide

Adds Pow section to Hosting / S3 guide
bf11565
@robyurkowski robyurkowski Fixed omission that would have led to querying a menu item's children…
… for siblings.
94cda1d
@parndt parndt Merge pull request #1025 from robyurkowski/fix-menu-item-typo
Fix Refinery::MenuItem typo
30d1970
Commits on Sep 25, 2011
@ugisozols ugisozols Update dependencies. a40775b
Commits on Sep 28, 2011
@ugisozols ugisozols Fix merge conflicts. d4c1a15
@awagener awagener Remove unnecessary references to 'self' 7aa820c
@awagener awagener Cast array results back to class Plugins. 453f750
@awagener awagener Select, rather than reject not. ab7059b
@awagener awagener Remove unused instance variable and initialize method. 413e571
@awagener awagener Swap unless ... .nil? to if ... 676a0e5
@awagener awagener Remove unused method Refinery::Plugins#find_activity_by_model 3267b29
@ugisozols ugisozols Use ruby 1.9.3 for stable branch on Travis too. 1f68e84
@parndt parndt Now with 100% less quotes. 14170eb
Commits on Oct 14, 2011
@ugisozols ugisozols Remove Gemfile.lock. 0e8656b
Commits on Oct 15, 2011
@ugisozols ugisozols Ignore tmp dirs and regenerate gemspecs. fb87c33
Commits on Oct 21, 2011
@joemsak joemsak guard working in refinerycms 1-0-stable a18d0bc
@joemsak joemsak allow focus 951c08b
@joemsak joemsak require auth and image factories in spec helper with possibility of f…
…uture engine factories
1437015
@joemsak joemsak these plugin examples need urls or else tests fail 06543d6
@parndt parndt Merge pull request #1090 from neotericdesign/1-0-testing
Took resetexistence's master branch work and applied it to 1-0-stable
6857b28
Commits on Oct 22, 2011
@joemsak joemsak turns out, capybara-webkit has issues on Lion c9eb6f9
@joemsak joemsak and grab growl 06e9fa4
@joemsak joemsak use railscasts way of allowing focus 7ed8f80
Commits on Oct 24, 2011
@joemsak joemsak growl in OS X df7a1fe
Commits on Oct 25, 2011
@parndt parndt Added mention of Heroku keys for S3. Converted pre. blocks to <shell> 21d024e
Commits on Oct 26, 2011
@joemsak joemsak Merge branch '1-0-stable' of git://github.com/resolve/refinerycms int…
…o 1-0-stable
d893566
@parndt parndt Ensure that plugins created by specs aren't getting into the menu (th…
…ey break it).

Conflicts:

	core/spec/lib/refinery/plugin_spec.rb
	core/spec/lib/refinery/plugins_spec.rb
e7f0a7c
@parndt parndt Ensure that plugins aren't added to the list of registered plugins if…
… they're invalid.

Conflicts:

	core/lib/refinery/plugin.rb
c086151
@joemsak joemsak use railscasts way of allowing focus e8bb4f1
Commits on Oct 27, 2011
@gogogarrett gogogarrett updated css for fix an erorr that people were having 4cfe774
@gogogarrett gogogarrett updated verbage 09f6eed
@parndt parndt Merge pull request #1097 from gogogarrett/1-0-stable
Fixed minor changes to css to fix issues people were having. Fixes #1085
5a0ed70
@parndt parndt added mention of core team. 36770cd
@gogogarrett gogogarrett updated to use fully qualified constant name 011c12c
@parndt parndt Merge pull request #1098 from gogogarrett/fix_for_1092
Fix for 1092 - fixes #1092
b113854
@gogogarrett gogogarrett Ensure that users who don't have access can't see recent inquiries wh…
…ich fixes #1088
008aca6
@parndt parndt Merge pull request #1099 from gogogarrett/1-0-stable
1 0 stable
4b6c1dc
@parndt parndt Use a regular expression instead of comparing the string twice. #794
Conflicts:

	core/lib/refinery/application_controller.rb
767003a
@joemsak joemsak Merge branch '1-0-stable' of git://github.com/resolve/refinerycms int…
…o 1-0-stable
fc4c4a0
Commits on Nov 02, 2011
@joemsak joemsak use capybara-webkit 3625056
@parndt parndt Merge pull request #1123 from neotericdesign/1-0-stable
I decided capybara-webkit is just fine. My system needed Qt installed.
41472d0
@parndt parndt Ignore spec/dummy from future Refinery (that's so meta) a1cd91f
@parndt parndt Ignore spec/dummy in gemspecs and regenerated gemspecs as 1.0.9 38f6442
@joemsak joemsak changelog for 1.0.9 started 9c3e8b1
@parndt parndt Merge pull request #1124 from neotericdesign/1-0-stable
Changelog for 1.0.9 started
f603c1a
@parndt parndt JRuby always fails because it can't install the testing gems. 25b2229
Commits on Nov 03, 2011
@parndt parndt Inform Gemfile that this is 1.0.9 6016b62
Commits on Nov 05, 2011
@parndt parndt Support commenting out the entire testing block in the Gemfile now th…
…at there's more of it.
c93e0bb
@parndt parndt Removed capybara as a forced dependency being that cucumber-rails tak…
…es care of it.
2f1e138
@parndt parndt Changelog up to date for 1.0.9 40d0363
Commits on Nov 07, 2011
@parndt parndt We should be using the altSelector for the alt tag, not the titleSele…
…ctor. ht @joemsak
cd2a87a
Commits on Nov 21, 2011
@ugisozols ugisozols Fix #953. 12032ff
Commits on Nov 23, 2011
@ugisozols ugisozols Bump up globalize3 gem dependency version in page engine too. 4584159
Commits on Dec 05, 2011
@mirosr mirosr Fix: No menu item css class '.selected' in multilang frontend 4a7f424
Commits on Dec 07, 2011
Nic Haynes Move will_paginate config into i18n language files 638bb1f
@parndt parndt Merge pull request #1167 from neotericdesign/fix-will-paginate-language
Fix will_paginate language config
1e55db5
Commits on Dec 08, 2011
Nic Haynes Add label class css
Used for Featured, Draft, etc labels in engines' index
c6f002f
@parndt parndt Merge pull request #1168 from neotericdesign/1-0-stable
Add label UI css for engines
6ceb845
Commits on Dec 12, 2011
@pcantrell pcantrell "Setup" is a noun; "set up" is a verb. 4ef6505
@pcantrell pcantrell Fixed typo 9cbc340
@parndt parndt Merge remote-tracking branch 'pcantrell/patch-2' into 1-0-stable c992779
Commits on Dec 21, 2011
@mirosr mirosr Added locale switch menu. f96d0fb
@mirosr mirosr Added cucumber features for #1161 27d877f
Commits on Jan 11, 2012
scambra Use asset_host for url returned from link_to dialog. Now it will retu…
…rn a url with host when asset_host is defined, and it will continue returning a path when asset_host is not defined
ea77d56
Commits on Jan 19, 2012
@joemsak joemsak Replace confusing if/unless display rules a9644ca
@joemsak joemsak Fix file link not appearing after selecting a new file
* The picker would just close and have "Remove this file"
* And there was no reference to the file you just picked
2627beb
Commits on Jan 20, 2012
@parndt parndt Merge pull request #1236 from neotericdesign/refactor-resource-picker
Refactor resource picker
8f17017
Commits on Jan 23, 2012
@parndt parndt Fixes #1232 by not recursively calling format_block() in webkit. 948520f
@parndt parndt More consistent spacing where I've seen it. d32488f
Commits on Jan 27, 2012
@parndt parndt Merge pull request #1161 from mirosr/selected_menu_item
No menu item css class '.selected' in multilang frontend
c213e59
Commits on Jan 29, 2012
@parndt parndt Merge latest wymeditor from edge for bugfixes. d1e614f
@harley harley port #1263 (add missing brace) over to 1-0-stable bb6effc
@parndt parndt Merge pull request #1264 from harleyttd/1-0-stable
fix js syntax error in jquery.refinery.wymeditor.js (port fix from #1263)
882f95f
Commits on Jan 30, 2012
@parndt parndt Ensure that the column information for Page and Page::Translation is …
…fresh before automatically loading seeds. This makes rake db:reset work again and fixes #1255
0fa397d
Commits on Feb 27, 2012
@parndt parndt Removed accidentally save_and_open_page invocation. 1d848a9
@parndt parndt Stripped trailing whitespace. b647e87
Commits on Feb 28, 2012
@parndt parndt Fixed link typo identified at http://groups.google.com/group/refinery… 40723b9
Commits on Mar 05, 2012
@parndt parndt Remove html_safe from already escaped flash message. 3d9af64
Commits on Mar 06, 2012
@parndt parndt Revert "Added locale switch menu."
This reverts commit f96d0fb.
a6ba56a
@parndt parndt Regenerated gemspecs and added changelog for 1.0.10 62c7112