Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but 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 Sep 03, 2011
Philip Arndt parndt Merge branch 'master' into ui
Conflicts:
	Gemfile.lock
	core/config/locales/en.yml
	settings/app/views/refinery/admin/settings/_settings.html.erb
4621322
Amanda Wagener awagener Remove unused method Refinery::Plugins#find_activity_by_model 1a6fd13
Amanda Wagener awagener Merge remote-tracking branch 'resolve/master' 37aa8d9
Philip Arndt parndt Merge pull request #935 from gogogarrett/patch-10
Patch 10
afe69ba
Philip Arndt parndt Merge pull request #936 from awagener/master
Clean up unnecessary code in Refinery::Plugins
906b376
Philip Arndt parndt Merge branch '1-0-stable' 9ef86be
Philip Arndt parndt Merge branch 'master' into ui 58cd5d3
Philip Arndt parndt Make use of subject rather than specifying it again and again. be422b2
Philip Arndt parndt This spec really is supposed to test forceful destroy! 84aea17
Philip Arndt parndt Merge branch '1-0-stable'
Conflicts:
	pages/spec/models/page_spec.rb
e7785f5
Philip Arndt parndt Merge pull request #931 from widescape/master
Fix for issue #926
03fea14
Andrea Mirthis Added translations to italian of some of the missing keys f4b0054
Uģis Ozols ugisozols Merge pull request #937 from Mirthis/i18n_it
Added translations to italian of some of the missing keys
be93c97
Jamie Winsor reset use rbconfig in engine's generated Gemfile instead of deprecated Config 763dc14
Philip Arndt parndt Merge pull request #938 from enmasse-entertainment/use-rbconfig
use rbconfig in engine's generated Gemfile instead of deprecated Config
18025a8
Commits on Sep 04, 2011
Jamie Winsor reset Update guardfiles to properly watch controllers && views to rerun req…
…uest specs
e471f09
Uģis Ozols ugisozols Merge pull request #940 from enmasse-entertainment/guardfile-watch-re…
…quest-specs

Update guardfiles to properly watch controllers && views to rerun request
fe0160e
Jamie Winsor reset bump capybara and capybara-webkit versions
lock proper rails asset gem versions
use factory_girl_rails instead of factory_girl to gain the additional rails support
f2d776d
Philip Arndt parndt Merge pull request #941 from enmasse-entertainment/gemfile-gemspec-up…
…dates

bump capybara and capybara-webkit versions
a6bf53b
Philip Arndt parndt Setup xvfb according to travis docs. 854f19e
Philip Arndt parndt Export has no place here 33f8a8e
Philip Arndt parndt Not all travis boxes have /etc/init.d/xvfb start yet.. using solution…
… suggested by @sarahmei to start them the long way.
3b960a9
Commits on Sep 05, 2011
Jamie Winsor reset move resources request spec to the proper location for Guard to pick …
…up changes
39ae33c
Jamie Winsor reset Add generator to generate resources config files
Add tests for this
58e29e3
Michael Gall Changing ::Admin::BaseController to ::Refinery::AdminController 29c04c2
Michael Gall Doc fixes for change to ::Refinery::AdminController e60c535
Philip Arndt parndt Merge pull request #942 from wakeless/refinery-admin-controller
Moving ::Admin::BaseController to ::Refinery::AdminController
e6a2975
Philip Arndt parndt Regenerated gemspecs bb4008b
Uģis Ozols ugisozols Partly fix #888. 1a148ac
Uģis Ozols ugisozols Use latest changes from refinerycms-18n. 6cf0cc9
Amanda Wagener awagener Remove superfluous use of 'self' in Refinery::Plugin. 6443ffd
Amanda Wagener awagener Don't bother assigning to the variable when it will just assign to it…
… again next time.
4afc3c1
Amanda Wagener awagener Test submenu pages show up in site menu (currently fails) 0071b78
Amanda Wagener awagener Create original_id and original_type fields for MenuItem rather than …
…overriding Object#id and Object#type.

