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 18, 2010
@parndt parndt make more trendy 081449f
@parndt parndt gotta get the hang of this html_safe thing 2bbb45d
@parndt parndt Redo list css, make nested sortables work properly. 754647d
@parndt parndt Slow down the tooltips and change the way they animate. Also fix GH I…
…ssue #92 -- Thanks, Ygor
21415cd
@parndt parndt Fixes problems raised in last commit 9c7371a
@parndt parndt and make it tidier b7ea616
@parndt parndt whitespace.. a9c5691
@parndt parndt Make the animations smoother and cooler. 4578ce2
@parndt parndt even better animation quality on remove of tooltip 388c509
@parndt parndt Fix display in IE browsers 49016d5
@parndt parndt Exclude IE from awesome sortability because it can't cope. 00feec2
@parndt parndt Remove features from Internet Explorer users that don't work quite ri…
…ght. Tell the user their browser isn't great.
bdc4417
@parndt parndt Correct capybara ignore 2c5814d
@parndt parndt Cucumber pages test now passes, green looks so good. a55f951
@parndt parndt Add cucumber scenarios for creating valid and invalid pages. ef310d7
@parndt parndt whitespace and update gemspec, tinkered with dynamically loading in r…
…ejects from .gitignore but not working yet.
1c56985
stevenheidel Corrected syntax error in refinery-update-core that would cause the f…
…ollowing error:

