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: resolve/refinerycms
...
head fork: resolve/refinerycms
This comparison is big! We’re only showing the most recent 250 commits
Commits on Jun 29, 2010
@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
Commits on Jul 03, 2010
@parndt parndt Releasing version 0.9.7.1 - see http://github.com/resolve/refinerycms… bcf46e2
@peterz peterz Fix sl locales cb8b1e8
@peterz peterz Localize log out link 704cc51
@halan halan Added some tr for pt-BR fad681d
@halan halan Change in pt-BR Inquéritos to Contatos, couse it more usual. And adde…
…d some fixes in pr-BR tr
709072c
Commits on Jul 04, 2010
@parndt parndt Make a plugin migration safer and change how gemspec works. f19fe33
Commits on Jul 05, 2010
@parndt parndt merge contributions for pt-BR 5bfd7cc
@parndt parndt consolidate keys into correct places and add defaults for switch to w…
…ebsite and switch to website editor
36f4600
@parndt parndt Fix broken/missing/incorrect locale keys and make the rake translate:…
…lost_in_translation_all task look up only Refinery's i18n locales.
27c14c3
@parndt parndt No missing translations for any locales but some of the translations …
…are google translated ones so please if you speak one of these, check out what we are saying.
3912974
@parndt parndt Fix new session locales to be present 7bc4f49
stevenheidel Be a little quieter when installing refinery by supressing refinery:u…
…pdate output. This way the user is not confused by multiple 'actions required'.
06c7564
stevenheidel Removed refinery-update-core as it has been deprecated in favour of r…
…ake refinery:update.
d62ddf5
@parndt parndt 2.12.2 provides the greatest compatibility. Fixes Issue #104 f6047e6
Commits on Jul 06, 2010
@parndt parndt Fix issue where we were checking against objects which doesn't always…
… produce the correct results.
5fc9f93
@parndt parndt allow login again in the default locale ceeda4f
@parndt parndt Refactor i18n somewhat and made the translate task actually pick up a…
…ll of the missing keys.

This reveals an average of 55 missing keys for each locale.

Requires urgent attention from those who can translate.

