jmvt
d6984cced8
Updated code to handle new analytics result format.
2013-02-04 16:08:37 -05:00
jmvt
549a5e9fe9
Merge remote-tracking branch 'origin/master' into jmpm-analytics
2013-01-23 12:02:48 -05:00
jmvt
4f005044d6
Added time of query display.
2013-01-23 10:17:17 -05:00
David Ormsbee
eab9511466
Merge pull request #1295 from MITx/feature/jarv/certificate-force-update
...
Feature/jarv/certificate force update
2013-01-23 06:32:41 -08:00
Brian Wilson
ba62a657bf
Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post
2013-01-22 23:50:38 -05:00
Calen Pennington
75b0a8eed6
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2013-01-22 14:47:52 -05:00
Calen Pennington
bbcab7314a
Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed
2013-01-22 14:10:01 -05:00
Brian Wilson
9653631e9a
Add initial openid_provider tests (covers xrds and authentication requests)
2013-01-22 11:15:30 -05:00
Peter Baratta
45f2a690d0
Commented on high level functions
2013-01-22 01:40:13 -07:00
Carlos Andrés Rocha
183721ecf5
Correct last screenshot caption of media-kit page.
...
[#159 ]
2013-01-21 16:58:35 -05:00
Carlos Andrés Rocha
899c501d3d
Add announcement of Walter Lewin's course
...
[#157 ]
2013-01-21 16:58:27 -05:00
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
Chris Dodge
0efd6e6a15
Merge branch 'master' into feature/cdodge/cms-master-merge4
2013-01-18 16:14:27 -05:00
Chris Dodge
550e805b74
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
2013-01-18 15:44:41 -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
Chris Dodge
575ff02f8a
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
...
Conflicts:
jenkins/test.sh
2013-01-18 10:26:44 -05:00
Chris Dodge
c6276c8394
only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata
2013-01-17 23:58:07 -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
Chris Dodge
44cfcb88a3
Merge branch 'master' into feature/cdodge/cms-master-merge4
2013-01-17 20:30:22 -05:00
jmvt
bc268aa791
Merged to lastest master.
2013-01-17 17:39:12 -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
John Jarvis
08b8a9f674
Better help message for the force-gen option
2013-01-17 14:36:08 -05: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
Chris Dodge
fcf92a371d
fix up testing failures post merge
2013-01-17 09:48:10 -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
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
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
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
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
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
