Chris Dodge
54ee1607b8
add unit test to test DraftModuleStore.get_items() fix
2013-01-23 11:22:37 -05:00
Deena Wang
ca185c034f
Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing
...
Conflicts:
lms/djangoapps/courseware/tests/test_module_render.py
2013-01-23 10:50:37 -05:00
Deena Wang
3fd69bcae4
more tests in test_views.py
2013-01-23 10:41:12 -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
Diana Huang
5ca1586e0c
Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates
2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69
Merge branch 'master' into feature/diana/rubric-input
2013-01-23 08:56:55 -05:00
Brian Wilson
ba62a657bf
Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post
2013-01-22 23:50:38 -05:00
Brian Talbot
023dadd074
studio - resolved base variable missing issue on lms side
2013-01-22 16:31:42 -05:00
marco
7b12dac021
added make visible to menu, and visibility description to threads
2013-01-22 15:47:23 -05:00
Jay Zoldak
26ee9a24ef
Add test for TOC rendering
2013-01-22 15:15:47 -05:00
Deena Wang
7884e2c690
more tests
2013-01-22 15:08:44 -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
Deena Wang
3565023389
created test_courses.py
2013-01-22 14:01:01 -05:00
Diana Huang
24f23176af
Add the ability to set up custom text for short form and
...
and long form results.
2013-01-22 13:17:37 -05:00
Diana Huang
9a53c37530
Use something more visually easy to use for self-assessment.
2013-01-22 11:25:12 -05:00
Brian Wilson
9653631e9a
Add initial openid_provider tests (covers xrds and authentication requests)
2013-01-22 11:15:30 -05:00
Deena Wang
6e773909e4
added test_views
2013-01-22 10:36:05 -05:00
Diana Huang
ba1cd8117f
Rename 'Pending' column to something more descriptive
2013-01-22 10:33:07 -05:00
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
