Commit Graph

1678 Commits

Author SHA1 Message Date
Piotr Mitros
4e915d5268 Masquerading works 2012-05-08 14:13:28 -04:00
Calen Pennington
9d6878226f 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-08 14:13:28 -04:00
Calen Pennington
9ac2c559a9 Make local file uploads work in dev environment 2012-05-08 14:13:28 -04:00
Calen Pennington
14c1a18687 Re-raise an integrity error during user creation if it's not caused by something we know to check for 2012-05-08 14:13:27 -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
Calen Pennington
36b4b7bdb9 Catch user integrity errors, and then try and figure out what caused them (which removes a race condition) 2012-05-08 14:13:27 -04:00
Calen Pennington
e725f59539 Add a settings file for doing grabs for main_static 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
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
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
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
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
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
Kyle Fiedler
05196249c1 Important :/ 2012-04-26 13:33:27 -04:00
Kyle Fiedler
eef6fee0dd added styles to fix bullets showing up in sequence nav 2012-04-26 13:31:28 -04:00
Kyle Fiedler
ad619e4dfc added styles to fix bullets showing up in sequence nav 2012-04-26 13:31:28 -04:00
Kyle Fiedler
7771c1d1de Added styles for headers for tutorials 2012-04-26 13:29:28 -04:00
Kyle Fiedler
97775532f9 Added better styles for titles and removed some white spaces 2012-04-26 13:29:28 -04:00
Kyle Fiedler
40de329405 More styles for tutorial index 2012-04-26 13:29:28 -04:00
Kyle Fiedler
070fb5fb74 Added new styles for tutorials 2012-04-26 13:29:27 -04:00
Calen Pennington
caf5c04007 Adding users to generated fixture data 2012-04-26 12:49:38 -04:00
Calen Pennington
dfc1749604 Adding code to anonymize fixture data 2012-04-25 15:43:47 -04:00
Kyle Fiedler
c69e7cfeee Added style for unorderlists in courseware 2012-04-25 15:33:09 -04:00