Lyla Fischer
ca89ce73ab
fixed mysterious problem rendering issue
2012-05-07 22:19:03 -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
David Ormsbee
6ebb521d62
Merge pull request #32 from MITx/pmitros/video-annotations
...
Videos now support annotations w/o verticals
2012-05-07 08:09:32 -07: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
pmitros
236b52cb04
Merge pull request #30 from MITx/cp-remove-csrf-domain
...
Remove the csrf domain from the default settings because we don't need i...
2012-05-07 06:57:47 -07:00
David Ormsbee
f36235c2ee
Merge pull request #31 from MITx/pmitros-masquerade
...
Masquerading works
2012-05-04 13:41:14 -07:00
Piotr Mitros
6b6ef01cf0
Masquerading works
2012-05-04 16:29:44 -04:00
Calen Pennington
fefcd8570f
Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url
2012-05-04 14:52:24 -04:00
Calen Pennington
2b7b9ada60
Make local file uploads work in dev environment
2012-05-04 14:44:50 -04:00
pmitros
7a9d142a76
Merge pull request #27 from MITx/user_integrity_error
...
Remove some race conditions in user signups
2012-05-04 11:43:05 -07:00
Calen Pennington
2a073a236a
Re-raise an integrity error during user creation if it's not caused by something we know to check for
2012-05-04 14:41:56 -04:00
pmitros
c2f5f1d4a2
Merge pull request #28 from MITx/static_grab_settings
...
Add a settings file for doing grabs for main_static. We may want to add COURSEWARE_ENABLED=False
2012-05-04 08:20:46 -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
Calen Pennington
90b7737b0d
Catch user integrity errors, and then try and figure out what caused them (which removes a race condition)
2012-05-03 15:16:05 -04:00
Calen Pennington
c981620fc2
Add a settings file for doing grabs for main_static
2012-05-03 15:14:02 -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
Calen Pennington
4c1fee2bfa
Merge pull request #26 from MITx/rl-announcement
...
Rl announcement
2012-05-01 13:40:57 -07:00
Reda Lemeden
8178acaa53
Removed sass/css comments
2012-05-01 16:34:41 -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
Lyla Fischer
1f7a3f83b9
fixed naming convention on response types
2012-05-01 04:15:55 -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
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
Lyla Fischer
4bbce591a0
added html tags for show_answer
2012-04-28 20:41:49 -04:00
Lyla Fischer
35ab425755
fixed typo
2012-04-28 19:09:47 -04:00
Lyla Fischer
703bcf7fb0
wording changes
2012-04-28 18:38:15 -04:00
Lyla Fischer
08d789d963
removed error logs from the javascript and added curly braces
2012-04-28 07:01:16 -04:00
Lyla Fischer
59493ed090
multiple choice
2012-04-28 06:51:14 -04:00
Lyla Fischer
68c1d07f0d
changed welcome email
2012-04-28 03:40:33 -04:00
Kyle Fiedler
83f4e1eda3
Added fix for the bottom sequnce navigation
2012-04-27 16:55:42 -04:00
Kyle Fiedler
bd56116b33
Fix calculator zindex issue
2012-04-27 16:25:42 -04:00
Kyle Fiedler
28a9e51348
Merge branch 'kf-amplifier'
2012-04-27 14:32:38 -04:00
Kyle Fiedler
7f6481b9f1
Fixed som issues with the calculator with ios
2012-04-27 14:29:33 -04:00
Kyle Fiedler
8f22127d45
Fix bugs with video player list styles
2012-04-27 10:21:13 -04:00
Kyle Fiedler
128ba351a6
Added better styles for play button
2012-04-26 17:02:07 -04:00
Kyle Fiedler
89fbd4611b
Fixed margin padding issue for top of sliders
2012-04-26 16:58:04 -04:00
Kyle Fiedler
bd8adcce97
Added styles for tabs
2012-04-26 16:52:47 -04:00
Kyle Fiedler
b7cf6438e4
added generated css
2012-04-26 14:02:56 -04:00
Kyle Fiedler
38422b2c50
Shortened first column for controls
2012-04-26 14:01:19 -04:00
Kyle Fiedler
c858ab0342
Added some slight text modification for amplifier
2012-04-26 14:01:19 -04:00
Kyle Fiedler
3464e8bca9
More tweeks to the amp
2012-04-26 14:01:19 -04:00
Kyle Fiedler
6362977ace
Added some small tweeks to the amplifier
2012-04-26 14:01:19 -04:00
Kyle Fiedler
954397be34
More tweeks for the amplifier
2012-04-26 14:01:18 -04:00
Kyle Fiedler
32f154d7fb
Added new styles for amplifier
2012-04-26 14:01:18 -04:00
Reda Lemeden
74613b1f62
Merge pull request #16 from MITx/kf-tutorials
...
Added new styles for tutorials
2012-04-26 10:49:47 -07:00