Fixes submenu items not displaying in the menu and "warning: Object#id will be deprecated; use Object#object_id" warnings when running tests.
c6a8f8a
Uģis Ozols ugisozols Merge pull request #943 from awagener/master
Small refactorings
85c552d
Uģis Ozols ugisozols Merge pull request #944 from awagener/fix_menu_item_id_and_type
Fix menu item id and type
8fdd119
影月 零 Kagetsuki Changed JP entries to JA in order to match standard language codes 483b93d
影月 零 Kagetsuki **Re-added for change from JP to JA, forgot to add on last commit 2ef48cd
Uģis Ozols ugisozols Merge pull request #945 from Kagetsuki/master
Japanese Locale changed from standard country code JP to standard langauge code JA
fdd0c60
影月 零 Kagetsuki Corrected some Japanese in the core interface b42c945
Uģis Ozols ugisozols Merge pull request #946 from Kagetsuki/master
Corrected some Japanese in the core interface
8b0a43d
影月 零 Kagetsuki I screwed up and moved ja.yml out of the locales folder. This fixes
that. I am an idiot.
1d7f2cb
Uģis Ozols ugisozols Merge pull request #947 from Kagetsuki/master
Fix for erronious file move
5e73199
Uģis Ozols ugisozols Convert cucumber feature to rspec. 2c62849
Uģis Ozols ugisozols Factory -> FactoryGirl. bf1de9d
Uģis Ozols ugisozols Include all files from generated engine if the user wants to make a gem. 02be022
Jamie Winsor reset file attribute on Resource model is now validated against the max_cli…
…ent_body_size class method

this validation is now compared in bytes instead of megabytes
672ffc7
Jamie Winsor reset Add initializer to resources engine that reads the resources config f…
…ile and configures the engine
d16b5f2
Jamie Winsor reset add default configuration options to resources engine
default configurations will be merged into what is loaded from the engines configuration file
e2bf4f2
Jamie Winsor reset move refinery_resource_config into config/refinery/resources.yml
remove additional namespacing on config values in resources.yml since we're now namespaced on directory and filename
update generator and engine to use the new location and namespacing of this config file
fix generator so migrations will copy once again
8eee967
Jamie Winsor reset default values defined in Refinery::Resource module will be written t…
…o config file
11ba939
Philip Arndt parndt Merge remote-tracking branch 'enmasse-entertainment/GH-939' d2c91ed
Commits on Sep 06, 2011
Jamie Winsor reset Fix issue where views would not have access to configured values to m…
…odels

Fix language on resource form - these are bytes and not megabytes
76950d3
Jamie Winsor reset Convert class accessor on resource model for max_client_body_size to …
…module accessor on Refinery::Resources

class accessors on models don't play well in the deve environment - classes get reloaded and class vars aren't initialized.
798c176
Philip Arndt parndt Merge pull request #949 from enmasse-entertainment/fix-new-resource-form
Fix issue where views would not have access to configured values to model
ce92042
Philip Arndt parndt Spam the IRC channel with build notifications! 502b69f
Jamie Winsor reset move request specs to directories where Guard can be taken full advan…
…tage

remove autotest - use Guard instead
22090f1
Jamie Winsor reset forgot to move these two files e58ce30
Philip Arndt parndt Merge pull request #950 from enmasse-entertainment/refactor-request-t…
…ests

move request specs to directories where Guard can be taken full advantage
f5a8c2e
Uģis Ozols ugisozols Regenerate gemspec. 07ee829
Uģis Ozols ugisozols It's csrf_meta_tags now [ci skip] 21919f6
Philip Arndt parndt bundle updated 50cab35
Philip Arndt parndt using awesome_nested_set 2.0.2 now that it's a gem. 4747d53
Commits on Sep 07, 2011
Jim Mendenhall jimjimovich Removing custom_title from Refinery Pages table dbd8a0b
Uģis Ozols ugisozols Merge pull request #952 from jimjimovich/master
Removing custom_title from Pages table
c26f836
Uģis Ozols ugisozols Use ActiveSupport::Concern to simplify method inclusion. 28365c9
Miroslav Rachev mirosr Added Bulgarian translation for wymeditor. 832abd3
Miroslav Rachev mirosr Changed word in bg from 'megabytes' to 'bytes' in resources. f5d06a5
Uģis Ozols ugisozols Merge pull request #954 from mirosr/i18n_bg
Update for the Bulgarian translation
3b9ffac
Miroslav Rachev mirosr Added Bulgarian translation for wymeditor. 1afa8c2
Uģis Ozols 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'
f6856fd
Lake Denman The header 'Changing Part Parts for a single page' should be 'Changin…
…g Page Parts for a single page'
a7c1194
Miroslav Rachev mirosr Added Bulgarian translation for wymeditor. 78c6667
Philip Arndt parndt Merge pull request #958 from mirosr/1-0-stable
Added Bulgarian translation for wymeditor
bafaa54
Garrett Heinlen gogogarrett fixed a typeo in getting started guide readme 738d2b4
Garrett Heinlen gogogarrett Fixed typeo to Getting Started ReadMe 47e097f
Uģis Ozols ugisozols Merge pull request #960 from gogogarrett/1-0-stable
Fixed typeo to Getting Started ReadMe
b61235c
Jamie Winsor reset refactor resources/engine class into it's own file 3d09505
Jamie Winsor reset refactor resources engine configurable options into Resources::Config…
… module

