Calen Pennington
69321b4497
Display the appropriate type of error message depending on the type of the incoming request
2012-05-16 13:45:00 -04:00
Calen Pennington
698d0a167e
Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down
2012-05-16 11:46:09 -04:00
Kyle Fiedler
2d75118592
Added nav for sidebar links
2012-05-14 16:41:39 -04:00
Kyle Fiedler
89afc98f76
Made links in sidebar all in p>
2012-05-14 16:39:44 -04:00
Isaac Chuang
8989605cba
Moving in Ike's new files, touches of multicourse
2012-05-13 20:33:29 -04:00
Isaac Chuang
232e758c7a
Integrating some of Ike's courseware changes
2012-05-13 19:36:01 -04:00
Lyla Fischer
72dee8ba14
merge with master
2012-05-11 13:17:52 -04:00
ichuang
1494cbbd85
Merged root URL prefix from Ike. Errors should be attributed to pmitros.
2012-05-10 23:17:34 -04:00
Lyla Fischer
a4dae57751
merge with master
2012-05-10 12:25:33 -04:00
Calen Pennington
5011f60d45
Merge branch 'master' into anonymous_user
...
Conflicts:
djangoapps/courseware/module_render.py
djangoapps/courseware/modules/capa_module.py
2012-05-10 09:17:26 -04:00
pmitros
c1b255fdf3
Merge pull request #18 from MITx/grade-refactor
...
Grade refactor
2012-05-09 15:00:25 -07:00
Reda Lemeden
3847dee605
Added official badge styling to staff questions
2012-05-09 15:30:12 -04:00
David Ormsbee
8bd00b34ed
Merge pull request #37 from MITx/faq_addition
...
added questions to faq
2012-05-09 09:46:55 -07:00
Lyla Fischer
8ad1d3e17d
added questions to faq
2012-05-09 12:31:55 -04:00
Kyle Fiedler
29dd45e517
Fix styles for play button
2012-05-08 14:43:49 -04:00
Kyle Fiedler
e0a313e36b
added more layout to amplifier
2012-05-08 14:13:30 -04:00
Prem Sichanugrist
ecf0126fce
Make the accordian expand 'Week 1' by default
...
This fixes the regression from javascript rewrite.
2012-05-08 14:13:29 -04:00
Prem Sichanugrist
07629ef45d
Rewrite Courseware navigation
2012-05-08 14:13:29 -04:00
Prem Sichanugrist
80aeaed5fe
Rewrite JavaScript on main page
...
Both feedback form and calculator interaction now in its own class.
2012-05-08 14:13:29 -04:00
Prem Sichanugrist
43a6534e75
Add Jasmine to do a JavaScript unit test
2012-05-08 14:13:29 -04:00
Kyle Fiedler
171d40270f
Fixed some of the minor css bugs
2012-05-08 14:13:29 -04:00
Kyle Fiedler
edec1b5558
added styles for tutorial headers and removing extra padding on bottom sequence nav
2012-05-08 14:13:28 -04:00
Piotr Mitros
f9adfdbb50
Videos now support annotations w/o verticals
2012-05-08 14:13:28 -04:00
David Ormsbee
e02081b043
tiny bump in querystring call to CSS to make sure clients see updates
2012-05-08 14:13:27 -04:00
Bridger Maxwell
aae0820238
Removed python code in templates to be javascript.
2012-05-08 14:13:27 -04:00
Bridger Maxwell
7f069ac2ce
Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph.
2012-05-08 14:13:27 -04:00
Bridger Maxwell
752a625237
Added histogram graph for courseware administrators.
2012-05-08 14:13:27 -04:00
Calen Pennington
6b10c0760b
Merge branch 'master' into anonymous_user
...
Conflicts:
djangoapps/student/views.py
2012-05-08 13:54:57 -04:00
Lyla Fischer
eb95ea9e2f
Merge branch 'master' into MC
2012-05-07 22:17:37 -04:00
Lyla Fischer
13a095fc1e
checkboxes
2012-05-07 21:04:10 -04:00
Prem Sichanugrist
a0ecbca080
Make the accordian expand 'Week 1' by default
...
This fixes the regression from javascript rewrite.
2012-05-07 18:28:52 -04:00
Prem Sichanugrist
a39c2c194d
Rewrite Courseware navigation
2012-05-07 18:01:21 -04:00
Prem Sichanugrist
0ab9916017
Rewrite JavaScript on main page
...
Both feedback form and calculator interaction now in its own class.
2012-05-07 18:01:21 -04:00
Prem Sichanugrist
2c37950472
Add Jasmine to do a JavaScript unit test
2012-05-07 18:01:21 -04:00
Kyle Fiedler
a172838715
Fixed some of the minor css bugs
2012-05-07 16:11:26 -04:00
Calen Pennington
261ff83811
Add a guest_handouts.html for anonymous users
2012-05-07 15:36:02 -04:00
Kyle Fiedler
d8ace6c318
added styles for tutorial headers and removing extra padding on bottom sequence nav
2012-05-07 15:26:36 -04:00
Piotr Mitros
ddcf68362a
Videos now support annotations w/o verticals
2012-05-07 10:42:48 -04:00
pmitros
3cddaa4619
Merge pull request #19 from MITx/pmitros/histogram
...
Draws histogram for scores
2012-05-07 06:59:04 -07:00
David Ormsbee
33b0446510
tiny bump in querystring call to CSS to make sure clients see updates
2012-05-04 10:56:19 -04:00
Kyle Fiedler
7c74d798ad
Styles for new layout to the amplifier
2012-05-03 16:14:47 -04:00
Kyle Fiedler
24b6636a62
Fix issue with calculator zindex
2012-05-02 13:51:37 -04:00
Kyle Fiedler
4cc3e30d94
Redesign sequence bottom arrows
2012-05-02 13:46:48 -04:00
Reda Lemeden
2992fb3dab
Added edX logo to announecment
2012-05-01 19:08:48 -04:00
Reda Lemeden
49382769b0
Removed placeholder image
2012-05-01 16:28:55 -04:00
Reda Lemeden
2fb6b56ca4
Added the edx announcement to the MITx marketing page + Other content updates
2012-05-01 10:13:01 -04:00
pmitros
a96adea404
Merge pull request #24 from MITx/ps-fix-accordian
...
Use inline if-else to cleanup HTML
2012-04-30 13:55:49 -07:00
Calen Pennington
0871d95f98
Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository
2012-04-30 15:18:47 -04:00
Prem Sichanugrist
7938aa91d2
Use inline if-else to cleanup HTML
...
The result from the normal if-else block has linebreak, which result in
poorly formatted HTML code. This should fix it and make the code looks
cleaner.
2012-04-30 12:01:31 -04:00
Calen Pennington
5a0f31f8d1
Merge pull request #23 from MITx/email_reword
...
Email reword
2012-04-30 08:06:24 -07:00
