Changeset [060c2867b9f6129ab6209d7b3b8f16ffb9d791d2] by Brian Michalski
Revision 060c2867b9f6129ab6209d7b3b8f16ffb9d791d2,
committed by Brian Michalski
· July 24th, 2011 @ 01:29 AM
Merge branch '3-dev' into 3.1-dev
https://github.com/wtg/flagship_docs/commit/060c2867b9f6129ab6209d7...
149 changed files
-
A
.gitmodules -
A
LICENSE -
A
app/assets/images/bl.png -
A
app/assets/images/customized/woodplanks.jpg -
A
app/assets/images/fancybox/blank.gif -
A
app/assets/images/fancybox/fancy_close.png -
A
app/assets/images/fancybox/fancy_loading.png -
A
app/assets/images/fancybox/fancy_nav_left.png -
A
app/assets/images/fancybox/fancy_nav_right.png -
A
app/assets/images/fancybox/fancy_shadow_e.png -
A
app/assets/images/fancybox/fancy_shadow_n.png -
A
app/assets/images/fancybox/fancy_shadow_ne.png -
A
app/assets/images/fancybox/fancy_shadow_nw.png -
A
app/assets/images/fancybox/fancy_shadow_s.png -
A
app/assets/images/fancybox/fancy_shadow_se.png -
A
app/assets/images/fancybox/fancy_shadow_sw.png -
A
app/assets/images/fancybox/fancy_shadow_w.png -
A
app/assets/images/fancybox/fancy_title_left.png -
A
app/assets/images/fancybox/fancy_title_main.png -
A
app/assets/images/fancybox/fancy_title_over.png -
A
app/assets/images/fancybox/fancy_title_right.png -
A
app/assets/images/fancybox/fancybox-x.png -
A
app/assets/images/fancybox/fancybox-y.png -
A
app/assets/images/fancybox/fancybox.png -
A
app/assets/images/icons/eye_icon.png -
A
app/assets/images/icons/eye_icon.psd -
A
app/assets/images/icons/fp_ex.png -
A
app/assets/images/icons/fs_logo.png -
A
app/assets/images/icons/icon_doc.png -
A
app/assets/images/icons/icon_doc_40.png -
A
app/assets/images/icons/icon_doc_50.png -
A
app/assets/images/icons/icon_folder.png -
A
app/assets/images/icons/icon_folder_50.png -
A
app/assets/images/icons/icon_odp.png -
A
app/assets/images/icons/icon_odp_40.png -
A
app/assets/images/icons/icon_odp_50.png -
A
app/assets/images/icons/icon_ods.png -
A
app/assets/images/icons/icon_ods_40.png -
A
app/assets/images/icons/icon_ods_50.png -
A
app/assets/images/icons/icon_odt.png -
A
app/assets/images/icons/icon_odt_40.png -
A
app/assets/images/icons/icon_odt_50.png -
A
app/assets/images/icons/icon_other.png -
A
app/assets/images/icons/icon_other_40.png -
A
app/assets/images/icons/icon_other_50.png -
A
app/assets/images/icons/icon_pdf.png -
A
app/assets/images/icons/icon_pdf_40.png -
A
app/assets/images/icons/icon_pdf_50.png -
A
app/assets/images/icons/icon_ppt.png -
A
app/assets/images/icons/icon_ppt_40.png -
A
app/assets/images/icons/icon_ppt_50.png -
A
app/assets/images/icons/icon_xls.png -
A
app/assets/images/icons/icon_xls_40.png -
A
app/assets/images/icons/icon_xls_50.png -
A
app/assets/images/icons/noeye_icon.png -
A
app/assets/images/icons/nowrite_icon.png -
A
app/assets/images/icons/search_button.png -
A
app/assets/images/icons/search_ex.png -
A
app/assets/images/icons/search_ex_hover.png -
A
app/assets/images/icons/tipsy-east.gif -
A
app/assets/images/icons/tipsy-north.gif -
A
app/assets/images/icons/tipsy-south.gif -
A
app/assets/images/icons/tipsy-west.gif -
A
app/assets/images/icons/write_icon.png -
A
app/assets/images/icons/write_icon.psd -
A
app/assets/images/layout/dlbg.png -
A
app/assets/images/layout/dlbl_bl.png -
A
app/assets/images/layout/dlbl_br.png -
A
app/assets/images/layout/dlbl_linkright.png -
A
app/assets/images/layout/dlbl_tl.png -
A
app/assets/images/layout/dlbl_tr.png -
A
app/assets/images/layout/dlrev_hr.png -
A
app/assets/images/layout/docs_even_bg.png -
A
app/assets/images/layout/docs_odd_bg.png -
A
app/assets/images/layout/greengrass_bg.jpg -
A
app/assets/images/layout/h1block.png -
A
app/assets/images/layout/hr_dl.png -
A
app/assets/images/layout/hr_dl2.png -
A
app/assets/images/layout/qv_icon.png -
A
app/assets/images/layout/qvbg.png -
A
app/assets/images/layout/search_bg.png -
A
app/assets/images/layout/search_bg_default.png -
A
app/assets/images/layout/search_bg_hover.png -
A
app/assets/images/layout/tb_bg.png -
A
app/assets/images/layout/tree_bg.png -
A
app/assets/images/layout/wrap_bg.png -
A
app/assets/images/loading.gif -
A
app/assets/javascripts/swfobject.js -
A
app/assets/stylesheets/base.css -
A
app/controllers/categories_controller.rb -
A
app/controllers/documents_controller.rb -
A
app/controllers/revisions_controller.rb -
A
app/helpers/categories_helper.rb -
A
app/helpers/documents_helper.rb -
A
app/helpers/revisions_helper.rb -
A
app/models/category.rb -
A
app/models/document.rb -
A
app/models/revision.rb -
A
app/views/categories/_block.html.erb -
A
app/views/categories/_form.html.erb -
A
app/views/categories/edit.html.erb -
A
app/views/categories/index.html.erb -
A
app/views/categories/new.html.erb -
A
app/views/categories/show.html.erb -
A
app/views/documents/_clippy.html.erb -
A
app/views/documents/_form.html.erb -
A
app/views/documents/_google_viewer.html.erb -
A
app/views/documents/_grid.html.erb -
A
app/views/documents/_table.html.erb -
A
app/views/documents/edit.html.erb -
A
app/views/documents/new.html.erb -
A
app/views/documents/search.html.erb -
A
app/views/documents/show.html.erb -
A
app/views/layouts/_footer.html.erb -
A
app/views/layouts/_topbar_left.html.erb -
A
app/views/layouts/_topbar_right.html.erb -
A
app/views/revisions/_form.html.erb -
A
app/views/revisions/edit.html.erb -
A
app/views/revisions/index.html.erb -
A
app/views/revisions/new.html.erb -
A
app/views/revisions/show.html.erb -
A
config/sunspot.yml -
A
db/migrate/20110322171330_create_categories.rb -
A
db/migrate/20110322215324_create_documents.rb -
A
db/migrate/20110323002746_create_revisions.rb -
A
db/schema.rb -
A
public/flash/clippy.swf -
A
public/javascripts/application.js -
A
public/javascripts/jquery.js -
A
public/javascripts/jquery.min.js -
A
public/javascripts/rails.js -
A
test/fixtures/categories.yml -
A
test/fixtures/documents.yml -
A
test/fixtures/revisions.yml -
A
test/functional/categories_controller_test.rb -
A
test/functional/documents_controller_test.rb -
A
test/functional/revisions_controller_test.rb -
A
test/unit/category_test.rb -
A
test/unit/document_test.rb -
A
test/unit/helpers/categories_helper_test.rb -
A
test/unit/helpers/documents_helper_test.rb -
A
test/unit/helpers/revisions_helper_test.rb -
A
test/unit/revision_test.rb -
A
vendor/plugins/attachable -
M
Gemfile -
M
Gemfile.lock -
M
README -
M
app/views/layouts/application.html.erb -
M
config/routes.rb