Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents 6e5932b + 81d7b5d commit b1fc83e2dfc656c313dabc1b10ddd71d80c3593e Derek Hoy committed Sep 11, 2011
Showing with 11 additions and 4 deletions.
  1. +7 −1 .gitignore
  2. 0 engineclub/{ → apps/home}/static/css/ie6.css
  3. 0 engineclub/{ → apps/home}/static/css/ie7.css
  4. 0 engineclub/{ → apps/home}/static/css/screen.css
  5. 0 engineclub/{ → apps/home}/static/css/verticaltabs.css
  6. BIN engineclub/{ → apps/home}/static/favicon.ico
  7. 0 engineclub/{ → apps/home}/static/js/aliss_bm.js
  8. 0 engineclub/{ → apps/home}/static/js/aliss_bm_local.js
  9. 0 engineclub/{ → apps/home}/static/js/css/demos.css
  10. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-anim_basic_16x16.gif
  11. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
  12. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
  13. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
  14. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
  15. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_glass_75_dadada_1x400.png
  16. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
  17. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
  18. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  19. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-icons_222222_256x240.png
  20. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-icons_2e83ff_256x240.png
  21. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-icons_454545_256x240.png
  22. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-icons_888888_256x240.png
  23. BIN engineclub/{ → apps/home}/static/js/css/themes/base/images/ui-icons_cd0a0a_256x240.png
  24. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.accordion.css
  25. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.all.css
  26. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.autocomplete.css
  27. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.base.css
  28. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.button.css
  29. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.core.css
  30. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.datepicker.css
  31. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.dialog.css
  32. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.progressbar.css
  33. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.resizable.css
  34. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.slider.css
  35. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.tabs.css
  36. 0 engineclub/{ → apps/home}/static/js/css/themes/base/jquery.ui.theme.css
  37. BIN ...{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  38. BIN ...{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
  39. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
  40. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
  41. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
  42. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
  43. BIN ...ub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  44. BIN ...{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  45. BIN .../{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  46. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-icons_222222_256x240.png
  47. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-icons_228ef1_256x240.png
  48. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-icons_ef8c08_256x240.png
  49. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-icons_ffd27a_256x240.png
  50. BIN engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/images/ui-icons_ffffff_256x240.png
  51. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery-ui-1.8rc3.custom.css
  52. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.accordion.css
  53. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.all.css
  54. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.autocomplete.css
  55. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.base.css
  56. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.button.css
  57. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.core.css
  58. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.datepicker.css
  59. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.dialog.css
  60. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.progressbar.css
  61. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.resizable.css
  62. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.slider.css
  63. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.tabs.css
  64. 0 engineclub/{ → apps/home}/static/js/css/themes/ui-lightness/jquery.ui.theme.css
  65. 0 engineclub/{ → apps/home}/static/js/jquery-1.4.2.min.js
  66. 0 engineclub/{ → apps/home}/static/js/jquery-ui.custom.min.js
  67. 0 engineclub/{ → apps/home}/static/js/modernizr-1.6.min.js
  68. 0 engineclub/{ → apps/home}/static/js/mxn-min.js
  69. 0 engineclub/{ → apps/home}/static/js/mxn.core-min.js
  70. 0 engineclub/{ → apps/home}/static/js/mxn.google.core-min.js
  71. 0 engineclub/{ → apps/home}/static/js/mxn.openlayers.core-min.js
  72. BIN engineclub/{ → apps/home}/static/media/img/add.png
  73. BIN engineclub/{ → apps/home}/static/media/img/aliss.png
  74. BIN engineclub/{ → apps/home}/static/media/img/arrow-right.png
  75. BIN engineclub/{ → apps/home}/static/media/img/arrow.png
  76. BIN engineclub/{ → apps/home}/static/media/img/arrow2.png
  77. BIN engineclub/{ → apps/home}/static/media/img/bg-main.jpg
  78. BIN engineclub/{ → apps/home}/static/media/img/bg_more_btn.png
  79. BIN engineclub/{ → apps/home}/static/media/img/calendar.png
  80. BIN engineclub/{ → apps/home}/static/media/img/calendar_view_month.png
  81. BIN engineclub/{ → apps/home}/static/media/img/clock.png
  82. BIN engineclub/{ → apps/home}/static/media/img/delete.png
  83. BIN engineclub/{ → apps/home}/static/media/img/engine-vid.png
  84. BIN engineclub/{ → apps/home}/static/media/img/pauses.png
  85. BIN engineclub/{ → apps/home}/static/media/img/plays.png
  86. BIN engineclub/{ → apps/home}/static/media/img/tabBG.jpg
  87. BIN engineclub/{ → apps/home}/static/media/img/tabHoverBG.jpg
  88. BIN engineclub/{ → apps/home}/static/media/img/ymarker_bl.png
  89. BIN engineclub/{ → apps/home}/static/media/img/ymarker_or.png
  90. 0 engineclub/{ → apps/home}/static/verticaltabs/css/verticaltabs.css
  91. BIN engineclub/{ → apps/home}/static/verticaltabs/images/arrow-right.png
  92. BIN engineclub/{ → apps/home}/static/verticaltabs/images/arrow.png
  93. BIN engineclub/{ → apps/home}/static/verticaltabs/images/arrow2.png
  94. BIN engineclub/{ → apps/home}/static/verticaltabs/images/pauses.png
  95. BIN engineclub/{ → apps/home}/static/verticaltabs/images/plays.png
  96. BIN engineclub/{ → apps/home}/static/verticaltabs/images/tabBG.jpg
  97. BIN engineclub/{ → apps/home}/static/verticaltabs/images/tabHoverBG.jpg
  98. 0 engineclub/{ → apps/home}/static/verticaltabs/js/verticaltabs.js
  99. 0 engineclub/{ → apps/home}/static/verticaltabs/js/verticaltabs.pack.js
  100. +1 −0 engineclub/settings.py
  101. 0 engineclub/static/dummy
  102. +2 −2 engineclub/urls.py
  103. +1 −1 requirements.txt
View
@@ -22,4 +22,10 @@ ecengine/engineclub
/sql_data/dump.sql
/mongo_data/dump/
/mongo_data/aliss_dump.tgz
-.DS_Store
+.DS_Store
+/engineclub/static/admin
+/engineclub/static/css
+/engineclub/static/js
+/engineclub/static/media
+/engineclub/static/verticaltabs
+/engineclub/static/favicon.ico
View
@@ -143,6 +143,7 @@
'django.contrib.redirects',
'django.contrib.sessions',
'django.contrib.sites',
+ 'django.contrib.staticfiles',
'home',
'enginecab',
'depot',
View
No changes.
View
@@ -43,8 +43,8 @@
if settings.DEBUG:
urlpatterns += patterns('',
- (r'^static/(?P<path>.*)$',
+ (r'^media/(?P<path>.*)$',
'django.views.static.serve',
- {'document_root': settings.STATIC_ROOT}
+ {'document_root': settings.MEDIA_ROOT}
),
)
View
@@ -1,4 +1,4 @@
-Django>=1.2
+Django>=1.3
textile
Markdown
docutils

0 comments on commit b1fc83e

Please sign in to comment.