Diana Huang
a34a9dd038
Merge branch 'master' into diana/open-ended-ui-updates
2013-01-22 08:40:40 -05:00
Diana Huang
e7bc32fd4d
Merge branch 'master' into feature/diana/rubric-input
2013-01-22 08:38:17 -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
Kevin Chugh
b26c59bda0
fix syntax error
2013-01-20 01:53:25 -05:00
David Ormsbee
0f035b7692
Remove extra RequireJS.js entry.
2013-01-18 17:03:55 -05:00
Diana Huang
dd20226ec3
Merge branch 'master' into feature/diana/rubric-input
...
Fix some merge issues involving rubric rendering
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/open_ended_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
2013-01-18 16:36:22 -05:00
Diana Huang
2291483c43
Merge branch 'master' into diana/open-ended-ui-updates
2013-01-18 16:16:21 -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
Deena Wang
1565cd5bd3
Test cases for lms/djangoapps/courseware/module_render in test_module_render
2013-01-18 14:44:17 -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
Diana Huang
f500958439
More fixes for the merge and some display updates.
2013-01-18 13:52:50 -05:00
Your Name
b8e3cfcf96
added get_cohort_ids
2013-01-18 13:50:05 -05:00
Your Name
dba39e2431
add group support to lms
2013-01-18 12:50:25 -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
Diana Huang
2e791043e8
Merge branch 'master' into diana/open-ended-ui-updates
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/open_ended_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
2013-01-18 09:21:38 -05:00
Diana Huang
481580c702
Remove hints from self-assessment and misc display fixes
2013-01-18 08:48:50 -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
marco
2b23c40345
minor tweaks to dropdown text and addition of dropdown menu (without data links) for intructor visilibility dropdown in main discussion forum;
2013-01-17 15:25:35 -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
Diana Huang
87990b36f4
Rubric sizing tweaks and text improvements.
2013-01-17 14:35:49 -05:00
Diana Huang
7171e6b7cc
Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates
2013-01-17 14:02:00 -05:00
Diana Huang
18a3d5e734
Merge branch 'master' into feature/diana/rubric-input
2013-01-17 14:00:43 -05:00
Diana Huang
3646ff53d8
Display updates and fixes.
2013-01-17 14:00:02 -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
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
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
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