removed test which tested accessor methods - we know those work.
9a80f59
Jamie Winsor reset refactor images engine separate file c403d03
Jamie Winsor reset rename max_client_body_size configurable for Resources engine to max_…
…file_size

max_client_body_size is not an accurate name for this option. We are not limiting the size of
your post body, we are limiting the maximum size of a file upload. max_client_body_size
should still be set on the webserver and be greater than the max_file_size.
469eabb
Jamie Winsor reset Add configurable Options class to Images engine
Add ability to configure max_image_size
Update all references to Images::MAX_SIZE_IN_MB to point to max_image_size configurable option
Add test cases for image size validations on Image model
Image size validations are now measured in bytes and not megabytes
Add generator to generate initializer to configure the images engine
6e6a5f6
Jamie Winsor reset Refactor Image::PAGES_PER_DIALOG constant into Engine configurable op…
…tion pages_per_dialog
1448654
Jamie Winsor reset Refactor Image::PAGES_PER_DIALOG_THAT_HAS_SIZE_OPTIONS constant into …
…Engine configurable option pages_per_dialog_that_have_size_options
7eccdc1
Jamie Winsor reset Refactor Image::PAGES_PER_ADMIN_INDEX constant into Engine configurab…
…le option pages_per_admin_index
b5ac6d4
Jamie Winsor reset Refactor Images::Options class into it's own file
Add reset! class method to reset the Images::Options class to it's default values
Images::Options will reset after and before each spec
85d2314
Jamie Winsor reset refinery_images initializer will now be generated with the default va…
…lues for the configuration options dynamically
59b6fbf
Commits on Sep 08, 2011
Jamie Winsor reset Refactor resources configuration initializer into an Options configur…
…able class

resources now are configured like images
It's worth noting that we do not need to configure on an environment level because these are application wide
options that we would want identical across the board. If a user wishes to make it environment level nothing
is stopping them.
66ef3fc
Jamie Winsor reset Refactor Resource::PAGES_PER_DIALOG constant into Engine configurable…
… option pages_per_dialog
ac88125
Jamie Winsor reset Resources::Options will reset after and before each spec 163d926
Jamie Winsor reset Add Option reset before and after rspec filters to generated refinery…
…cms-testing refinery support file
e1a1e0a
Jamie Winsor reset Refactor Resource::PAGES_PER_ADMIN_INDEX constant into Engine configu…
…rable option pages_per_admin_index
8fde084
Jamie Winsor reset Remove unnecessary before(:all) and after(:all) rspec filters to rese…
…t max_file_size
bd0f33c
Jamie Winsor reset Improve test coverage for options reset for images engine be92877
Jamie Winsor reset refactor pages/engine class into it's own file b24b591
Jamie Winsor reset Add configurable Options class to Pages engine
Add ability to configure pages_per_diaglog
Add ability to configure pages_per_admin_index
c217d66
Jamie Winsor reset Fix incorrectly named function in images generator 0d4cad6
Jamie Winsor reset Fix incorrectly named function in resources generator 9a264d4
Jamie Winsor reset Add helpful tip to images and resources initializers that let people …
…know to configure in bytes
0c03fc0
Jamie Winsor reset updating gemspecs cf6274c
Michael Gall Changes to make spree more compatible
- remove current_user
- alter devise routes
e8b0931
Jamie Winsor reset Replace constant class name with subject.class 46b0d01
Jamie Winsor reset Add reset options for pages in spec_helpers 103e57b
Jamie Winsor reset Refactor generators 'engine' into lib/refinery
This is a more appropriate place for the core generators for the refinerycms project to live. The
generators engine wasn't really an engine to begin with, just a collection of core generators used
to create, update, or modify installations of refinery
b9e1c8b
Jamie Winsor reset Replace generator cucumber tests with rspec tests cee82b0
Jamie Winsor reset regenerate gemspec 7839f88
Philip Arndt parndt Merge branch '1-0-stable'
Conflicts:
	Gemfile.lock
	authentication/refinerycms-authentication.gemspec
	core/refinerycms-core.gemspec
	dashboard/refinerycms-dashboard.gemspec
	images/refinerycms-images.gemspec
	resources/refinerycms-resources.gemspec
	settings/refinerycms-settings.gemspec
