Commit Graph

3210 Commits

Author SHA1 Message Date
Valera Rozuvan
61c68b740c Set up of basic RequireJS skeleton structure. 2013-01-21 15:53:44 +02:00
David Ormsbee
0f035b7692 Remove extra RequireJS.js entry. 2013-01-18 17:03:55 -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
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
18d5792025 Merge pull request #1302 from MITx/bugfix/brian/pearson-reg
Bugfix/brian/pearson reg
2013-01-17 11:42:00 -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 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 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
Brian Wilson
bfb5f5e5bd Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-16 11:24:46 -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
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
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
Victor Shnayder
02d5cfd14d add comment about time format conversion 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
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
36b024ab95 Merge pull request #1203 from MITx/feature/alex/gst-mitx
Feature/alex/gst mitx
2013-01-15 08:24:09 -08:00
David Ormsbee
ad261706c8 Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
Brian Talbot
e070a926c5 pearson registration - resolving merge conflict 2013-01-15 07:46:49 -05:00
Valera Rozuvan
f2fd649a16 Removed unnecessary XML section. Documenting. 2013-01-15 12:55:13 +02:00
Valera Rozuvan
080e96fdc4 Work in progress on GST. 2013-01-15 12:55:11 +02:00