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 Feb 01, 2010
@djones djones add in themes and plugins as stuff included with Refinery eb1546e
@parndt parndt reorder finishes on click of the done button now b103396
@parndt parndt fix dialogs for resources and images and make reordering work only sl…
…ightly better
d933f25
Commits on Feb 02, 2010
@parndt parndt Made :method => :delete into a class that hooks into some unobtrusive…
… javascript to open the confirm dialogue and submit the destroy request. Reduces the amount of HTML in the backend.
6c8035f
@parndt parndt Don't need the files for this 95a9883
@djones djones remove the relationship between pages and images. Now we have page pa…
…rts you use that mechanism to display custom content like images. We don't need to rely on pages having a direct link with images anymore.
f12449d
@djones djones Added tests for page parts bc2d391
@djones djones Adding image tests and documenting each method on the image model inline 9bb0452
@parndt parndt make more stable, still testing to come 8893fb7
@parndt parndt Apply CSS class now works as with prototype 10d3dbe
@parndt parndt mark a CSS class from the dropdown when that class is selected on the…
… container that is being applied to
7cef49e
@parndt parndt ensure class names remain when the tag changes a3ec77a
@parndt parndt ensure style and class attributes are copied to links that replace ot…
…her links
d812cc0
Commits on Feb 03, 2010
@parndt parndt document IE paste feature and give image form friendlier errors 1a87376
@parndt parndt Wee fix for IE b337c66
@parndt parndt make the header display consistently across browsers 67cc973
@rubylibre rubylibre ignore theme directory 135c1a9
@rubylibre rubylibre major improvent of the flash message (flash shows and will not be ava…
…ilable next action.. like forgot password)
a7c9d8e
Luke Brown Added another test to prove the child page is still shown when set to…
… hidden
5139fc1
Luke Brown Changed the ruby operator as *and* has a lower precedence resulting in
is_in_menu being set to the return of self.live? not the whole line as expected
5df6ac6
@djones djones Thanks to these new contributors 680e240
@parndt parndt Switch to using jQuery draggable 5482c60
@parndt parndt ensure header is consistent on the login screen too 0d14279
@parndt parndt implement some code for safari from the release candidate version of …
…wymeditor that does setFocusToNode properly. Fixed whitespace on this file which was strangely incorrect.
8f4a491
@parndt parndt Merge in jQuery branch 60c1005
@djones djones now running on jQuery, good by prototype c4006ef
@djones djones test was right, I was wrong so test passes now c2a8c9e
Commits on Feb 04, 2010
@parndt parndt add in possiblity to hack the development environment when you get th…
…e A copy of XX has been removed from the module tree but is still active error
96e7745
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 6771dcd
@parndt parndt modified page parts so that they use the actual title that the user s…
…upplied as their title and then we transform it into something dom usable afterward. This makes the tests pass. Supplied migration to change existing page parts to the new format. So either page[:side_body] will work as well as page['SiDE BoDy'] or page['Side Body'] - case is not important neither are spaces vs underscores.
de6d523
@djones djones use built in attachment_fu validation. removed old last_page method f…
…rom Image. Skeleton unit tests.
325e94a
@djones djones Merge branch 'master' of git@github.com:resolve/refinerycms 13ac918
@parndt parndt reordering works differently, now you select the parent page when edi…
…ting a page and limited reordering is supported. Also some dialogues are now using jquery UI not thickbox. We'll move completely away from thickbox soon.
e68a31c
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms abcc84b
@parndt parndt we're now at version 0.9.6 (much fanfare) 9575c6a
@parndt parndt this may as well say the new version 88c423b
@parndt parndt don't copy the themes in on a gem install, these can be installed fro…
…m the gem itself.
ca91aab
Steven Heidel Added RSS feed ef96a6f
Commits on Feb 05, 2010
@parndt parndt add the body of the news post to the description field of the rss e6554bb
@parndt parndt fix wymeditor bug introduced in the change to jQuery where it parses …
…out closing tags because the jQuery replace function (or rather, the javascript one) functioned differently to prototype's gsub
1d90185
@parndt parndt update version to add RSS support and bugfix wymeditor fbb4af3
@parndt parndt fix reference to file typo 8e8cd61
@parndt parndt create theme directory if it doesn't exist on site init 303c8a1
@parndt parndt updated generators to accomodate new best practice refinery architect…
…ure and updated docs likewise. db/seeds updated to use new syntax for page parts.
fbc8f54
@parndt parndt Update the code that reloads plugin app directories to more robust code f07fe02
@parndt parndt fix a few issues identified in the resources dialog 915c60d
@parndt parndt almost there with supporting a resource picker f4346bf
Commits on Feb 07, 2010
@parndt parndt new version 0.9.6.3 which addresses the new friendly_id plugin and ch…
…anges the way that theme urls work (sorry to anyone affected) because the previous version simply didn't work with webservers like nginx which assume that they can skip rails with i.e. /stylesheets/theme/foo.css so now it is /theme/stylesheets/foo.css which also wraps everything consistently i.e. /theme/(stylesheets|javascripts|images)/file.extension - also updated a few references from RAILS_ROOT to the new Rails.root but couldn't convert all because Rails.root is not available in files like bin/* or config/preinitializer.rb for example which seems strange and could be a bug in Rails.
7f67cb3
Commits on Feb 08, 2010
@parndt parndt fix some javascript inconsistencies where we were still using jQuery …
…instead of $ and the resource picker now works.
df64890
@parndt parndt it shuold be body_content_title not body_content_page_title for the <…
…h1> title. Moved some CSS to the stylesheet.
4456986
@parndt parndt bump version to 0.9.6.4 f8a8e77
Commits on Feb 09, 2010
@parndt parndt add new Rails.root syntax to seeds and change 500 html a bit ed56a23
@parndt parndt Added the ability to use nested routes into the Dashboard Activity. R…
…emoved the use of eval from dashboard_helper and cleaned up the init files so that they are not all scrunched up.
dbe1c81
@parndt parndt unless empty makes more sense 58e39bd
@parndt parndt update rails_indexes to the latest version (thanks eladmeidar) 292c48b
@parndt parndt someone has been adding tab characters and diff cruft, this removes a…
…ll of it.
5ccf346
@parndt parndt update link to portfolio engine which has been renamed 90878af
Commits on Feb 10, 2010
@djones djones get better titles from filenames. also added tests e85c280
@djones djones whitespace 917bb82
@djones djones merged 699431a
@parndt parndt one last whitespace c7a5c04
@djones djones better titles from filenames af46212
@djones djones revert some changes ops 67a0ea1
@djones djones use rack middleware to serve static theme files from now on to make i…
…t much faster.
db5b51f
@parndt parndt Image picker wasn't working if you place two on one page. I suspect t…
…hat the resources picker will be the same. And the same for every var something = {} type thing that we're doing in admin.js because it's not object oriented so you can't create separate instances to use. This will have to be rewritten in future to use some sort of Class.create pattern.
40ab1a6
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 20ce26b
@parndt parndt new version 0.9.6.6 89b0847
Commits on Feb 11, 2010
@parndt parndt Improve the syntax so that this is easier to follow. Fixed a couple o…
…f bugs in the process which is a clear case for having easy to understand syntax.
7e2b7c4
@parndt parndt clean up some more code, fix bugs with validation on images + resourc…
…es and also ensure that the toggler works on the image picker.
6fca001
@parndt parndt fix id 1cf6dd5
@parndt parndt fix non-tree collections weren't being reordered properly in some cases a3b3dde
@parndt parndt Refinery core doesn't need to know about themes at all, actually. Mod…
…ularity win.
d017644
Commits on Feb 12, 2010
@djones djones change class methods to named scopes with default_scope sorting cdac74b
@djones djones Merge branch 'master' of git@github.com:resolve/refinerycms e78d1f1
@djones djones make opened scope work properly ef9c8dd
@parndt parndt This prevents tampering with the view_paths if we don't have a theme …
…set and makes the tests pass again for Refinery core
20a02c1
@djones djones Added unit tests to inquiries and name Inquiry.opened become Inquiry.…
…open - just better wording
4d4b428
@djones djones tidy up the way new items work with much nicer named_scopes and remov…
…ing alias content field. Not sure why that was there...
59627b8
@djones djones unit tests for news added 6d50972
@djones djones added tests and inline documentation for Refinery Settings 6826f1c
@parndt parndt Added support for a relative_url_root that is different to / to all o…
…f the ruby code based functions. Any javascripts or stylesheets that tie into the application root or have a specified path for any reason have not had this support added. Feel free to cleanly patch that support in.
ee5141f
@parndt parndt use controller_name instead e748ca2
@djones djones added unit tests to resources and refacted some image settings to be …
…a constant
23271ea
@djones djones Merge branch 'master' of git@github.com:resolve/refinerycms c6b8e69
@djones djones test type of content on resources 3600ef7
@djones djones added unit tests to themes fc138fd
@djones djones added known todos for tests ed3a982
@djones djones format with markdown b0fdfb9
@djones djones format with markdown f965879
@parndt parndt some preparation for Rails 3 06704f1
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 786e726
@parndt parndt tests don't pass without these apparently ccffcb6
@parndt parndt Prepare for Rails 3 some more. Things are all conditional and still w…
…ork in Rails 2.3.5
5c39087
Commits on Feb 13, 2010
Luke Brown BUGFIX: attachment_fu should now work correctly on windows 2b74cfb
Commits on Feb 15, 2010
@parndt parndt Added ETag caching to the Rack ThemeServer and refactored code to mak…
…e it easier to understand. Allowed controllers to be used inside theme directories as themes may need to change what happens in a particular controller e.g. PagesController. Added new :head_libraries for use with content_for :head_libraries which appears always before content_for :head - this change was important because if you were using content_for :head inside a layout file and then inside a template file, the template file would win and render first which may ruin your javascript/css dependencies. Version 0.9.6.8.
9e57148
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 96499dc
Scott Harvey Ensuring that page urls don't point to the admin namespace 0898d63
@parndt parndt Fix logic errors on content_page template and fix the refinery and re…
…finery-update-core commands to more correctly use config/environment.rb and config/application.rb
d31339e
@parndt parndt copy in the new environment file if there's an application file which…
… will hold all of the important settings from now on
7ab4ec9
@parndt parndt fix updating the core and put the attachment fu patch in a more logic…
…al place and include it from the initializer not environment.rb
a5a431a
@parndt parndt you must enable etags to use them as they're causing bugs for some 8d78b38
@djones djones use markdown format 803cd59
@parndt parndt By default we want to show logs 61de701
@djones djones add more todos 36bb58a
@parndt parndt This little change reduces the number of database queries quite drama…
…tically
221ba61
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 5d63b4f
@parndt parndt This logic wins fe9a6da
@parndt parndt update test to reflect new code 3707c15
Commits on Feb 16, 2010
@parndt parndt Use Pathname for Refinery.root (was REFINERY_ROOT) wherever possible.…
… Some occurances still remain where 'refinery' doesn't exist e.g. in the bin tasks. Specified the load order of plugins so that we don't have to hack friendly_id, aasm and will_paginate in. Version 0.9.6.10
a137bd3
@parndt parndt put a .to_s on the end of this to ensure that the comparison works pr…
…operly
e3d3fab
@parndt parndt Fixes javascript problems, notably that jqueryui 1.8 is no longer in …
…the google apis and also fixes the call to the apis (rails is supposed to not put .js on an absolute url but it has been)
8caf642
Commits on Feb 17, 2010
@parndt parndt fix a bug when having two editors on one page 0fdd64c
@parndt parndt Send a blank response with 304 4bc77f0
@parndt parndt Got the etags under control and now using a Rack::Static like impleme…
…ntation using Rack::File (thanks to wycats for prodding in the right direction)
f56a022
Commits on Feb 18, 2010
@parndt parndt get rid of some code smells and complexities 7ea0b63
@djones djones first functional test in. login_as test helper setup to make it easy …
…to log a user in and start testing Refinery itself
0c1abac
@djones djones added instructions explaining how to run the tests 0a435b5
Commits on Feb 22, 2010
Luke Brown Removed double confirmation, just let jQuery handle it 017c441
Steven Heidel =~ method for path names is deprecated in Ruby >1.9 2d8c3b2
@parndt parndt do more to ensure that paths are unique before saving them to global …
…variable or adding them to the load path.
353cfaf
@parndt parndt Refinery.root wasn't being set properly because while the pathname wa…
…s blank it was still a pathname.. Now we check for length.
d1071da
Commits on Feb 23, 2010
@parndt parndt Refactor the way that Refinery figures our paths and add messages and…
… documentation for these processes.
7fe80cf
@parndt parndt cleanpath 81329cb
@parndt parndt decouple themes from the main application some more 266c848
@parndt parndt Fix bug that was introduced that threw out page ordering in the menu f297010
Scott Harvey Perform .to_s on title before trying to truncate to prevent error fd98bd2
@parndt parndt Fix password reset code c928865
@parndt parndt forcibly reject user from plugins that they can't access because they…
… don't have permission.
b5669da
@parndt parndt Support slim_scrooge version 1.0.5 and above as sdsykes has made this…
… work cross-platform now so we don't have to exclude Windows (thanks to sdsykes)
947847d
@parndt parndt Fix problems that people were having installing/updating gems. Please…
… update to version 1.3.6 of rubygems by typing: gem update --system
8913b55
Commits on Feb 24, 2010
@parndt parndt Remove Theme support UI but leave in Theme support. Now it's set by t…
…he developer specifying the theme name in Refinery Settings (We've had a lot of requests to get rid of the UI for this which we do tend to agree with as clients don't really need it). Themes are now hot-swappable EXCEPT for any controllers you have inside there won't be reloaded which may give you some grief unless you restart your webserver after swapping the active theme. This was a necessary caveat unless anyone can figure out how to swap out controllers at runtime?
757e1cc
@parndt parndt We don't need to load in the controller paths unless a theme is speci…
…fied
c6bd269
@parndt parndt Just a different description for the version bump task fa9a8a3
@parndt parndt Seems like time for a new version 0.9.6.13 0664576
@magpieuk magpieuk [GitHub#43] BugFix for pageparts d412104
@parndt parndt copy themes directory when installing from gem 0e6de5d
@parndt parndt copy version file too f2d2836
Commits on Feb 25, 2010
@parndt parndt Rewired how Refinery gets access to its core components when installe…
…d as a gem vs as a clone. This solves some problems that people were having with friendly_id (among other plugins installed via gems) being included by plugins that complained before it was possible to run rake gems:install to fix it.
5187f54
@parndt parndt encode HTML before substituting in HTML for formatting inquiries 7d468c7
@parndt parndt Be more descriptive as to what's going on when I hit delete and remov…
…e the requirement for PagePart to use has_friendly_id as it wasn't really needed.
ff93de9
Commits on Feb 26, 2010
@parndt parndt Refinery now will cache RefinerySetting lookups inside the Rails.cach…
…e and changing the theme will switch to a new fragment cache key for the site menu because the theme name is now appended to the fragment cache key. (thanks stevenheidel for the tip). Also cleaned up whitespace (for some reason there was diff cruft)
a0eacf5
@djones djones working towards more functional tests bb5822d
@djones djones merge 06dcc5c
@djones djones testing recent activity and adding in images functional tests 9a47675
@djones djones auto login with tests on setup but still allow logout for testing sec…
…urity.
490c0f0
@djones djones tidy up commented out code ad5f338
@djones djones better functional image test coverage fcf7c81
@djones djones should be an image param not a post param 8f0881e
Commits on Feb 27, 2010
@parndt parndt improve the parents list to filter out bad pages e.g. the current pag…
…e or any of its decendants
927c13c
@parndt parndt Focus first textarea or input type text element inside a dialog when …
…the dialog is opened. Fixes (mostly) issue 44 (http://github.com/resolve/refinerycms/issues/#issue/44)
1aa7666
@parndt parndt minor css fixes for IE 03e19fb
@parndt parndt conciseness and type=text works better than text 45e9783
@parndt parndt Got rid of thickbox and converted core dialogs to using jQuery UI's .…
…dialog
dde1d53
Commits on Mar 01, 2010
@parndt parndt Fix themes breaking rake db:setup because RefinerySetting.table_exist…
…s? is false.
3ab2202
@parndt parndt Removed Gemfile & bundler. That can wait until Rails3 integration, ri…
…ght now it is more trouble keeping up than it is worth. Moved a lot of config that is troublesome into refinery core so that we don't have to manage updates. config/application.rb now uses a simpler format (which no doubt will change with Rails3). Added deprecation warnings for constants that have been replaced - REFINERY_ROOT is now Refinery.root and USE_S3_BACKEND is now Refinery.s3_backend
dc9c235
@parndt parndt Added the ability to test the core Refinery project from an installed…
… application (this is applicable if you're running from a gem). To run the Refinery tests use the new command rake test:refinery which runs all unit, functional, integration and performance tests inside Refinery core without having to copy them to the current directory. This is also compatible with having your own tests in your own test directory so you could run rake test && rake test:refinery to have full coverage. rake test:refinery does respond whether you're running from gem or not, however if you're not running a gem then rake test achieves the same goal.
a2085fc
@parndt parndt And then, the moment after committing, I realised that I hadn't inclu…
…ded any of the right paths that would actually make this work (I had been saving the wrong files -- the ones in my test directory). So here they are.
e06b578
@parndt parndt Ensure anchor tags can't be navigated to from within the wymeditor do…
…cument
f845bb7
@parndt parndt use the shared head for the dialogue layout too because it makes more…
… sense to unify.
5950a5c
Commits on Mar 02, 2010
@parndt parndt Remove old thickbox code and hook into the ui dialog instead 2c67670
@parndt parndt use new dialogs code 33967f6
@parndt parndt New version addresses issues with the javascript functions 0848b3f
@parndt parndt fix override task 4ab0baf
@parndt parndt new version 947765a
Commits on Mar 03, 2010
@parndt parndt Hooks into the image picker API when you script/generate refinery tit…
…le:string image_id:image (for example) i.e. when you specify a field is type 'image' it will set it up as an integer field and create a belongs_to association with the Image model and create an image picker on the backend and display the image using image_fu on the frontend. Fixed a few bugs with the image picker in the process. New Version 0.9.6.18
395c711
@parndt parndt Don't bold this page 47a1e9d
@tsdbrown tsdbrown Removed the line that changes the template root for ActionMailer::Bas…
…e, this is no longer needed and causes a template missing error in any app level mailers
c6507f8
@parndt parndt fix whitespace (again?) and reduce friendly_id gem requirement to 2.2…
….2 because this works too and provides greater compatibility with previous releases of Refinery
132a961
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 0e290a1
Commits on Mar 04, 2010
@parndt parndt support image_submit_tag for themes too 1fe4111
@parndt parndt fix reordering for lists of size greater than ten. 65ef303
@parndt parndt Fix issue #47 with never-showing-up news items and where is this whit…
…espace coming from?
8fe512d
@parndt parndt Improve the generator's usage, readme and migrate message now appears…
… *after* generation is complete
98d03ab
@parndt parndt New Version 0.9.6.19 e87382a
@TylerRick TylerRick Ruby 1.9 compatibility fix: add a to_s to the Pathname
Ruby 1.8 allowed Dir[Pathname.new("whatever*")] but in Ruby 1.9:

Dir[Pathname.new("whatever*")]
TypeError: can't convert Pathname into String
244f5b2
@TylerRick TylerRick Ruby 1.9 compatibility fix for this error:
indexer.rb:18: Invalid next
indexer.rb:22: Invalid next
indexer.rb: compile error (SyntaxError)

This works around upstream issue:
http://github.com/eladmeidar/rails_indexes/issues/#issue/11
ec76a6d
@TylerRick TylerRick Fixed minor spelling mistake (set up and log in each require a space
when used as a verb).
e70d5c6
@parndt parndt remove news plugin so that it can be an external plugin c742abd
@parndt parndt Document where we would place code and what sort of code to fix Issue #… d1c7dff
Commits on Mar 05, 2010
@parndt parndt Further prevent unlikely XSS entry points. Note that no code was actu…
…ally being executed so there was no security risk, but it could have possibly made the display on the dashboard and the email go a tiny bit funny.
d29a17e
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms cd7f479
@parndt parndt gem disabled for now a0e6a7d
@parndt parndt remove auto_discovery_link_tag for now 4d76004
Commits on Mar 07, 2010
@parndt parndt Fixes issue #56 where reordering didn't trigger a menu cache expiry. cfffe97
Commits on Mar 09, 2010
@parndt parndt Fix Issue #53 where app/views wasn't taking precendence over theme/cu…
…rrent_theme/views. app/views now override all other views which is expected Rails behaviour.
9c8e40f
@parndt parndt small refactor 7699d73
Commits on Mar 11, 2010
@parndt parndt improve routing and syntax 641d193
@parndt parndt news items shouldn't be here anymore c23635b
@parndt parndt Make friendly_id a plugin rather than relying on a gem which seems to…
… always cause users problems.
1411ffc
@parndt parndt require refinerycms-news 0.9.7 c51e193
@parndt parndt update .gems file for heroku (thanks unixcharles) 86e197d
@parndt parndt Update instructions to explain how to use the news engine fa3a389
@parndt parndt update news link to new repository 035a72d
@parndt parndt Remove gem dependencies and install these packages as vendor/plugins …
…of Refinery core instead. This should save a lot of people a lot of grief.
4a9fcb5
Commits on Mar 12, 2010
@parndt parndt Removed act as state machine - we don't really need it. d322a8b
@TylerRick TylerRick Added config.log_level = :debug to config/environments/development.rb fc70bfb
@TylerRick TylerRick Set config.reload_plugins = true because that would make things less
tedious so we don't have to restart the server every time we change a
controller in a plugin.
874133d
@TylerRick TylerRick Changed authentication plugin to use Authlogic instead of
restful_authentication.

This makes it possible for people to integrate Refinery into apps that
are already using Authlogic for authentication.

For those who were using Refinery's default (restful_authentication),
this change shouldn't affect you either. Authlogic's
act_like_restful_authentication = true option means that users should
still be able to log in even though their passwords were encrypted with
restful_authentication. The transition_from_restful_authentication
option means that "every time a user successfully logs in and their
password is encrypted with the restful_authentication algorithm it will
update their password with the Authlogic algorithm. When a new account
is created it will use the Authlogic algorithm. This allows your user
base to slowly transition and allowing them to still be able to log in."
(http://www.binarylogic.com/2008/11/23/tutorial-easily-migrate-from-restful_authentication-to-authlogic/)

The User model is also a lot simpler now, since most of the authentication
code is handled in the Authlogic gem itself. This leaves the model so
that it only needs to worry about application-specific stuff.
04b71b3
@TylerRick TylerRick Removed unused columns generated by restful authentication.
(See also 96c28c5)
94036f1
@TylerRick TylerRick Commented which methods in app/models/user.rb we can probably get rid of
if we switch from restful_authentication to authlogic.
c63c674
@parndt parndt implement support for recent changes 4c4abad
@TylerRick TylerRick Made it so that users can by default log in with either their login or
their e-mail address, since this is a common and easy mistake to make.

Added a 'login_field' setting that allows you to ask for e-mail address
instead of login (the default) on the login page.

This setting wouldn't have worked to be stored in the database, so I
simply added a class accessor method to RefinerySetting.
80116f1
@parndt parndt Implement the login_field setting on the Refinery module as authentic…
…ation_login_field instead of the RefinerySetting model, which reduces coupling. Also it provides a nice example of how plugin developers could create their own settings using Refinery module. Added a new file config/settings.rb to allow these settings to be changed per-app.
587f9d8
@parndt parndt Make tests work with the new authlogic regime 903c8af
@parndt parndt Update link to portfolio gem e0225ad
Commits on Mar 14, 2010
@myabc myabc Authlogic (with SQLite3): Make two db columns nullable
* Should un-break tests for both master (Rails 2.3) and rails3 branch.

Signed-off-by: Alex Coles <alex@alexcolesportfolio.com>
f6717a4
@TylerRick TylerRick One more place where RefinerySetting.login_field needed to be changed to
Refinery.authentication_login_field
8beea83
@TylerRick TylerRick Fix a bug where it would always say "Logged in successfully" even when
they weren't logged in successfully.

Somewhat confusingly, UserSession.create is not the same as
UserSession.new.save. UserSession.create will return a UserSession
object (such #<UserSession: no credentials provided>), even if there was
an authentication error. This changes it back to use save, which returns
true or false.
3b52761
@TylerRick TylerRick The name of the text_field needs to match the name set as the
login_field in UserSession or we will get "undefined method a `login'
for #<UserSession: no credentials provided>" error when
Refinery.authentication_login_field is set to 'email'.
7d987ea
@TylerRick TylerRick Changed the error message to read "Sorry, your email or password was …
…incorrect."

if they are using Refinery.authentication_login_field = 'email'.
4c1ffa7
@TylerRick TylerRick Added a warning for users who are integrating Refinery into an existing
app that has an Authlogic-created users table.
6e7efc8
@parndt parndt Default login field is login to keep standard with how it's always been 1e6689e
Commits on Mar 15, 2010
@parndt parndt It's now possible to opt-out of the IE6 upgrade message, but please d…
…on't unless your site is fully compliant as we're really hoping that users will see it and upgrade.
1b236e5
@parndt parndt Welcome back, tooltips. e33afa3
@parndt parndt rendering tweaks to improve loading across browsers c97c559
@parndt parndt Add authlogic as a plugin and only run the acts_as_authentic block if…
… the table has been created already (this allows rake db:setup to work).
9536893
@parndt parndt Load authlogic before other plugins and set users to active when crea…
…ting them.
79a6f06
@parndt parndt Try to use title first but if title is missing use tooltip (which we …
…create)
2cf2414
Commits on Mar 17, 2010
@djones djones add analytics to github e46655b
@djones djones turns out github doesn't let you put JS in place d540527
@parndt parndt Update slim_scrooge to work as a plugin e1f3e41
@parndt parndt We no longer use authlogic as a gem but as a plugin 7dd4c88
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 56cf219
@parndt parndt Remove state from users. Tests are still inexplicably failing. bacb704
@myabc myabc Fix functional tests to work with Authlogic
* Update fixtures to include persistence_token and setup authlogic test
  helpers correctly.

Signed-off-by: Alex Coles <alex@alexcolesportfolio.com>
21d94fa
@djones djones formatting improvement c744b57
@parndt parndt update slim scrooge to dynamically figure out makefile stuff and igno…
…re these files.
f44821c
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms acc4ade
@parndt parndt fix whitespace a7822ac
@parndt parndt update to latest version of parndt/slim_scrooge 095ac3f
Commits on Mar 18, 2010
@djones djones keep a centralised method for the cache key 4043cd5
@djones djones tidying up things a little with the themes. 0b63e1c
@djones djones tidied up themes some more 1ef2937
@djones djones required option just incase someone wants to override the way themes …
…are selected, they can get all the environment info too to help them make that decision
276f414
@parndt parndt Provide an opportunity to inject code after the javascript libraries …
…are included but before any other libraries are included.

This is useful for example when you want to supply custom_wymeditor_boot_options (say you wanted to specify the translation that wymeditor's using, that sort of thing).

Use it like in this example: <% content_for :head_after_javascript_libraries do %><%= javascript_include_tag '/shared/admin/my_javascript_options' %><% end %>
769e02a
@parndt parndt Update to latest version of slim_scrooge (thanks sdsykes) 9efbd21
Commits on Mar 19, 2010
@djones djones refactored load order for working out the current theme. Also save se…
…tting without bang
4918eb4
@djones djones Merge branch 'master' of git@github.com:resolve/refinerycms 5339816
@djones djones merge e1b5601
Commits on Mar 20, 2010
@parndt parndt prepare for next vesion (not necessarily coming any time soon) 0557994
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 25b4373
Commits on Mar 21, 2010
@unixcharles unixcharles add resource field type support to generator c7a80f3
Commits on Mar 22, 2010
@parndt parndt copy the new settings file if it doesn't exist yet ea5314f
@parndt parndt Merge branch 'master' of git://github.com/unixcharles/refinerycms b5fffc0
@parndt parndt comment out differently fef9102
@parndt parndt RegExp matching here instead 3e9733e
@parndt parndt Better tooltip code. Now you can apply tooltips to spans using title=…
…'hello world' or you can apply them to anything using tooltip='hello world' (for example)
ed791f8
Commits on Mar 23, 2010
@parndt parndt Upgrade jquery && jquery ui. If you want this to be handled automatic…
…ally in your sites, make sure you include then with <%= jquery_include_tags %> as that's something we will handle on each upgrade.
89397da
@parndt parndt fix ordering in parents list db78a31
@parndt parndt update task now keeps jquery up to date 78e92af