cba4e3b
Philip Arndt parndt Everyone: Please run 'rake whitespace' before you do a pull request. f5e855a
Commits on Sep 09, 2011
Jamie Winsor reset Fix failing engine_installer generator 3703505
Jamie Winsor reset Update generator related documentation bff77d5
Jamie Winsor reset fixing whitespace 375dc8f
Jamie Winsor reset fix whitespace 268e4f4
Dreyfuzz Dreyfuzz Latest Refinery gemfile does not include "# gem 'fog'" to comment out…
…. Edited to say "add gem 'fog' to your Gemfile."
cbeaa06
Philip Arndt parndt Merge pull request #965 from Dreyfuzz/patch-1
Latest Refinery gemfile does not include "# gem 'fog'" to comment out.  E
faa0ddd
Philip Arndt parndt Merge remote-tracking branch 'enmasse-entertainment/refactor-generato…
…r-structure'

Conflicts:
	authentication/refinerycms-authentication.gemspec
	base/refinerycms-base.gemspec
	core/refinerycms-core.gemspec
	dashboard/refinerycms-dashboard.gemspec
	generators/lib/gemspec.rb
	generators/refinerycms-generators.gemspec
	images/refinerycms-images.gemspec
	pages/refinerycms-pages.gemspec
	refinerycms.gemspec
	resources/refinerycms-resources.gemspec
	settings/refinerycms-settings.gemspec
	testing/refinerycms-testing.gemspec
8a634a9
Philip Arndt parndt Switch back to /etc/init.d/xvfb start [ci skip]. 4dccc73
Jamie Winsor reset Merge branch 'master' into configureable-engines
Conflicts:
	images/refinerycms-images.gemspec
	pages/refinerycms-pages.gemspec
	resources/lib/generators/resources_generator.rb
	resources/lib/generators/templates/config/refinery/resources.yml.erb
	resources/lib/refinery/resources/validators/file_size_validator.rb
	resources/lib/refinerycms-resources.rb
	resources/refinerycms-resources.gemspec
	resources/spec/models/refinery/resource_spec.rb
	resources/spec/requests/refinery/admin/resources_spec.rb
e27c5af
scambra spanish translation in engine generator 69c37e3
Uģis Ozols ugisozols Merge pull request #968 from scambra/master
add spanish translation to engine generator
569c9e1
scambra validate html 555d633
Philip Arndt parndt Merge pull request #969 from scambra/master
fix a html validator error
02b0cc1
Philip Arndt parndt Merge pull request #962 from enmasse-entertainment/configureable-engines
Configureable engines
bc529a2
scambra remove help for non-existing settings 00e87ac
scambra Translate settings into spanish and put them in a scope b7681e2
Uģis Ozols ugisozols Merge pull request #970 from scambra/master
Translate settings into spanish
8c2045c
Uģis Ozols ugisozols Remove unused setting help translations [ci skip]. 6b483f3
Uģis Ozols ugisozols One translation got away [ci skip]. 4cff65a
Commits on Sep 10, 2011
Philip Arndt parndt Require Dragonfly 0.9.8 minimum. ca57f28
Philip Arndt parndt Regenerated gemspecs. 81da9ba
Philip Arndt parndt Using seo_meta >= rc2. ff250c3
Philip Arndt parndt Block spec/lib/tmp from making it into gemspecs. 81606bd
Dmitry Kharchenko unclenorton Added a check to prevent error when switching to an element with no o…
…r empty class.
63e1b57
Marek keram tag link canonical 7904470
Philip Arndt parndt Merge pull request #972 from keram/master
Canonical tag in head
6850220
Commits on Sep 11, 2011
Philip Arndt parndt Merge pull request #971 from unclenorton/master
Fix for issue #963
cf585e1
Commits on Sep 12, 2011
Miroslav Rachev mirosr Changed word in bg from 'megabytes' to 'bytes' in images. eef838e
Miroslav Rachev mirosr Small change in bg locale for authentication. a3789d9
Philip Arndt parndt Merge pull request #973 from mirosr/i18n_bg
Update for Bulgarian translation
79f8446
Uģis Ozols ugisozols Revert "Added Bulgarian translation for wymeditor." because this was …
…already

