arjun810
b2afa82c8e
Merge pull request #886 from MITx/hotfix/arjun/fix_integer_disc_ids_2
...
more removal of data("id") in favor of attr("data-id")
2012-10-12 14:59:20 -07:00
Arjun Singh
d7b237ce0a
more removal of data("id") in favor of attr("data-id")
2012-10-12 14:47:44 -07:00
Carlos Andrés Rocha
f1120a1139
Removed unused import
2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701
Fix to read utf-8 enconded html files for custom course tabs
2012-10-12 17:36:19 -04:00
ichuang
fd5c7c622c
Merge pull request #862 from MITx/feature/victor/capa-ajax
...
Feature/victor/capa ajax
I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
2012-10-12 13:51:10 -07:00
David Ormsbee
f5f1e858d5
Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids
...
Hotfix/arjun/fix integer disc ids
2012-10-12 11:38:28 -07:00
David Ormsbee
01ac01b62c
Re-enable change name, and fix up change email styles
2012-10-12 14:31:20 -04:00
Victor Shnayder
19d3cb3870
Add a chemicalequationinput with live preview
...
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one. This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
Tom Giannattasio
a9ba3543d3
styled edge registration form
2012-10-12 11:18:55 -04:00
Calen Pennington
4814f8c38e
Cleaning up logos for edge landing page
2012-10-12 10:31:46 -04:00
Calen Pennington
c41c084b39
Wire up login and register forms for edx landing page
2012-10-12 09:55:32 -04:00
David Ormsbee
96bdd03406
re-enable email change functionality
2012-10-12 09:54:47 -04:00
Arjun Singh
71201a73b2
styles and tiny bit of logic for community tas
2012-10-12 04:54:56 -07:00
Arjun Singh
c28c3f9916
Merge branch 'master' into hotfix/arjun/fix_integer_disc_ids
2012-10-12 04:23:29 -07:00
Arjun Singh
6fbf2f9720
revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved
2012-10-12 04:22:27 -07:00
Tom Giannattasio
51a19b3d7e
transferred edge styles from cms to lms
2012-10-11 14:02:13 -04:00
David Ormsbee
d0668043a5
Merge pull request #861 from MITx/feature/ichuang/dump_grades
...
add django management command for dumping grades to CSV file
2012-10-11 10:24:19 -07:00
Calen Pennington
096d6853eb
Allow for branding subdomains that are longer than a single .
2012-10-11 13:18:27 -04:00
Calen Pennington
9e9825cb88
Enable the edge virtual university landing page in the lms
2012-10-11 13:18:01 -04:00
Victor Shnayder
a5dcdcb705
Check for None to fix 3.091 progress tab crash
...
- get_module() contract says it can return None (e.g. if access control check failed)
2012-10-11 13:08:05 -04:00
Calen Pennington
d21c5761df
Minor bug fixes from edge-configs merge
2012-10-11 12:49:48 -04:00
Calen Pennington
cf19a43268
Set SESSION_COOKIE_DOMAIN from env.json
2012-10-11 12:32:23 -04:00
Calen Pennington
5ae34aa4ed
Add heartbeat to cms
2012-10-11 12:32:23 -04:00
Calen Pennington
284f0d6a22
Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content
2012-10-11 12:31:52 -04:00
Calen Pennington
658bb622ba
Always import logsettings after common, so that paths are set
2012-10-11 12:31:52 -04:00
Calen Pennington
bc69ed8c9e
Move logsettings to common, so that it's shared between cms and lms
2012-10-11 12:31:52 -04:00
Calen Pennington
20f84b2055
Use the right config as the base for lms.envs.cms.aws
2012-10-11 12:31:52 -04:00
Calen Pennington
eece835d9b
Put in an empty contentstore for the LMS by default
2012-10-11 12:31:52 -04:00
Calen Pennington
46668d2634
Read CONTENTSTORE from auth.json in lms
2012-10-11 12:31:51 -04:00
Calen Pennington
0162e4c031
Remove more askbot remnants
2012-10-11 12:31:51 -04:00
Calen Pennington
f5a63f7375
Remove all askbot common settings
2012-10-11 12:31:51 -04:00
Calen Pennington
1114f66a98
Enable specification of modulestore in LMS aws config
2012-10-11 12:31:51 -04:00
Tom Giannattasio
86f32bb3d4
added edge template to university folder
2012-10-11 12:29:40 -04:00
ichuang
778017fc3e
add django management command for dumping grades to CSV file
2012-10-11 11:30:57 -04:00
David Ormsbee
88f147c704
Merge pull request #847 from MITx/feature/rocha/openid-djangostore
...
Fix openid provider URL matching for usernames with non-word characters
2012-10-11 08:06:48 -07:00
David Ormsbee
488d001e85
Merge pull request #854 from MITx/feature/bridger/course_grading
...
Added an indicator on Progress page when there are no problem scores in a section.
2012-10-11 08:06:05 -07:00
Arjun Singh
58b0829b79
Fix some issues with integer ids in the discussion forum
2012-10-11 06:22:00 -07:00
Calen Pennington
c8d267fb72
Fix minor typo in access.py
2012-10-10 22:03:08 -04:00
Bridger Maxwell
e256b2390b
Added an indicator on Progress page when there are no problem scores in a section.
2012-10-10 14:53:39 -04:00
Calen Pennington
b19627ccf3
Add configs for lms and lms preview running against mongo
2012-10-10 12:49:52 -04:00
Calen Pennington
2b030f7aaf
Clean up how tests use modulestores
2012-10-10 12:49:51 -04:00
Calen Pennington
1a8532d8ad
Make it possible to create, edit, and publish a draft
2012-10-10 12:49:51 -04:00
Carlos Andrés Rocha
386480905f
Fix openid provider URL matching for usernames with non-word characters
2012-10-09 17:48:46 -04:00
Chris Dodge
a80e8ce3d5
respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS
2012-10-09 15:11:07 -04:00
Victor Shnayder
bcf835532b
Pass course_id instead of course to get_site_status_msg
...
* makes testing easier -- don't need course objects
2012-10-08 14:06:58 -04:00
Victor Shnayder
9e43664498
Add support for per-course site status.
...
Now looks for a status_message.json file, looks for 'global' and ${course.id} keys. Return any global message and any course-specific message, joined by <br>.
fab files need to be updated to use this new format (new filename, possibly also help manage per-course messages, or at least test for valid json)
2012-10-07 23:09:26 -04:00
Victor Shnayder
36917b0036
Merge pull request #829 from MITx/feature/tomg/ie-banner
...
added ie warning banner to courseware; displayed by ie conditional style...
2012-10-05 13:53:15 -07:00
Victor Shnayder
4fd530dbac
fix python syntax in template for adding google analytics
2012-10-05 11:49:17 -04:00
Tom Giannattasio
1804d5410c
fixed ie banner showing outside of courseware bug
2012-10-04 15:50:02 -04:00
Tom Giannattasio
49bd3ac905
added ie warning banner to courseware; displayed by ie conditional stylesheet
2012-10-04 15:34:50 -04:00