If you can help, please run rake translate:lost_in_translate LOCALE=en while subtituting en for the locale you can translate.
1f9a7ff
@halan halan Added support to put the search form in dialog. 63a078f
@halan halan A little fix in page tr to pt-BR 4fb9f9a
@halan halan Added some improvements to translates are needed to change a bit CSS …
…sizes
d3d384b
@halan halan More missing strings in users page for pt-BR tr 31a3efc
@halan halan Translate the dashboard messages with correct grammar and capitalizat…
…ion.
a88ea5c
@parndt parndt Update the very cool contribution by halan to have an english key for…
… its i18n.
3688185
@unixcharles unixcharles fix generator migration, UserPlugin :title >> :name fd03122
stevenheidel Be a little quieter when installing refinery by supressing refinery:u…
…pdate output. This way the user is not confused by multiple 'actions required'.
dfd94f6
stevenheidel Removed refinery-update-core as it has been deprecated in favour of r…
…ake refinery:update.
76abb4e
@parndt parndt update gemspec support files. 6131f70
@parndt parndt cleanup following commits 3ccb37c
@parndt parndt add human name for inquiry_setting for english. d4b6801
@parndt parndt refactor i18n to support frontend/backend separation and enabled i18n…
… by default.
e635062
@parndt parndt Tidy up, hook into search css for english, set production mode in con…
…fig.ru by default and increment version number.
281271d
stevenheidel Merge branch 'master' of git://github.com/resolve/refinerycms 0e4b38d
stevenheidel Small formatting changes to the Gemfile and updated versions of news/…
…portfolio.
94a97cb
stevenheidel Fix issues that arose from my previous commit. Thoroughly tested. a8b4111
@parndt parndt Fixes issues with generators after i18n merge. 7224b9e
@parndt parndt Fix paths that contain spaces. f087549
Commits on Jul 07, 2010
@parndt parndt Merge remote branch 'steven/master' 81771de
@parndt parndt falls back to the default locale's version of the translation if the …
…current locale is lacking it, but only in production mode.
d0c4763
@parndt parndt Removed english versions of switch translation in sitebar so that the…
…y can be found by translators more easily.
f9f3fd2
@parndt parndt Added verbose=true option when running rake refinery:update that prin…
…ts out everything it's doing.
ee12c82
@parndt parndt fully qualify Refinery as ::Refinery and use :notice instead of :message f959f8c
@parndt parndt Release version 0.9.7.3 1214df3
@parndt parndt the lack of two brackets around the path match meant that it was matc…
…hing things like /news/ so this will require a new version release as it's that important.
9278229
@kivanio kivanio missing portuguese translation added 6ac1baa
Commits on Jul 08, 2010
@hvirring hvirring Update thank_you page attributes correctly e885888
@kivanio kivanio missing portuguese translation added d851e5b
@parndt parndt Improved code used to include gem rake tasks and script/generate task…
…s into the Refinery application to fix issue with these tasks not being found
f05681a
@parndt parndt Add task to ease upgrade between 0.9.6 and 0.9.7 - just run refinery-…
…upgrade-096-to-097 from a gem based application.
61768db
@parndt parndt incremented version to 0.9.7.5 and released a new changelog c588d77
stevenheidel Small correction to refinery-upgrade help messages. c0c22e0
@parndt parndt Upgrade task now handles new routing too. 070c479
@parndt parndt We can migrate your database, too 103be21
@parndt parndt Add migration to absolutely ensure that everyone is up to date with t…
…he new column name for user plugins
497ac42
@djones djones news isn't a core feature anymore so move it out to a popular plugins…
… section with the portfolio plugin
a87c8dd
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  news isn't a core feature anymore so move it out to a popular plugins section with the portfolio plugin
  Add migration to absolutely ensure that everyone is up to date with the new column name for user plugins
  We can migrate your database, too
  Upgrade task now handles new routing too.
  Small correction to refinery-upgrade help messages.
  incremented version to 0.9.7.5 and released a new changelog
  Add task to ease upgrade between 0.9.6 and 0.9.7 - just run refinery-upgrade-096-to-097 from a gem based application.
  Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found
  missing portuguese translation added
  Update thank_you page attributes correctly
5ee352a
@djones djones lock the gems in 3453ecc
@parndt parndt Update dependencies and relock, made sure schema.rb reflected latest …
…version. All tests passing.
0a037a0
Commits on Jul 09, 2010
@parndt parndt provide find_or_set because the site name may not be set here yet. c0ca9fc
@parndt parndt Ensure that we have a RefinerySetting to use, fixes failing Scenario:…
… When there are no users, you can create a user in features/refinery/manage_users.feature
ea321d7
@parndt parndt Removing this else clause because it makes zero sense. Why would we w…
…ant to be rendering the :new action again here?
83349da
@parndt parndt Add ability to specify that a page is the home page to fix failing Sc…
…enario: Not logged in in features/refinery/site_bar.feature
ef212a2
@kivanio kivanio missing portuguese translation added 9c4759a
@kivanio kivanio missing english translation added 297a9e0
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  Add ability to specify that a page is the home page to fix failing Scenario: Not logged in in features/refinery/site_bar.feature
  Removing this else clause because it makes zero sense. Why would we want to be rendering the :new action again here?
  Ensure that we have a RefinerySetting to use, fixes failing Scenario: When there are no users, you can create a user in features/refinery/manage_users.feature
  provide find_or_set because the site name may not be set here yet.
  Update dependencies and relock, made sure schema.rb reflected latest version. All tests passing.
  lock the gems in
11236b8
@parndt parndt put upgrade logic that is specific to the main routes file into a con…
…ditional block
bcc3451
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  put upgrade logic that is specific to the main routes file into a conditional block
9ec5635
@parndt parndt Got a bit over eager removing this before. 8dae994
@parndt parndt Gemfile relocked to mirror extra require to acts_as_indexed gem depen…
…dency.
6e7f5fa
@kivanio kivanio missing portuguese translation added a71f2c0
@kivanio kivanio missing english translation added 5ec723f
@parndt parndt mark as html_safe 187ba16
@kivanio kivanio Merge branch 'master' of git://github.com/resolve/refinerycms
* 'master' of git://github.com/resolve/refinerycms:
  mark as html_safe
  missing english translation added
  missing portuguese translation added
  Gemfile relocked to mirror extra require to acts_as_indexed gem dependency.
  Got a bit over eager removing this before.
