Diana Huang
3646ff53d8
Display updates and fixes.
2013-01-17 14:00:02 -05:00
chrisndodge
fe5d72857f
Merge pull request #1300 from MITx/fix/cdodge/no-caching-in-preview
...
disable caching in draft mode stores. It doesn't behave as we expect and...
2013-01-17 10:17:16 -08:00
cahrens
5f05ec83f1
Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.
2013-01-17 13:11:47 -05:00
Chris Dodge
fe964ec8ba
disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate
2013-01-17 13:11:16 -05:00
Chris Dodge
45bb511e15
remove obsolete test (per Vik)
2013-01-17 12:06:21 -05:00
Diana Huang
2b4e9f45b9
Updates to the CSS and html formatting for statuses
...
and self-assessment
2013-01-17 11:34:44 -05:00
Don Mitchell
1782c54e68
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
2013-01-17 11:23:45 -05:00
Don Mitchell
db4455e6e1
Cache
2013-01-17 11:23:39 -05:00
Don Mitchell
480aa80db3
Cache
2013-01-17 11:23:39 -05:00
David Ormsbee
9f33e3c755
Merge pull request #1294 from MITx/content/rocha/faq-update
...
Update content: FAQ, help page and front page video
2013-01-17 08:15:12 -08:00
David Ormsbee
15249b03d6
Merge pull request #1296 from MITx/hotfix/alex/gst
...
Hotfix/alex/gst
2013-01-17 08:14:39 -08:00
Brian Talbot
fdd395e0b3
pearson registration - synced up link text for emailing edx
2013-01-17 10:50:58 -05:00
Don Mitchell
ebb2976332
Merge pull request #1298 from MITx/feature/christina/misc
...
Escape text being passed to markdown editor, delete copied (and unused) JS code
2013-01-17 07:50:43 -08:00
Brian Talbot
59b328f4b2
pearson registration - removed telephone/fax placeholder attributes since they can't represent both domestic and international formatting easily
2013-01-17 10:49:57 -05:00
Carlos Andrés Rocha
9fdb4d0923
Replace front page video
...
[#154 ]
2013-01-17 10:47:50 -05:00
Carlos Andrés Rocha
1be58c62e3
Update /faq page: change certificate of completion to mastery
2013-01-17 10:47:50 -05:00
Carlos Andrés Rocha
00f83d03a0
Restore /faq page, and moved new content to /help
2013-01-17 10:47:50 -05:00
cahrens
b6fcf3a51e
Some refactoring from Brian's submission.
2013-01-17 10:36:04 -05:00
Brian Wilson
80b2f45ac5
move pearson_import to another branch
2013-01-17 10:14:55 -05:00
Diana Huang
280a2f290e
Merge branch 'master' into diana/open-ended-ui-updates
2013-01-17 10:09:16 -05:00
Chris Dodge
fcf92a371d
fix up testing failures post merge
2013-01-17 09:48:10 -05:00
Diana Huang
df8d088492
Display updates to the xmodule.
2013-01-17 09:44:47 -05:00
Diana Huang
589e848fd4
Pass along the correct display name to the controller
2013-01-17 09:44:13 -05:00
Chris Dodge
48cbf38a41
resolve merge conflicts
2013-01-17 09:36:09 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
cahrens
d07a9203d1
in progress
2013-01-17 09:10:23 -05:00
chrisndodge
358c56da9e
Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes
...
Fix/cdodge/filesystem xml fixes
2013-01-17 05:55:22 -08:00
Alexander Kryklia
176be15998
removed unnecssary debug information
2013-01-17 14:25:28 +02:00
Alexander Kryklia
f22af62f2c
removed jstat, added javascript_loader
2013-01-17 14:22:13 +02:00
Alexander Kryklia
1d36e7baf9
now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first
2013-01-17 14:21:52 +02:00
Brian Wilson
4a59125bf9
add pearson import confirmation tool
2013-01-16 17:51:31 -05:00
John Jarvis
e09728a3b2
Removing the unavailable tally
...
It doesn't make sense to print out unavailable students
since it will go negative as students unenroll
2013-01-16 17:48:46 -05:00
John Jarvis
52e387e029
Add the force flag
...
This will allow you to force the certificate generation
for when certificate requests are lost and stuck in
'generating', this happens when we have xqueue issues.
2013-01-16 17:44:19 -05:00
Brian Wilson
fea6feb04f
Strip whitespace off of registration demographics before validation
2013-01-16 17:39:33 -05:00
John Jarvis
44141b6a55
pep8 cleanup
2013-01-16 17:39:26 -05:00
John Jarvis
491027a814
Allow generation of certificates if they are in the generating state
2013-01-16 17:34:48 -05:00
Brian Talbot
a756776836
pearson registration - revised rejection message text on dashboard, synced up email edx link text, revised contact styles/markup to remove giant red button dashboard for rejections
2013-01-16 17:26:29 -05:00
Brian Talbot
db7443ce7c
studio html editor - added in visual assets needed for previous UI syncing
2013-01-16 16:56:22 -05:00
Brian Talbot
f34fd5c426
studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js
2013-01-16 16:55:11 -05:00
David Ormsbee
fd20496a60
Merge pull request #1280 from MITx/feature/jth/attempts_reset
...
Added 2 new instructor tools
2013-01-16 13:48:26 -08:00
John Hess
f7f563db9b
Use reverse() to lookup student progress page, use index to lookup module_state_key
2013-01-16 16:44:25 -05:00
Brian Wilson
e68e612ee1
Return 404 in begin_exam_registration when course or exam are not valid
2013-01-16 16:40:28 -05:00
Diana Huang
9079c66a32
Some interface cleanup stuff for the combined open ended module.
2013-01-16 16:35:58 -05:00
chrisndodge
2f1363843b
Merge pull request #1293 from MITx/feature/christina/misc
...
Fix bug related to creation of thumbnails for non-image files.
2013-01-16 12:49:27 -08:00
Brian Wilson
c7f722daec
Merge branch 'bugfix/brian/pearson-reg' of github.com:MITx/mitx into bugfix/brian/pearson-reg
2013-01-16 15:43:30 -05:00
Brian Wilson
1de67be788
clear upload_status if user makes changes to TestCenterUser or TestCenterRegistration (so the change is pending, rather than rejected)
2013-01-16 15:43:15 -05:00
cahrens
bc80779f6f
Fix bug related to creation of thumbnails for non-image files.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
2013-01-16 15:40:14 -05:00
Diana Huang
88427ea02f
Update criteria for peer grading progress bars.
2013-01-16 15:15:55 -05:00
Jay Zoldak
ad68177e4d
Merge pull request #1292 from MITx/bugfix/apenney/jenkins
...
Another minor tweak to limit these tests to the cms.
2013-01-16 12:10:51 -08:00
jmvt
a9d3736cfb
Replace all calls to analytics service to use the get methods (pulls from mongodb). Added error handling.
2013-01-16 15:09:54 -05:00
