Calen Pennington
fedf2c8d00
Merge pull request #150 from MITx/stable-edx4edx-aws
...
Stable edx4edx aws
2012-06-28 05:39:42 -07:00
ichuang
3f60c76fad
Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx
2012-06-27 19:14:32 -04:00
John Jarvis
03b6bd044e
setting quickedit to true
2012-06-27 18:06:29 -04:00
John Jarvis
59d0c408f0
collect static resources is now handled by the gunicorn upstart script
2012-06-27 13:12:55 -04:00
ichuang
c5630e6d9f
MITx -> edX in activation email
2012-06-26 23:09:52 -04:00
ichuang
c0581f8c86
fix subject in activation email - now uses course_title
2012-06-26 23:07:24 -04:00
ichuang
200e188c09
add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation
...
- issue is that content machine isn't whitelisted for email
- this also provides secondary filtering for user registration
2012-06-26 23:00:25 -04:00
pmitros
fee4ecf742
Merge pull request #149 from MITx/stable-edx4edx-aws
...
Stable edx4edx aws
We may need to switch quickedit, based on feedback from Ike.
2012-06-26 16:52:46 -07:00
John Jarvis
7b86caafad
adding edx4edx_aws for edx4edx aws instance
2012-06-26 19:34:53 -04:00
ichuang
a3b38f2f3f
Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx
2012-06-26 23:08:24 +00:00
ichuang
bda75b4fbd
add admin model for student (need to be able to see activation keys in db)
2012-06-26 23:07:45 +00:00
ichuang
5d9c600de8
3.091x static link
2012-06-26 19:04:51 -04:00
ichuang
a1b53c3cd6
add 3.091x to multicourse
2012-06-26 18:40:07 -04:00
Prem Sichanugrist
4db0a70166
Fix code convention
2012-06-26 16:35:44 -04:00
Prem Sichanugrist
4580ef89d4
Queue up MathML conversion to be after render
...
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
2012-06-26 16:35:44 -04:00
Prem Sichanugrist
7475e415a4
Fix test failure after progress introduction
2012-06-26 16:35:44 -04:00
Kyle Fiedler
6c95bfc175
Fix hover on textbook buttons
2012-06-26 15:18:17 -04:00
Kyle Fiedler
fc81cf75c1
fixed padding issue on seq nav
2012-06-26 14:56:28 -04:00
Calen Pennington
65c8396eab
Merge pull request #140 from MITx/kf-html-edit
...
Kf html edit
2012-06-26 11:51:19 -07:00
David Ormsbee
084c4875be
Merge pull request #144 from MITx/kf-seq-nav
...
Added new styles for the sequence nav including completeness
2012-06-26 11:34:54 -07:00
David Ormsbee
2ec12f59c7
Merge pull request #145 from MITx/kf-sidebar-buttons
...
Added fix for the sidebar buttons in the courseware
2012-06-26 11:34:36 -07:00
Kyle Fiedler
10c1270b8a
Added fix for the sidebar buttons in the courseware
2012-06-26 14:31:04 -04:00
Kyle Fiedler
aee2cf4ed5
Added new styles for the sequence nav including completeness
2012-06-26 14:09:57 -04:00
Prem Sichanugrist
3f9554f20b
Merge pull request #141 from MITx/ps-player-slider
...
Scroll the caption upon video seeking
2012-06-26 07:32:06 -07:00
ichuang
9aeaaa72a9
configuration running on content server: lms/envs/dev_edx4edx
2012-06-26 14:07:14 +00:00
ichuang
caa14922bb
edx4edx configuration running on content server. Notes:
...
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
- email backend set
- index page modified for edx4edx
2012-06-26 14:04:56 +00:00
ichuang
a988452d4d
Merge pull request #132 from MITx/kf-problems
...
I'll go ahead and merge this, since it fixes nearly all the issues we had with problem and html css, and this should go in before more changes. The table borders can be fixed in another round.
2012-06-25 19:14:12 -07:00
Prem Sichanugrist
d9d6f9b749
Introduce rake cms:import task to import data
...
Usage: `rake cms:import DATA_DIR=<path_to_your_data_dir>`
2012-06-25 16:38:06 -04:00
Prem Sichanugrist
05f4e4fb38
Scroll the caption upon video seeking
2012-06-25 12:22:37 -04:00
Kyle Fiedler
863568ec99
Added red wip class and added tag for it
2012-06-25 11:52:43 -04:00
Kyle Fiedler
656fa38944
Added wip class
2012-06-25 11:44:06 -04:00
Kyle Fiedler
3081258836
Refactored the css and fixed some smaller bugs
2012-06-25 11:21:24 -04:00
Kyle Fiedler
5908d844b8
Added styles to be more consistant across pages
2012-06-25 11:21:24 -04:00
ichuang
b59b80871a
add edit link to module pages with filenames (html & problem)
...
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
2012-06-24 14:46:02 -04:00
ichuang
9cea3f971f
improved error handling - catch errors around lcp.get_html()
2012-06-24 12:40:56 -04:00
ichuang
84e59a54e6
improved symmath error handling for matrix shape mismatch
2012-06-23 17:05:09 -04:00
ichuang
7814805c1a
improve capa error handling a bit - for better user experience
...
- if no answer given, then symbolicresponse + customrepsonse now
give an error message, instead of doing nothing
- in capa_module if lcp.grade_answers fails, in DEBUG mode display
alert with useful error message
2012-06-23 16:23:27 -04:00
ichuang
62f1717972
add more loncapa check functions (choose, rad2deg, deg2rad)
2012-06-23 16:20:05 -04:00
ichuang
bccdeb2a90
fix quickedit.html for latest css
2012-06-23 16:19:41 -04:00
ichuang
bb5278c63b
Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx
2012-06-22 18:28:27 -04:00
David Ormsbee
f041fc4a0b
Merge pull request #135 from MITx/cpennington/cms-editing
...
Roundtrip HTML module editing working in the CMS
2012-06-22 10:06:51 -07:00
Calen Pennington
968ff7325c
Merge pull request #131 from MITx/victor/xml-testing
...
Victor/xml testing
2012-06-22 08:38:01 -07:00
Kyle Fiedler
9e8f20104c
added styles for ol in html units
2012-06-22 11:17:31 -04:00
Calen Pennington
83b3d51fd2
Wire up the cancel button in the unit editor
2012-06-22 10:58:18 -04:00
Calen Pennington
72eef72d8b
Html Module can now be editing, saved, and re-opened
2012-06-22 10:58:18 -04:00
Kyle Fiedler
f9bb8a701a
Added new readme info and started to rework some of the css
2012-06-22 09:42:22 -04:00
Calen Pennington
5bef1e14b2
Split problem metadata out from problem editing contents when rendering
2012-06-22 09:21:09 -04:00
Calen Pennington
17a4d7fd09
Call js module name dynamically, rather than statically calling the HTML module
2012-06-22 08:59:53 -04:00
ichuang
37539fdd4b
revised 8.01x entry in dev_ike
2012-06-21 23:35:48 -04:00
ichuang
6566c45e6f
use pipeline
2012-06-21 21:40:41 -04:00
