David Ormsbee
84fa4a0192
Merge pull request #1318 from MITx/hotfix/rocha/javascript-error-in-sequence-display
...
Add missing semicolon at the end of sequence display module javascript
2013-01-18 14:02:27 -08:00
Carlos Andrés Rocha
84efafc896
Add missing semicolon at the end of sequence display module javascript
2013-01-18 17:00:51 -05:00
David Ormsbee
44e7d6b267
Merge pull request #1315 from MITx/diana/fix-sa-tests
...
Quick fixes to self assessment tests
2013-01-18 13:07:33 -08:00
Diana Huang
999a648c3f
Merge branch 'master' into diana/fix-sa-tests
2013-01-18 15:49:03 -05:00
David Ormsbee
878640b651
Merge pull request #1316 from MITx/bugfix/victor/beta_testers
...
fix tests--nosetests is overly excited about my code
2013-01-18 12:43:11 -08:00
Victor Shnayder
1411bd1a88
fix tests--nosetests is overly excited about my code
2013-01-18 15:39:28 -05:00
Diana Huang
89055da8ba
Take out useless logging.
2013-01-18 15:38:59 -05:00
Diana Huang
0e3aeb4041
Merge branch 'master' into diana/fix-sa-tests
2013-01-18 15:21:50 -05:00
Diana Huang
bd6d153126
Fix failing self-assessment unit tests
2013-01-18 15:18:13 -05:00
David Ormsbee
bdc55d3686
Merge pull request #1308 from MITx/feature/rocha/sort-by-announcement-date
...
Sort courses by announcement date
2013-01-18 11:20:18 -08:00
David Ormsbee
33093e2d7a
Merge pull request #1313 from MITx/feature/ichuang/fix-bug-in-idashboard
...
fix bug in instructor dashboard groups code
2013-01-18 11:17:30 -08:00
ichuang
6d73a399b1
fix bug in instructor dashboard groups code
2013-01-18 14:04:01 -05:00
Carlos Andrés Rocha
ef69b738c9
Sort courses announcement date
...
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.
If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
2013-01-17 21:46:58 -05:00
David Ormsbee
7ac36d2f43
Merge pull request #1306 from MITx/fix/vik/remove-mitxmako
...
Fix/vik/remove mitxmako
2013-01-17 14:19:23 -08:00
Vik Paruchuri
18dc59c93a
Error message fix
2013-01-17 17:18:10 -05:00
Vik Paruchuri
eaa6701c6f
Remove mitxmako dependencies, make rubric and oechild inherit fro object
2013-01-17 17:13:31 -05:00
jarv
af086c2029
Merge pull request #1304 from MITx/mysql-python
...
Add MySQL-Python back in for AWS.
2013-01-17 12:56:20 -08:00
Ashley Penney
2d55f871ee
While this is a pain for content developer local environment updates it breaks the LMS in EC2 which is vastly more important. We'll jsut have to address helping individual content people with installing MySQL if needed. This is a real dependency in production and I think those belong in here.
2013-01-17 15:51:26 -05:00
David Ormsbee
18d5792025
Merge pull request #1302 from MITx/bugfix/brian/pearson-reg
...
Bugfix/brian/pearson reg
2013-01-17 11:42:00 -08: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
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
Brian Wilson
80b2f45ac5
move pearson_import to another branch
2013-01-17 10:14:55 -05: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
Brian Wilson
fea6feb04f
Strip whitespace off of registration demographics before validation
2013-01-16 17:39:33 -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
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
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
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
Ashley Penney
0193cc5976
Remove this altogether.
2013-01-16 15:08:55 -05:00
Brian Talbot
b16fa04371
pearson registration - resolved box-sizing display issue that caused form fields to not show text/be editable in Firefox/Mozilla
2013-01-16 15:08:23 -05:00
Ashley Penney
9dd9727bb8
Another minor tweak to limit these tests to the cms.
2013-01-16 14:52:54 -05:00
Brian Wilson
1d6b1be888
fix missing indirection in log message
2013-01-16 14:30:30 -05:00
Jay Zoldak
baa0e9be01
Merge pull request #1291 from MITx/bugfix/apenney/jenkins
...
Lets explicitly make the virtualenvs for now.
2013-01-16 11:13:37 -08:00
Ashley Penney
e38b44157a
Lets explicitly make the virtualenvs for now.
2013-01-16 14:09:48 -05:00
Ashley Penney
aa5ede3f92
Merge pull request #1289 from MITx/bugfix/dave/dont_explode_askbot_migration
...
Add a try/catch so that Askbot removal doesn't die if there's no Askbot ...
2013-01-16 09:18:12 -08:00
David Ormsbee
5d66490065
Add a try/catch so that Askbot removal doesn't die if there's no Askbot to remove from auth_user
2013-01-16 12:15:23 -05:00
brianhw
29c5d00b68
Merge pull request #1246 from MITx/feature/brian/pearson-reg
...
Feature/brian/pearson reg
2013-01-16 08:27:19 -08:00
Brian Wilson
bfb5f5e5bd
Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg
2013-01-16 11:24:46 -05:00
Brian Wilson
cc1b50ee4a
use new-style class for TestCenterExam
2013-01-16 11:24:20 -05:00
