Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
David Ormsbee
e4073663e2 Have Bloomberg link point to Bloomberg article :-P 2012-07-25 18:47:26 -04:00
Rocky Duan
52c7136493 Merge branch 'lol' 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/lib/comment_client.py
	lms/lib/datehelper
	lms/static/sass/application.scss
	lms/templates/discussion/index.html
	lms/templates/news.html
 2012-07-25 18:41:24 -04:00
Rocky Duan
3757e9757c fixed discussion & news styling 2012-07-25 18:36:36 -04:00
David Ormsbee
5ad1791433 add a few items to the press links at the bottom of the front page 2012-07-25 18:31:57 -04:00
Rocky Duan
02a73a945f move comment client in place 2012-07-25 18:26:41 -04:00
Rocky Duan
d1277ff32b moved datehelper in place 2012-07-25 18:25:40 -04:00
Rocky Duan
9e3271e3cb fixed eager 2012-07-25 18:25:28 -04:00
David Ormsbee
9671df3e25 minor typo fixes 2012-07-25 18:22:46 -04:00
Kyle Fiedler
8c079c8a72 Added styles for course images to always the right dimentions 2012-07-25 18:18:52 -04:00
Rocky Duan
048deaa87f show news & options when submit comment 2012-07-25 18:16:57 -04:00
Rocky Duan
aab9f8dc1c make course id available in xmodule 2012-07-25 18:15:52 -04:00
Rocky Duan
6a816e453f watch/unwatch, vote status enabled in all views 2012-07-25 18:15:52 -04:00
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
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
Matthew Mongeau
bd9da89fe9 Move press articles to json. 2012-07-25 17:31:34 -04: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
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
John Jarvis
dab92102d1 reading WIKI_ENABLED from env.json 2012-07-25 14:15:49 -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
29cf09763f Fixing up cms tests to only use data in common/test/data 2012-07-25 10:09:25 -04: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
856156a141 provide user_id for xmodules 2012-07-24 16:49:27 -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
Calen Pennington
0a79130b11 Make problem previews work by saving problem state in the current request session 2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 2012-07-24 16:14:04 -04:00
Calen Pennington
50f27bcfb7 Eagerly load all modules when reading the course from xml, so that users who are already on a problem page can check their answers 2012-07-24 16:14:04 -04:00
Calen Pennington
0fcaa01484 Allow anonymous users to check problems, but don't save any instance state for them 2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59 Move Logger and *withPrefix javascript into a common location 2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -04:00