commited to master and it should be under app/assets anyway.

This reverts commit 1afa8c2.
ff1f08d
Uģis Ozols ugisozols Regenerate core gemspec. 1344be4
Jon Petto jpetto Removed (commented out) adding of index on :id fields in engine table…
…s. Rails automatically creates a primary key on :id, so another index was/is not necessary.
4aa748d
Jon Petto jpetto Deleted commented out line adding redundant indexes to engine tables. 1b1ab1f
Philip Arndt parndt Merge pull request #976 from jpetto/patch-1
Removed (commented out) adding of redundant index on :id fields in engine tables.
739c2b7
Commits on Sep 13, 2011
Garrett Heinlen gogogarrett Merge remote-tracking branch 'resolve/master' 264ecc4
Garrett Heinlen gogogarrett Refactored refinery.css css to scss 564e4c1
Garrett Heinlen gogogarrett Added more revisions and nested more styles while convering more css …
…to scss
be77de7
Garrett Heinlen gogogarrett unnested dialog_menu to proper area 30f472c
Garrett Heinlen gogogarrett im stupid, it was where it was suppose to be. :( 3d46b44
Philip Arndt parndt Merge remote-tracking branch 'GoGoGarrett/master' 0524e28
Philip Arndt parndt Merge remote-tracking branch 'gogogarrett/master' 2cc49c2
Jim Mendenhall jimjimovich Removing globalize hack, because @parndt fixed globalize3 55cbe21
Michael Gall Fix incorrect nesting and move mixing to the top to fix errors. ec6fdfc
Michael Gall Class is a reserved word. try klass 90dbd64
Michael Gall Class is a reserved word. try klass a1a9dca
Uģis Ozols ugisozols Merge pull request #982 from wakeless/fix-css
Fix incorrect nesting and move mixing to the top to fix errors.
c7b71f8
Uģis Ozols ugisozols Merge pull request #981 from jimjimovich/master
Removing translations hack
62a828a
Uģis Ozols ugisozols Update dependencies. 629b83d
Uģis Ozols ugisozols Merge pull request #983 from wakeless/fix-js
Class is a reserved word. try klass
96501f7
Uģis Ozols ugisozols Merge branch 'master' of https://github.com/resolve/refinerycms 4f964ac
Garrett Heinlen gogogarrett Refactor css to scss for site-bar.css a009e6e
Uģis Ozols ugisozols Merge pull request #985 from gogogarrett/master
Refactored site_bar.css to scss
76fc662
Garrett Heinlen gogogarrett Refactored submenu.css to use .scss b8c8796
Garrett Heinlen gogogarrett refactoried tooltips.css to use scss b926d04
Garrett Heinlen gogogarrett Refactored ui.css ot use scss 84600e3
Uģis Ozols ugisozols Merge pull request #988 from gogogarrett/master
Refactored submenu.css to scss
04cfa4a
Jamie Winsor reset Fix images being added as dashboard to Refinery.engines 86aa1d9
Philip Arndt parndt Merge pull request #990 from enmasse-entertainment/fix-images-engine-…
…register

Fix images being added as dashboard to Refinery.engines
5579df9
Commits on Sep 14, 2011
Philip Arndt parndt Updated instructions to steer people away from, say, Macports on OS X. 5081df1
Philip Arndt parndt Ignore Rubinius' .rbx directory. 9942bd4
Jim Mendenhall jimjimovich Removing unused keys from pages English locale ed71d4b
Jim Mendenhall jimjimovich Updated Russian translation of wymeditor to fit on one line. Added mi…
…ssing translations.
a04f9c4
Jim Mendenhall jimjimovich Updated Russian locale aa3bb3b
Uģis Ozols ugisozols Merge pull request #992 from jimjimovich/master
Updated locale files
ab1e718
Michael Gall Make the routes look as they should /refinery/login b40a127
Michael Gall Remove, don't comment 6265d41
Michael Gall Merge branch 'spree' 653f343
Garrett Heinlen gogogarrett fixed hover glitch on admin panel regarding the tooltip b51b6d9
Josef Šimánek Grammar Nazi retro a79823b
Uģis Ozols ugisozols Merge pull request #997 from simi/patch-3
Small grammar problem
8c15a03
Philip Arndt parndt Merge pull request #994 from wakeless/spree-refinery-users
Make some small changes to how refinery_users devise is configured
8294a86
Commits on Sep 15, 2011
Philip Arndt parndt Merge pull request #995 from gogogarrett/master
Fixed tooltip hover glitch in admin panel
46c6d75
Philip Arndt parndt Bundle updated 399f246
Philip Arndt parndt Rails 3.1.1.rc1 e95e4fa
Garrett Heinlen gogogarrett started the process of spliting up admin.js into smaller sub sections…
… that are easier to manage
ea2b87a
Garrett Heinlen gogogarrett converted init_submit_continue to .coffee script dce6e89
Garrett Heinlen gogogarrett converted all the init functions previously within admin.js to their …
…seperate files and to coffeescript.
6a12832
Michael Gall Merge branch 'master' of git://github.com/resolve/refinerycms 4a8aa3f
Michael Gall refinerycms shouldn't actually depend on 3.1.1-rc1 17d5638
Garrett Heinlen gogogarrett Revert "converted all the init functions previously within admin.js t…
…o their seperate files and to coffeescript."

This reverts commit 6a12832.


��5
bliblah
 wq�kb�kb�kb�kb�kb�kb�kb�kbreverting back to old commit wq
 w!
 q!
dce7350
Jim Mendenhall jimjimovich Updated Russian locale for images and files c873a13
Uģis Ozols ugisozols Merge pull request #999 from jimjimovich/master
Updated Russian locale for images and files
f87d656
Michael Gall Rails 3.1.1 rc1 should be included in Gemfile b0fd7e6
Philip Arndt parndt Merge pull request #1000 from wakeless/master
Fix for issue #998
bc2b2ff
Garrett Heinlen gogogarrett Merge remote-tracking branch 'resolve/master' 414090e
Garrett Heinlen gogogarrett deleted old init_submit_continue.js file 148e652
Garrett Heinlen gogogarrett deleted the backup file I had made for init_submit_continue dfa1787
Garrett Heinlen gogogarrett removed unneeded init prefix to all the javascript files 48671ec
Garrett Heinlen gogogarrett removed old init_ prefixed files 912e29e
Philip Arndt parndt Merge pull request #1002 from gogogarrett/master
Spliced up the admin.js file and started to convert files to coffee
b639b18
Commits on Sep 16, 2011
Philip Arndt parndt Prefer to test on rbx-master at the moment and jruby just keeps faili…
…ng and preventing proper build reports so I've disabled it..
be7bb59
Miroslav Rachev mirosr Removed unused keys from bg locale in pages. bc45da8
Miroslav Rachev mirosr Removed unused keys from all locale in pages. b417214
Uģis Ozols ugisozols Merge pull request #1005 from mirosr/i18n_bg
Removed unused keys from all locales in pages
d4a09a0
Uģis Ozols ugisozols Fix YAML parse error. 296c7be
Jamie Winsor reset Fix namespace for rspec macros 572ea0f
Philip Arndt parndt Do more in the before_script. a8b3cee
Philip Arndt parndt Print out the ruby version we're using. f8beee9
Commits on Sep 17, 2011
Garrett Heinlen gogogarrett converted ajaxy_pagination and interface to coffee script and added a…
… guide on how to override specific javascript files on per page basis
c57d0d6
Garrett Heinlen gogogarrett removed the .coffee files because it breaks stuff and I'm unsure why 8bb519b
Jamie Winsor reset Add implicitly included javascripts to precompiled asset list 45a961b
Philip Arndt parndt Merge pull request #1008 from enmasse-entertainment/add-missing-preco…
…mpiled-assets

Add implicitly included javascripts to precompiled asset list
24fccf0
Garrett Heinlen gogogarrett ajaxy_pagination.coffee is working, let's gogogo other files 10ecb3c
Garrett Heinlen gogogarrett interface.coffeeee is working, gogogo more files 80a22b2
Philip Arndt parndt No need for a ternary! a73ae76
Garrett Heinlen gogogarrett ajax, interface, sortable menu, submit continue, tooltips all work as…
… coffee files
7e90f55
Philip Arndt parndt Ignore sprockets compiled assets. da4c35f
Philip Arndt parndt Merge pull request #1007 from gogogarrett/master
JS to Coffee, and small doc rough draft on overriding javascript
72a0006
Miroslav Rachev mirosr Removed unused key from it locale in pages. 4ea9b39
Uģis Ozols ugisozols Merge pull request #1009 from mirosr/i18n_it
Removed unused key from it locale in pages
9a3f875
Garrett Heinlen gogogarrett Deleted undeeded files, starting from scratch to split up the big adm…
…in.js file
083f9a4
Garrett Heinlen gogogarrett Revert "Deleted undeeded files, starting from scratch to split up the…
… big admin.js file"

This reverts commit 083f9a4.


��5 q
a29c146
Garrett Heinlen gogogarrett reverted admin.js to it's original state, I'm having too many issues 6db5979
Garrett Heinlen gogogarrett removed old .coffee files a4ed563
Uģis Ozols ugisozols Merge pull request #1011 from gogogarrett/master
reverted back to an older commit to fix some issues I was having with the coffee script. Still in the process of splitting the admin.js up. Also added a guide to the doc's on how to replace custom javascript
13e9d6a
Commits on Sep 18, 2011
Uģis Ozols 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".
c82a1da
Uģis Ozols ugisozols Instruct user to add gem "fog" in Gemfile because it isn't there when…
… we generate app.
241407d
Uģis Ozols ugisozols Use ActiveSupport::Concern. 20a0224
Commits on Sep 19, 2011
Garrett Heinlen gogogarrett Regenerated gemspec file for core 9f37f0d
Uģis Ozols ugisozols Merge pull request #1015 from gogogarrett/master
Regenerated gemfile for core
8dd5bc6
Jamie Winsor reset Refactor core/engine into it's own file d856be1
Commits on Sep 20, 2011
Jamie Winsor reset Decorators in app/decorators will now be loaded at application start 7498808
Garrett Heinlen gogogarrett interface to coffee 3221ab5
Garrett Heinlen gogogarrett sortable_menu to coffee 1e2c2d7
Garrett Heinlen gogogarrett submit_continue to coffee b35793f
Garrett Heinlen gogogarrett ajaxy_pagination to coffee 7b6e775
Jamie Winsor reset Add generator steps to generate decorator directories
Improve test coverage for CmsGenerator
4f712d8
Philip Arndt parndt Merge pull request #1017 from gogogarrett/js_to_coffee
Js to coffee
96df3e3
Jamie Winsor reset Update gemspec 8c52ac6
Jamie Winsor reset update engine generator link
[ci skip]
1e64dc9
Jamie Winsor reset Fix link to generators documentation, take 2!
[ci skip]
11636b0
Uģis Ozols ugisozols Merge pull request #1018 from enmasse-entertainment/master
update generator link in engines readme
758161e
Uģis Ozols ugisozols Update dependencies. a2b8066
Commits on Sep 21, 2011
Jamie Winsor reset Fix decorator not decorating controllers after first request when cac…
…he_classes is false
b512560
Jamie Winsor reset Remove unnecessary type change on pathname to string d92aab9
Philip Arndt parndt Merge remote-tracking branch 'enmasse-entertainment/decorators' 0069c1a
Uģis Ozols ugisozols Merge branch 'master' into Issue-#888 723b34a
Uģis Ozols ugisozols Fix #888. c12a409
Commits on Sep 22, 2011
Jun Lin linjunpop Add example for using find_or_set in controller 8285ecc
Philip Arndt parndt Merge branch 'master' into ui
Conflicts:
	core/app/assets/stylesheets/refinery/ui.css.scss
1190674