fileutils.rb:1262:in `initialize': No such file or directory - ./public/javascripts/if/File.exist?(File.join(%W(/home/steven/.rvm/gems/ruby-1.8.7-p174/gems/refinerycms-0.9.7.dev/public/javascripts/jquery-ui-custom-min.js)))/jquery-ui-custom-min.js (Errno::ENOENT)
200b9ac
Steven Heidel Added instruction to run bundle install after update. The entire proc…
…ess of updating the gems and environment should be reviewed as much of it is now deprecated.
da63882
stevenheidel Fixes 'can't modify a frozen hash' error which appears when running r…
…ake db:migrate.
2a8ef30
stevenheidel Fixes an error where 'undefined method 'scoping' for #<RefinerySettin…
…g>' appeared every time find_or_set was called.
5f5d292
stevenheidel There is no reason this file should be ignored, especially considerin…
…g that the other 2 .example files are both included.
4041bda
stevenheidel Updated to follow Cucumber philosophy. See http://wiki.github.com/asl… f9fc5d7
stevenheidel Added a (not completely implemented) scenario testing the creation of…
… pages with the same title.
e1b9d43
stevenheidel DRY up cucumber by using background to log in user.
Background will be run before every scenario, see http://wiki.github.com/aslakhellesoy/cucumber/background .
998abd4
Commits on Jun 19, 2010
@parndt parndt No longer cache this gem. If you need one because json_pure doesn't c… d70f4ce
@parndt parndt Switch out Hpricot to truncate_html which uses regexp and make conten…
…t page sections html_safe by default. Fix whitespace.
6be8eec
@parndt parndt Don't need to explicitly require the library as bundler handles it b947ed4
Commits on Jun 20, 2010
stevenheidel Completed 'Create Duplicate Page' scenario.
The  'Then I should have a page at...' method is a bit hackety hack, but it works.
c8f5186
@jgdavey jgdavey Fix image selection bug for Safari b994681
@jgdavey jgdavey Relabel and slightly refactor the image dialog size selector
The rationale here is that CSS values are easier to understand than
having to do a bunch of mental math with the 'modifier' values.

Also, this provides a little more UI help text display the label
of the thumbnail in the box, and having the raw pixel values in the
tooltip.
04607d9
@jgdavey jgdavey WYMeditor: Allow the container buttons to be customized, just like th…
…e ClassesItems (Apply Styles menu)
8b10b43
@parndt parndt Fix a passive few runtime errors d3e31f5
@parndt parndt More obvious size selection 764bded
@parndt parndt Added help descriptions for each of the default settings in Refinery. 04a2f9b
@parndt parndt Add help to the refinery settings form bf60de7
Commits on Jun 21, 2010
@parndt parndt Refactor JS, make tabs look normal by default, make dashed border aro…
…und selected images in wymeditor, start on making cornering happen without JS if supported (bottom / top syntax invalid for now)
dfb0991
@parndt parndt fix diff and implement native CSS rounding where it is implemented in…
… admin.js
bddf2af
Commits on Jun 22, 2010
@parndt parndt Provide a hook to disable the prompt for the continue editing dialogu…
…e on site bar switch to website.
ff31a3e
@parndt parndt Make the form tell us whether changes have been made so that we don't…
… have to prompt all the time
c3fd6be
@parndt parndt Mozilla tells us the image is selected already 65a727f
@parndt parndt Add feature files for the other features that are not covered by cucu…
…mber yet
47b36bb
@parndt parndt consistency e over evt 7ea069d
@parndt parndt Support setting scoping using []= method e3d3d3a
@parndt parndt Slight refactor, check against blank site name too. 36f0d04
@parndt parndt Add descriptions to the features d63bf70
@joemsak joemsak Updated readme for themes. It said to use /images/themes but really y…
…ou're supposed to use /theme/images
aefb7c7
@parndt parndt Don't cache when there's no pages 26b92c1
@parndt parndt features are .feature not .rb d1da30e
@parndt parndt Fixed issues with how wymeditor gets overriden and fixed a CSS issue …
…(CSS Issue fixes GH Issue #94)
2803feb
@parndt parndt Provides a smart upgrade path for public/javascripts/admin.js 7a9de25
@joemsak joemsak Typo fix in site bar css 251e203
@parndt parndt Ensure initializers are copied but only if they don't already exist w…
…hich preserves modifications by the user.
e64c0d8
stevenheidel Fixed small typo for the manage users feature. 1050074
stevenheidel Copy .gitignore over on new gem installations. bc31ac7
@parndt parndt Bring in the acts_as_indexed config file ourselves because acts_as_in…
…dexed can load it too late due to our vendor/ architecture.
3592007
@parndt parndt Copy acts_as_indexed_config.rb file into config unless it's already t…
…here.
8cc84af
@parndt parndt regenerate gemspec c3c54ae
Commits on Jun 23, 2010
@parndt parndt Try without specifying acts_as_indexed here 6a502c2
@parndt parndt Disable resource caching by default on s3 backends. 2e8418f
@parndt parndt Merge in latest master 3207148
@parndt parndt make the routing work again 9ef8cba
@parndt parndt CSS and translations c23aa57
@parndt parndt regenerate gemspec and give advanced options button a title 5a7deff
@parndt parndt update instructions 258c3bf
@parndt parndt update url 88f1ffb
@parndt parndt regenerate gemspec and rename all of the markdown readme files to rea…
…dme.md so that they show automatically and it also makes more sense this way as the engines are technically separate applications.
7423eba
@parndt parndt Got i18n behaving properly. 245df5b
@parndt parndt get rid of the language switcher from being rendered and made it use …
…the rails locale rather than the refinery one as they can be different on the frontend.
5dcaf1e
@parndt parndt Fixed cucumber tests 5f5c139
@parndt parndt make more readable 85bff9c
@peterz peterz Change plugins names to titles and fix error on creating new user bd8f127
@parndt parndt use resource caching when the javascripts cache directory is writable 34cc5dd
@peterz peterz Revert "Change plugins names to titles and fix error on creating new …
…user"

This reverts commit bd8f127.
5de975a
@parndt parndt Remove <br/> from setup_website_name c33263e
@parndt parndt Remove line break f0d9a55
@parndt parndt Remove all TODO: TRANSLATE 64c1c78
@parndt parndt line up width with backend width 0315f0f
@parndt parndt Use .children instead of setting parent_id 8fb428a
@peterz peterz Fix dot typo in translate method b0f0085
@peterz peterz Fix dot typo in translate method 0562a2b
Commits on Jun 24, 2010
@awagener awagener Allow hashes to be used as a RefinerySetting without being a scoping …
…hash
4669ebc
@parndt parndt Merged with master again ad61ccd
@peterz peterz Merge remote branch 'upstream/i18n' into i18n 7e33266
@peterz peterz Move delete title inside hide_delete condition and add missing transl…
…ation
df027b0
Commits on Jun 25, 2010
@peterz peterz Move delete title inside hide_delete condition and add missing transl…
…ation
6c0b359
stevenheidel Prevents all refinery setting help texts from being shown upon 'Creat…
…e New Setting'. Thanks to joemsak for pointing this one out.
53b40d9
Commits on Jun 26, 2010
@peterz peterz Merge remote branch 'upstream/i18n' into i18n 4cf2b8b
@peterz peterz Add missing bracket 2520a95
Commits on Jun 27, 2010
@peterz peterz Add missing bracket 4938886
Commits on Jun 28, 2010
stevenheidel Add a restricted column to refinery settings. 5bea059
stevenheidel Implemented the restricted value of Refinery Settings.
Only the superuser can change the value of restricted, and if restricted is set to true then regular users cannot edit/delete that particular setting. However, this could still have bugs.
8388fa6
stevenheidel Required is not the same as Restricted, not the same at all. Restrict…
…ed is the correct answer however.
4682148
stevenheidel This syntax makes more sense for excluding restricted settings from r…
…egular users.
ff6d185
stevenheidel At this point, things are getting out of hand. dbd6e72
@parndt parndt Merged in master 15196c1
@parndt parndt We don't use hpricot anymore. e74d3c8
@parndt parndt Check for presence before titleize because otherwise we get NilClass …
…in the title.
846c261
@parndt parndt One and the same thing. 8a2ebb6
@parndt parndt Prevent locking up on the frontend truncation by cutting inquiries do…
…wn to an acceptable and reasonable size.
9bcc272
@awagener awagener Added roles to users; restricted refinery to only users with the 'Ref…
…inery' role
791a2f1
@parndt parndt Fix upgrading to this version c14b43f
@parndt parndt Remove overcomplicated return to logic and just use @page instead. Ov…
…erride if you want to add additional objects that can be returned to but this may get configurable later.
de81549
@parndt parndt Merged in master b17f5ba
@parndt parndt explicitly require truncate_html plugin in the html truncation helper. d2d9b76
@peterz peterz Merge remote branch 'upstream/i18n' into i18n 7437379
@peterz peterz Fix restriction controller error
Without menu match you cannot insert image in wymeditor
014927f
@parndt parndt @page may not exist so we need to rescue that by checking for its pre…
…sence first.
3dbf1dd
Commits on Jun 29, 2010
@parndt parndt Merge branch 'master' into i18n e325ad4
@parndt parndt Make the default inquiries fields mildly more exciting. 6fa296e
@parndt parndt Merge branch 'master' into i18n a5a592c
@parndt parndt Fix some broken locale keys. No missing keys in English but we'll nee…
…d help with the other languages which do have missing keys.
16ddaca
@parndt parndt Fix issue with display of items and class interfering with title text. 8191548
@parndt parndt Reduce height of notification recipients dialogue fe75694
@parndt parndt Make clickable dfd7b9a
@parndt parndt fix diff 3841ed4
@parndt parndt Move functionality out of the view and into the helper d4c9fa4
@parndt parndt Merge site bar logic change from master b050242
@parndt parndt Ensure that the cucumber environment has its own database (problem sp…
…otted by awagener)
2a09915
@parndt parndt Merge branch 'master' into i18n 54a4397
@parndt parndt Fix bad positioning of HTML and CSS fb7d353
@parndt parndt merge changes from master into i18n version f5287b3
@parndt parndt Big thanks to evanphx -- now Refinery runs green on rubinius. 1a99377
@parndt parndt Added config.ru to run as a rack app 3ddc6d3
@awagener awagener Switched cucumber user logins to use factory girl 99a0e89
@parndt parndt add new gem requirements c393f82
@parndt parndt Added callback proc support to settings, unused as yet. 775aeb2
@parndt parndt Add said: translation for english and merged with master. f3fb04a
@parndt parndt speed up lookups and remove locales from seeds, hook into callback_pr…
…oc_as_string to re-setup i18n if it is enabled or disabled.
c5ee802
@parndt parndt Add default name if one wasn't supplied and use this in the menu matc…
…h by default. Add a position to users created in cucumber.
f64277f
@parndt parndt Fix menu matches on some plugins and fix reordering of backend menu. c65799c
@parndt parndt updated not created 77534f9
@parndt parndt exclude wymiframe from the routing filter. 9162260
@peterz peterz Add some missing sl translations ad28550
@peterz peterz Add some missing sl translations
Remove unnecessary  translation
abd68fe
@peterz peterz Merge remote branch 'origin/i18n' into i18n 99da853
@peterz peterz Fix typo in sl locales cf53323
@peterz peterz Add missing translation 318facb
@peterz peterz Add sl translations for WYMeditor 5ef4b92
@peterz peterz Merge remote branch 'upstream/i18n' into i18n 39b811e
@peterz peterz Add some missing sl translations 260a67a
@peterz peterz Fix typo in sl locales 5ad4f0f
@peterz peterz Add missing translation 67891ac
@peterz peterz Add sl translations for WYMeditor 23a7011
@awagener awagener Switched cucumber user logins to use factory girl f6dd315
@awagener awagener Moved check whether to display site bar to site bar partial; added te…
…sts for this
2abbb17
@awagener awagener Switched cucumber user logins to use factory girl 6b15460
@parndt parndt Added callback proc support to settings, unused as yet. 1efec7f
@awagener awagener Cucumber tests for creating the initial user 71064a1
@joemsak joemsak Added explicit height to table insertion dialogue for WYM c392866
stevenheidel .gems file is no longer needed on Heroku as bundler is used instead. …
…As well, this particular .gems file causes problems due to the fact that comments are not allowed.
c021ec8
Commits on Jun 30, 2010
stevenheidel .gems file is no longer needed on Heroku as bundler is used instead. …
…As well, this particular .gems file causes problems due to the fact that comments are not allowed.
aff5ae3
@parndt parndt new schema file? f1bf5fe
stevenheidel Merge branch 'master' of git://github.com/resolve/refinerycms 39e4f87
@awagener awagener Switched cucumber user logins to use factory girl b9e2df1
@awagener awagener Moved check whether to display site bar to site bar partial; added te…
…sts for this
71a718f
@awagener awagener Switched cucumber user logins to use factory girl 7f568e6
@parndt parndt Added callback proc support to settings, unused as yet. 1544760
@awagener awagener Cucumber tests for creating the initial user 35ba11e
@joemsak joemsak Added explicit height to table insertion dialogue for WYM 23a593b
stevenheidel .gems file is no longer needed on Heroku as bundler is used instead. …
…As well, this particular .gems file causes problems due to the fact that comments are not allowed.
17392f8
@parndt parndt Properly make the default locale settable by refinery setting and cle…
…an up method signatures.
3f491c8
@parndt parndt Merge branch 'master' into i18n 85daa61
@parndt parndt String comparisons have no place here when checking environment, ther…
…e are builtin functions for this.
119ad9a
stevenheidel Updated schema 638aaf3
stevenheidel Updated Gemfile to use latest version of RMagick. This is required fo…
…r Rubinius as all previous versions create an error.
c7f5e8c
@parndt parndt Don't redirect when we're accessing urls under the default locale as …
…it shouldn't append a locale in this situation.
ba967b0
stevenheidel Refactored User feature, this is a cucumber convention b0f4a69
stevenheidel Initial generation of rspec for testing 1fcbce9
stevenheidel Specdoc is a much nicer format, it also gives you semi-good documenta…
…tion of the capabilities and features
bf60e13
@jgdavey jgdavey Allow original size to be used in image insertion. Useful especially …
…for really small images.
27d03cb
@jgdavey jgdavey Shrink height of dialogs a bit; things were getting too crowded 61456e2
@eclubb eclubb Ignore VIM .swo files. 55355c3
stevenheidel The very first refinery spec works as advertised 570c809
stevenheidel Updated Gemfile to use latest version of RMagick. This is required fo…
…r Rubinius as all previous versions create an error.
5e8ad38
stevenheidel Refactored User feature, this is a cucumber convention ac8daef
stevenheidel Initial generation of rspec for testing 5abb866
stevenheidel Specdoc is a much nicer format, it also gives you semi-good documenta…
…tion of the capabilities and features
75ef24e
stevenheidel The very first refinery spec works as advertised cbb51d2
stevenheidel Some of the old habits still linger within the rspec-rails generator 6684004
stevenheidel Added test-unit to the bundle 01fce47
stevenheidel Updated schema 6a7325b
stevenheidel Initial generation of rspec for testing 7d07bf7
stevenheidel Specdoc is a much nicer format, it also gives you semi-good documenta…
…tion of the capabilities and features
d5cdce3
stevenheidel Some of the old habits still linger within the rspec-rails generator 4378915
stevenheidel Added test-unit to the bundle 5e3e945
@parndt parndt whitespace b452ca9
@parndt parndt and yet again whitespace 4716bb2
stevenheidel Merge conflict #1 c7617e4
stevenheidel This way is required for most of rspec's special features to work 97cab47
@parndt parndt Remove .gems from gemspec and ensure files exist before specifying th…
…em in the gem.
67f15f6
@parndt parndt make use of widest a2930f3
stevenheidel Merge branch 'master' of git://github.com/resolve/refinerycms 980af24
@peterz peterz Merge remote branch 'upstream/i18n' into i18n 937d428
@parndt parndt Add |c| block to proc 3a36fe7
stevenheidel Merge branch 'master' of git://github.com/resolve/refinerycms 4477473
stevenheidel This way is required for most of rspec's special features to work 42777de
stevenheidel Merge branch 'master' of git://github.com/resolve/refinerycms ae821f2
@peterz peterz Fix some sl locales 93f86c6
@parndt parndt Remove cache folders from the gemspec fe3ecbd
@parndt parndt Merge branch 'master' into i18n 3a89dcb
@parndt parndt Fix image test for new number of items 7379ce2
@parndt parndt Merge branch 'i18n' e2490c9
@parndt parndt Cause tests to pass again after merge by fixing the code. ffc7db0
@djones djones 2010 not 2009 c7a0c3f
Commits on Jul 01, 2010
@parndt parndt Merge branch 'master' of github.com:resolve/refinerycms 03a620f
stevenheidel Now is as good of time as any to start a CHANGELOG. This one was auto…
…generated through the github API and people can fill in the details of their contributions at any time.
ff95621
stevenheidel Renamed the changelog and also started to add some more detail to it. b68eb27
@parndt parndt Fixed some issues after the merge with i18n. df42f0a
@parndt parndt Merge remote branch 'steven/master' 7981ddb
@parndt parndt schema file was not up to date. 0e25243
@parndt parndt fix broken logout functionality 6028220
@parndt parndt Fix lots of broken locales 1d977d4
@awagener awagener removed redundant calls to logged_in? as refinery_user? checks logged…
… in; users who are not refinery users should also see password reset flash
3d7e6b7
@parndt parndt whitespace cleanup d0191cc
@awagener awagener Added methods to user to add and remove roles to simplify code; added…
… [] method to Role to access roles
39e9a36
@awagener awagener Replaced superuser column on User with superuser role ad4df79
@awagener awagener Added methods to user to add and remove roles to simplify code; added…
… [] method to Role to access roles
604c7b9
@parndt parndt cleanup 24421bb
@parndt parndt Thanks to halan (http://github.com/halan) for pointing out that this …
…was still using :title =>
05aa13f
@parndt parndt fix a css broken in the i18n merge with the tree list a45ca20
@parndt parndt speed up production mode by around 10% by only setting theme cache ke…
…y when the current value differs (production mode is already so fast)
df05910
@parndt parndt just prose, mainly. 0c67cfd
Commits on Jul 02, 2010
stevenheidel Finished final few keys of the French translation. Feel free to make …
…corrections.
e824d67
@parndt parndt added lots of locale translations, fixed some, our german is a bit ru…
…sty.. resources form and images form need to be translated now for maximum file size but English defaults added.
8e7a0e8
@parndt parndt sort the locales by alphabetical 5158967
@parndt parndt ensure the user doesn't already have the role before adding it. 6fa7872
@parndt parndt ensure we don't create a role from a role object. e80dbfd
@parndt parndt and ensure so here too. 72ee51d
@parndt parndt be more explicit 1d4240b
@parndt parndt Ensure that we camelize before using find_or_create_by_title or we ge…
…t unpredictable results. Refactor user creation to only add roles when user is valid.
541564d
@parndt parndt We've had lots of requests for sqlite3 so it's now enabled by default…
…. Let us know if this causes you issues.
b8ed1a3
@joemsak joemsak Icons and file extensions added to resources tab 009a59d
@parndt parndt CSS now is friends with Refinery plugins again 2b81fce
@parndt parndt Move to core icons folder, be wonderfully specific about the css inhe…
…ritance and add a default icon for all files.
7158f0a
@parndt parndt Didn't need these css values really, increased left padding bb80b99
@parndt parndt quite important for firefox actually 25d54b6
@djones djones spam filtering support for the contact form and full management of sp…
…am on the backend
d56c928
@djones djones Merge branch 'master' of git@github.com:resolve/refinerycms 8368e51
@djones djones DRY up grouping records by date. Also you can now use the group_by_da…
…te method in your own plugins
398d2b2
@djones djones explain to everyone that the contact form now supports spam checking 33ac75f
@parndt parndt Refactor i18n and add missing key. 0c3304e
@joemsak joemsak Added icons to the link resources dialog, too 3fb840a
@parndt parndt fix locales for dialogue. 72d3982
@parndt parndt fix routing in some conditions like when i18n is on 1c57572
@parndt parndt Check for users in the refinery role 6b456c2
@djones djones add spam filter to change log 8ed9c69
@parndt parndt Fix all routes for i18n frontend and backend 0fef7c2
@parndt parndt prepare for 0.9.7 release, gotta fix some tests first. 103a9f6
@parndt parndt Fix all tests, hooray 9536a71
@parndt parndt Here's the final release of 0.9.7 b593d2c