David Ormsbee
15249b03d6
Merge pull request #1296 from MITx/hotfix/alex/gst
...
Hotfix/alex/gst
2013-01-17 08:14:39 -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
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
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
Ashley Penney
9dd9727bb8
Another minor tweak to limit these tests to the cms.
2013-01-16 14:52:54 -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
Victor Shnayder
9519087d84
Merge pull request #1271 from MITx/feature/victor/beta-testers
...
Feature/victor/beta testers
2013-01-16 06:50:57 -08:00
Victor Shnayder
b188c8e722
fix bug in string splitting.
2013-01-15 18:19:54 -05:00
Brian Wilson
cc31c79517
fixes for first round of code review
2013-01-15 18:15:54 -05:00
Brian Wilson
3b28e328c4
disable export of testcenter_exam from course module (and add test).
2013-01-15 17:54:10 -05:00
David Ormsbee
39655bff68
Merge pull request #1283 from MITx/content/rocha/faq-update
...
Update to the FAQ page
2013-01-15 13:16:35 -08:00
Brian Wilson
cd2a704aec
Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg
2013-01-15 16:04:05 -05:00
Brian Wilson
ef0f973ca4
display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands.
2013-01-15 16:00:10 -05:00
Diana Huang
78c194aaf4
Merge pull request #1284 from MITx/feature/vik/add-staff-grading-notifications
...
Feature/vik/add staff grading notifications
2013-01-15 12:45:56 -08:00
Brian Wilson
fb251cacbe
Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg
2013-01-15 15:42:29 -05:00
Brian Wilson
32b2d1b97f
Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations
2013-01-15 15:42:09 -05:00
Vik Paruchuri
8aa033f601
Add peer and staff grading required display, notifications
2013-01-15 15:40:23 -05:00
Vik Paruchuri
ef2b069409
Add staff grading notifications
2013-01-15 15:34:09 -05:00
Brian Talbot
540232f54d
revised minor syntax/line indents on faq scss and js
2013-01-15 15:30:53 -05:00
Brian Talbot
a4e53d7a7f
pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately
2013-01-15 14:52:39 -05:00
Victor Shnayder
9c7f2cf604
WIP -- do not merge
2013-01-15 14:44:09 -05:00
VikParuchuri
e2f8ce9de6
Merge pull request #1276 from MITx/feature/vik/add-peer-grading-notifications
...
Feature/vik/add peer grading notifications
2013-01-15 11:40:59 -08:00
Vik Paruchuri
301293f8b0
Remove debug statement, fix active page issue on problem page
2013-01-15 14:33:38 -05:00
Vik Paruchuri
7b1262f667
Fix up authentication, other things
2013-01-15 14:31:02 -05:00
John Hess
9a81c56254
Tracking progess page lookups on instructor dashboard
2013-01-15 13:51:24 -05:00
John Hess
9ef1a4ded5
Tracking problem resets, clearer msgs
2013-01-15 13:51:24 -05:00
John Hess
d025ca248f
Added instructor tools for resetting attempts on a single student's problem to 0 and for getting student's progress page
2013-01-15 13:51:24 -05:00
Brian Wilson
c8f52deb3d
wire up registration closed functionality
2013-01-15 11:55:36 -05:00
Carlos Andrés Rocha
8a1f30bfa0
Merge pull request #1281 from MITx/fix/apenney/numpy
...
Temporary workaround to our bizarre jenkins/numpy issue.
2013-01-15 08:46:06 -08:00
Victor Shnayder
02d5cfd14d
add comment about time format conversion
2013-01-15 11:44:27 -05:00
Victor Shnayder
2f7210ed0c
address Ike's comments
2013-01-15 11:44:27 -05:00
Victor Shnayder
570df1c9e6
Fix bugs, refactor, support lists of users
2013-01-15 11:44:27 -05:00
Victor Shnayder
3f654af7cd
Refactor common code, fix view a bit
...
remaining:
* support putting multiple names / emails in the big box we now have
2013-01-15 11:44:27 -05:00
Victor Shnayder
1a5fc065ad
Add beta test group management view to instructor dashboard
...
* still needs to support uploading a list
* also want to clean up and refactor the code a bit
2013-01-15 11:44:26 -05:00
Ashley Penney
093839e13d
flesh out comment.
2013-01-15 11:39:59 -05:00
David Ormsbee
d4259c63db
Merge pull request #1260 from MITx/cale/circular-import-fix
...
Remove circular dependencies that connect student.models and django_comm...
2013-01-15 08:37:21 -08:00
Victor Shnayder
58a9fdeddc
add note about settings needed for manual testing
2013-01-15 11:36:25 -05:00
Victor Shnayder
3e5a2f9bde
Add beta test group support
...
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
2013-01-15 11:36:25 -05:00
David Ormsbee
66ffef131d
Merge branch 'master' into cale/circular-import-fix
...
Conflicts:
common/djangoapps/student/models.py
2013-01-15 11:35:19 -05:00
David Ormsbee
a2d5d0bc89
Merge pull request #1279 from MITx/jaakana
...
added problem weight description
2013-01-15 08:25:14 -08:00
