Commit Graph

66833 Commits

Author SHA1 Message Date
Rocky Duan
b2da6eef9f provide user_id for xmodules 2012-07-25 18:15:52 -04:00
Rocky Duan
4b8c3b9b12 watch/unwatch threads; display current vote 2012-07-25 18:15:52 -04:00
Rocky Duan
0ee1b0c5d0 removed unnecessary args 2012-07-25 18:15:52 -04:00
Rocky Duan
5e5dda2dfb refactored out thread rendering; vote 2012-07-25 18:15:51 -04:00
Rocky Duan
28113d8b43 moved django_comment_client into edx 2012-07-25 18:15:51 -04:00
Rocky Duan
d49338c948 integrated search; refactored some frontend code 2012-07-25 18:15:51 -04:00
David Ormsbee
a8610c3889 fixed twitter link to Berkeley Press Release 2012-07-25 18:15:37 -04:00
Rocky Duan
3267aa1737 forum view for discussions 2012-07-25 18:14:58 -04:00
David Ormsbee
619d4cd989 fixed twitter link for course about pages 2012-07-25 18:14:05 -04:00
Rocky Duan
846a488ef2 create new post 2012-07-25 18:11:00 -04:00
Rocky Duan
d393481b21 some basic functionalities of discussion 2012-07-25 18:11:00 -04:00
Rocky Duan
fb408a99b5 add discussion app & url conf 2012-07-25 18:09:34 -04:00
Rocky Duan
9abc888340 display simple threaded comment 2012-07-25 18:09:34 -04:00
Rocky Duan
0373096c8d initial setup for the discussion module 2012-07-25 18:09:34 -04:00
David Ormsbee
a86938ee93 New press articles 2012-07-25 18:09:26 -04:00
David Ormsbee
3a933aeab8 Update About Page text with new intro paragraph 2012-07-25 17:40:58 -04:00
David Ormsbee
26a14fd2c3 Merge pull request #304 from MITx/feature/halogenandtoast/press-page
Feature/halogenandtoast/press page
2012-07-25 14:35:42 -07:00
Matthew Mongeau
bd9da89fe9 Move press articles to json. 2012-07-25 17:31:34 -04:00
kimth
57810bb564 Consolidate textbox styling into codemirror.css 2012-07-25 16:53:07 -04:00
kylefiedler
c7648bc484 Merge pull request #297 from MITx/arjun/minor_css_fixes
change activation complete green and add styles for faq
2012-07-25 13:49:52 -07:00
kimth
4680b9f9e5 Fix cursor/text mismatch in Code/External-Response styling 2012-07-25 16:11:21 -04:00
Calen Pennington
34a32ce15a Merge pull request #302 from MITx/feature/fix-courseware
fix courseware css file so it imports the right files in the right order
2012-07-25 12:58:21 -07:00
Arjun Singh
cdea9488ef Fixing up bracket indentation 2012-07-25 15:58:14 -04:00
Kyle Fiedler
bb3dfc5c08 fix courseware css file so it imports the right files in the right order 2012-07-25 15:54:18 -04:00
Rocky Duan
54ea3dba22 show news & options when submit comment 2012-07-25 15:30:05 -04:00
jarv
5918cccdfb Merge pull request #293 from MITx/arjun/add_data_watcher
Adding script that restarts django when content in the data directories changes.
2012-07-25 12:28:50 -07:00
Calen Pennington
94a8421195 Merge pull request #295 from MITx/courseware-css
Courseware css
2012-07-25 12:01:18 -07:00
Kyle Fiedler
18dc689d4d Added fix for where the course.css is being brought in 2012-07-25 14:57:44 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -04:00
Brittany Cheng
388ddc5365 change activation complete green and add styles for faq 2012-07-25 14:57:00 -04:00
Calen Pennington
d1482e19ee Merge pull request #294 from MITx/jarv/wiki_enabled
reading WIKI_ENABLED from env.json
2012-07-25 11:18:41 -07:00
John Jarvis
dab92102d1 reading WIKI_ENABLED from env.json 2012-07-25 14:15:49 -04:00
Arjun Singh
60365a6446 Using /usr/bin/env rather than defaulting to ../python/bin/python 2012-07-25 13:40:47 -04:00
Arjun Singh
e6ee3d50ba Simplified server restart to just touching lms/__init__.py rather than killing and restarting the server. 2012-07-25 13:39:30 -04:00
kimth
31641252e7 Typos in and some additional comments 2012-07-25 13:28:52 -04:00
Arjun Singh
c9a36a7085 Adding an option to watch all extensions; useful for a VIM user where the filesystem events aren't triggered when saving a file without disabling backups. 2012-07-25 13:25:03 -04:00
Arjun Singh
6376516568 Adding script that restarts django when content in the data directories changes. 2012-07-25 13:07:24 -04:00
Calen Pennington
dde48f122e Merge pull request #247 from MITx/feature/cms-problem-preview
Problem previewing in the CMS
2012-07-25 07:10:45 -07:00
Calen Pennington
8b1bab75bd Fixing up comments on xmodule components 2012-07-25 10:10:17 -04:00
Calen Pennington
29cf09763f Fixing up cms tests to only use data in common/test/data 2012-07-25 10:09:25 -04:00
Calen Pennington
7371b444bf Merge pull request #291 from MITx/jarv/enabled-features
adding enabled features to aws.py
2012-07-25 06:47:56 -07:00
John Jarvis
18b05fe78f enabled_features changed mitx_features 2012-07-24 21:50:45 -04:00
Rocky Duan
bedeac3a55 make course id available in xmodule 2012-07-24 18:51:56 -04:00
Rocky Duan
f485167bd4 watch/unwatch, vote status enabled in all views 2012-07-24 16:50:21 -04:00
Rocky Duan
577599d505 get user_id in discussion module 2012-07-24 16:49:53 -04:00
Rocky Duan
856156a141 provide user_id for xmodules 2012-07-24 16:49:27 -04:00
Calen Pennington
85adfde1f2 Update previews after a module is saved 2012-07-24 16:14:05 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00