d773e98
@kivanio kivanio small changes to make more meaning in portuguese 8938cc5
@kivanio kivanio new keys and translations for en and pr-BT dadb764
@kivanio kivanio missing portuguese translations for wymeditor 620332f
@kivanio kivanio missing portuguese translation for dashboard fe7f4e7
@kivanio kivanio adjusted portuguese translation for images e4d8ad2
@kivanio kivanio adjusted portuguese translation for authentication 3d4f5ec
Commits on Jul 11, 2010
@parndt parndt Ensure that pressing cancel on form actions doesn't redirect back to …
…the current form after a create or update action, round entire wym_box and red border it on error. Update example gem versions.
c35deff
Commits on Jul 12, 2010
stevenheidel Switched main install task to 'refinerycms' instead of 'refinery' to …
…avoid conflicts with a gem of the same name.\n\nThe task 'refinery' is still available and simply calls 'refinerycms' to do the work.
699627c
@parndt parndt These are not helpful. 0f481a7
@parndt parndt Refactor rake test:refinery to allow loading tests from registered pl…
…ugins for greater modularity.
4e6906b
@parndt parndt Prepare for a future version release. 3ed74e8
@parndt parndt apparently we need a relock now. d22ed32
@parndt parndt Regenerate gemspec 57dc7e6
stevenheidel Switched main install task to 'refinerycms' instead of 'refinery' to …
…avoid conflicts with a gem of the same name.\n\nThe task 'refinery' is still available and simply calls 'refinerycms' to do the work.
bacaa25
@parndt parndt First, educate users. 9945267
@parndt parndt Document Steven's change 3ab9013
@parndt parndt We'll need the new task in the gemspec, then. 7b31a02
@parndt parndt Automate the generation of bin tasks so that they don't get forgotten. 9601605
@parndt parndt Ensure we update lib/refinery too ddadddf
@parndt parndt only round top left corner when we're not inside tabs. 028a4de
@parndt parndt use more valid CSS. 160041e
stevenheidel Merge conflict resolved. f8c6b22
stevenheidel Fixed a bug preventing new refinery settings from being shown to regu…
…lar users.
377d18d
Commits on Jul 14, 2010
@parndt parndt This should be happening in the Gemfile... a131ae8
@parndt parndt This is the only way that this command will work in Ruby 1.9.2 - by e…
…ntering the directory using 'cd' instead of Dir.chdir

Also ensure that bundler is available before the command runs by telling the user to install it.
ba2e9e9
@parndt parndt We don't need to raise, we can just puts and exit. f02841b
Commits on Jul 15, 2010
@parndt parndt Tightened up security around inserting images and resources (you can …
…no longer upload an image or resource inside the dialogues if you can't access the plugin itself). Also allows users to insert an image or resource that was previously uploaded even if they can't access the rest of the plugin. Fixed pagination on resource dialogues. Closes GH-110
c277395
@parndt parndt Fixes typo introduced with last commit that set pages per dialog to 1…
… not 12.
8427844
@parndt parndt No longer allow users to run this task if their apps already contain …
…a Gemfile as the results could be explosive.
81c654c
@parndt parndt Update changelog and gemspec. 5928049
@parndt parndt Don't run the refinerycms task for the user, make them run it. Copy .…
…gitignore in a rake refinery:update
dd77a75
@parndt parndt Wonder why that wasn't html.erb 1e254f2
@parndt parndt Add support for an extra per page setting for dialogs with sizing opt…
…ions like that used in the wymeditor.
1568ce2
@parndt parndt Bit easier to read, really. Dialog can be a bit smaller. 4315d12
@parndt parndt slight CSS redux a529b85
@parndt parndt Regenerated gemspec to encompass all the changes of late. 16d5b95
@parndt parndt document final change 4cafe27