ichuang
63aa451d67
use course = settings.COURSE_DEFAULT.replace('_',' ') for default accordion
2012-07-02 11:29:45 -04:00
ichuang
10a10c7938
clean up email settings check in lms.djangoapps.student.views
2012-07-02 11:21:00 -04:00
ichuang
8467aa0846
fix dev_edx4edx mako path - add EDX4EDX_ROOT
2012-07-01 17:44:04 +00:00
ichuang
5f4a27d6cc
typo
2012-07-01 13:17:57 -04:00
ichuang
b3cc34c3d4
add debugging to courseware debug (tricky with https behind gunicorn)
2012-07-01 13:16:09 -04:00
ichuang
d28ad6ced8
lms/envs/edx4edx_aws update
2012-07-01 12:53:31 -04:00
ichuang
23128ced67
courseware views now goes to default chapter and section if unprovided
...
- uses multicourse settings (default_chapter and default_section)
- it would be nice to use course_settings instead, but that is not
currently compatible with multicourse
2012-07-01 12:51:14 -04:00
ichuang
7e25e30ac1
Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx
2012-07-01 12:26:04 -04:00
pmitros
81a1dd8975
Merge pull request #151 from MITx/course_settings_json
...
Course settings is in json, not python
2012-06-30 04:30:47 -07:00
ichuang
7f4ebcb6a9
pep8 fixes - inputtypes
2012-06-29 23:22:40 -04:00
ichuang
fedf216bde
Exception, err -> Exception as err
2012-06-29 23:18:58 -04:00
ichuang
547e19625a
exception as err
2012-06-29 23:09:26 -04:00
ichuang
0f1ae7f03b
Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx
2012-06-29 16:22:49 -04:00
ichuang
14745893b7
add edx4edx root stuff from aws config to dev_ike config
2012-06-29 15:47:49 -04:00
ichuang
735833c135
Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx
2012-06-29 14:50:47 -04:00
ichuang
8283636e39
inputtypes: if externalresponse server message is bad, don't crash
2012-06-29 14:50:11 -04:00
John Jarvis
d61d084599
postrm update
2012-06-29 13:33:14 -04:00
John Jarvis
6229b2d1f4
updating rakefile to cleanup on package removal
2012-06-29 13:14:36 -04:00
John Jarvis
6df2226777
updating URL for activation email to edx4edx
2012-06-29 09:37:14 -04:00
ichuang
8a6dd2f756
add 6.00x to dev_ike.py
2012-06-28 14:20:22 -04:00
Bridger Maxwell
cbe5c612b4
Used dictionary update for cleaner course settings code.
2012-06-28 14:04:50 -04:00
John Jarvis
db614b2c16
removing symlinks
2012-06-28 12:51:50 -04:00
Bridger Maxwell
201f093981
Removed old import.
2012-06-28 12:34:45 -04:00
Bridger Maxwell
621680e340
Removed old global course settings file.
2012-06-28 12:31:29 -04:00
Bridger Maxwell
789325b400
Merge branch 'master' of github.com:MITx/mitx
2012-06-28 12:04:11 -04:00
Bridger Maxwell
51d6b3f096
Changed course settings to be a json file. Moved it to its own file.
2012-06-28 12:04:03 -04:00
Calen Pennington
194908711d
Import x_module using the full path
2012-06-28 11:52:58 -04:00
Calen Pennington
f59951ead5
Run tests before running code quality checks (for faster turnaround time)
2012-06-28 11:51:37 -04:00
Calen Pennington
19044abed2
Run tests before running code quality checks (for faster turnaround time)
2012-06-28 11:29:46 -04:00
Calen Pennington
919f8cf261
Import x_module using the full path
2012-06-28 11:28:42 -04:00
John Jarvis
5c398b25da
updating edx4edx_aws config
2012-06-28 11:15:03 -04:00
ichuang
5688e89fab
change MITx -> edX in many lms templates
2012-06-28 10:26:59 -04:00
Calen Pennington
fedf2c8d00
Merge pull request #150 from MITx/stable-edx4edx-aws
...
Stable edx4edx aws
2012-06-28 05:39:42 -07:00
Calen Pennington
2fde7f4c6d
Minor fixes from pull request 131
2012-06-28 08:39:12 -04:00
ichuang
6f5e54b9de
Merge pull request #147 from MITx/ps-fix-problem
...
Queue up MathML conversion to be after render
2012-06-27 16:21:17 -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
Bridger Maxwell
bf4f946f0d
Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue.
2012-06-27 14:47:16 -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
