Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
Victor Shnayder
d697c6b94c Add associate legal counsel job description (LH #166) 2013-01-27 17:46:27 -05:00
Victor Shnayder
aee8c863cd Make 'Students' link on FAQ page point to /help (LH #164) 2013-01-27 17:38:56 -05:00
e0d
c8e6bedc1a add 2013-01-27 17:19:12 -05:00
e0d
6a7997f9ba add 2013-01-27 17:19:00 -05:00
e0d
313eab90c3 add 2013-01-27 17:18:55 -05:00
David Ormsbee
fd8df0122e Merge pull request #1361 from MITx/feature/victor/cohorts 
Fix missing import
 2013-01-27 07:20:59 -08:00
Victor Shnayder
c1f7b109d8 Fix missing import 2013-01-27 10:19:36 -05:00
chrisndodge
2b824c844a Merge pull request #1360 from MITx/edz/feature/explicit-css-charset 
adding explicit charset declaration to additional css
 2013-01-26 18:44:16 -08:00
e0d
d747f54fc8 adding explicit charset declaration to additional css 2013-01-26 21:29:05 -05:00
e0d
956ccb06e9 explicitly set the domain for the csrf cookie to match the session domain. 2013-01-26 21:10:14 -05:00
David Ormsbee
eff5093cbf Force charset for application.sass to be UTF-8 2013-01-26 14:38:49 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
David Ormsbee
ca28796a86 Merge pull request #1345 from MITx/feature/apenney/pearson-merge 
Pearson export/import code. (No merging before 25th Jan)
 2013-01-25 13:54:55 -08:00
Diana Huang
ca0cb5b703 Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 16:37:41 -05:00
Ned Batchelder
08acf43575 Don't store first_time_user any more, instead interested observers 
can examine whether .position is None or not.
 2013-01-25 15:49:29 -05:00
Victor Shnayder
00dd3ad9f8 Fix some of the test bugs. Still more to fix. 2013-01-25 15:40:13 -05:00
Diana Huang
47c24d8e7e Raise smarter exceptions when parsing rubrics. 2013-01-25 13:33:35 -05:00
Victor Shnayder
66934ce220 Address Dave's comments on https://github.com/MITx/mitx/pull/1350 2013-01-25 13:33:19 -05:00
Carlos Andrés Rocha
f35d4a16c3 Added one more year! 2013-01-25 13:31:23 -05:00
Deena Wang
583505b95b test_courses.py 2013-01-25 12:19:16 -05:00
Diana Huang
115f6c3acf Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-25 11:19:38 -05:00
Diana Huang
3ec2a83ec1 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 
Fix

Conflicts:
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-01-25 10:35:55 -05:00
Kevin Chugh
07c1999a95 prep for staging 2013-01-24 21:43:36 -05:00
Chris Dodge
1787157e00 put back the 'position' argument to get_module() which got accidentially - or so I think - dropped in a previous commit 2013-01-24 21:38:02 -05:00
Victor Shnayder
771a55a631 turn forums on in test.py 
- this may not be a good idea, but needed for testing cohorts for now...
 2013-01-24 18:35:34 -05:00
Victor Shnayder
d17aedf3b4 the reverse isn't working for some reason... need to figure it out 2013-01-24 18:08:51 -05:00
Victor Shnayder
0b7e7b35dc stub out django comment client test system 2013-01-24 17:33:40 -05:00
Deena Wang
f9b0ec37cd more tests in test_views, needs templates to continue 2013-01-24 16:08:19 -05:00
Chris Dodge
dfbe7dd4f9 fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict 2013-01-24 15:54:02 -05:00
Ashley Penney
135369a3d7 Merge branch 'feature/apenney/pearson-merge' of github.com:MITx/mitx into feature/apenney/pearson-merge 2013-01-24 15:20:49 -05:00
Ashley Penney
b02ebc4618 Add these two options in as well. 2013-01-24 15:20:27 -05:00
Victor Shnayder
5fa8cf5a78 Only show cohort config for cohorted courses 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
64f820828e whitespace 2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
Victor Shnayder
ac8c59126d Add note about non-unique topic id across course runs bug 2013-01-24 15:12:53 -05:00
Victor Shnayder
0e78eaaf80 Add a course_groups djangoapp with a CourseUserGroup model. 2013-01-24 15:12:52 -05:00
Deena Wang
9663973038 more tests for courseware/views 2013-01-24 14:59:46 -05:00
Calen Pennington
592d044864 Fix more tests 2013-01-24 14:37:46 -05:00
Kevin Chugh
def2d8adf2 fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable 2013-01-24 14:20:18 -05:00
Calen Pennington
9a3e122a48 Fix a few failing tests 2013-01-24 14:04:03 -05:00
Ned Batchelder
ac9d162d86 Fix a failing test. Pennington's Law strikes again. 2013-01-24 13:07:55 -05:00
Brian Talbot
38e3d7371b drupal integration - added in right side copy to registration marketing requested 2013-01-24 12:46:35 -05:00
Deena Wang
d81b031624 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-01-24 10:05:04 -05:00
Deena Wang
61e12f57e7 experimenting with creating a course 2013-01-24 09:59:33 -05:00
Jay Zoldak
4d469fd9f7 Add test for jump_to. 2013-01-24 09:55:24 -05:00
Diana Huang
210cdf870e Updates to the mock peer grading service and new tests. 2013-01-24 09:41:24 -05:00
Diana Huang
dc3dd41aa7 Update tests to cover the peer grading service 2013-01-24 08:58:24 -05:00