John Jarvis
|
615e6da2f4
|
Minor update to embargo text
|
2013-01-29 16:47:09 -05:00 |
|
John Jarvis
|
3f740976bc
|
Adding dashboard text for certificate restriction
|
2013-01-29 13:24:17 -05:00 |
|
John Jarvis
|
a9ee71fffc
|
Adding section on eligibility
|
2013-01-29 11:26:55 -05:00 |
|
John Jarvis
|
3a6d45e716
|
Grade a student even if they are on the restricted list
|
2013-01-29 11:13:30 -05:00 |
|
John Jarvis
|
4b0999939b
|
Adding docstring to CertificateWhitelist model
|
2013-01-29 10:26:21 -05:00 |
|
John Jarvis
|
415ebec879
|
renaming whitelist to is_whitelisted
|
2013-01-29 10:24:29 -05:00 |
|
John Jarvis
|
dbc0f353c5
|
cert_status temporary assignment removed
|
2013-01-29 10:22:58 -05:00 |
|
John Jarvis
|
e9722b259b
|
Removing whitespace
|
2013-01-28 19:29:53 -05:00 |
|
John Jarvis
|
e81394c2b0
|
Adding new model for certificate whitelist
|
2013-01-28 19:29:13 -05:00 |
|
John Jarvis
|
666828f71a
|
Command for certificate whitelist
|
2013-01-28 19:28:47 -05:00 |
|
John Jarvis
|
7e033d0265
|
django command for certificate restriction
|
2013-01-28 19:28:24 -05:00 |
|
chrisndodge
|
163400e268
|
Merge pull request #1362 from MITx/feature/edz/revert-explicit-charset
Feature/edz/revert explicit charset
|
2013-01-27 15:29:54 -08: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 |
|
Victor Shnayder
|
00dd3ad9f8
|
Fix some of the test bugs. Still more to fix.
|
2013-01-25 15:40:13 -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 |
|
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 |
|
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 |
|
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 |
|
Brian Wilson
|
0cb5f101ae
|
add UTC time to registration end date
|
2013-01-24 01:18:10 -05:00 |
|
Kevin Chugh
|
1bd9366e40
|
Merge remote-tracking branch 'origin/master' into feature/kevin/groups
|
2013-01-23 16:26:06 -05:00 |
|
Kevin Chugh
|
59b3dc61a2
|
lms producing grouped content
|
2013-01-23 16:25:26 -05:00 |
|
Calen Pennington
|
ae2a8e0c58
|
Whitespace cleanup
|
2013-01-23 14:37:42 -05:00 |
|
Calen Pennington
|
6c181470c6
|
staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it
|
2013-01-23 14:37:36 -05:00 |
|
Don Mitchell
|
b0bbb34644
|
Merge pull request #1331 from MITx/feature/christina/tiny-mce
Feature/christina/tiny mce
|
2013-01-23 09:14:42 -08: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 |
|