Diana Huang
|
45baf013fe
|
Merge branch 'master' into drupal-new
|
2013-05-02 17:04:39 -04:00 |
|
Diana Huang
|
2df3fe9344
|
Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
|
2013-04-26 12:40:35 -04:00 |
|
Calen Pennington
|
621a935577
|
Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3
Allow course staff to masquerade as students in viewing courseware
|
2013-04-24 04:17:34 -07:00 |
|
John Jarvis
|
01e15c1e13
|
Merge branch 'master' into drupal-new
|
2013-04-23 18:11:40 -04:00 |
|
Your Name
|
068e02efd5
|
make unflag all permissions match javascript
|
2013-04-22 17:51:48 -04:00 |
|
Your Name
|
3f1d97b065
|
Merge branch 'master' into feature/kevin/flagging
|
2013-04-22 17:22:33 -04:00 |
|
Your Name
|
5e73e8f286
|
Merge branch 'master' of github.com:MITx/mitx
|
2013-04-22 17:22:24 -04:00 |
|
Your Name
|
30104979e7
|
fix downvoting url
|
2013-04-22 16:25:16 -04:00 |
|
Your Name
|
af1c411ddf
|
gentler url diff
|
2013-04-22 16:23:21 -04:00 |
|
Your Name
|
0bcef4ddb7
|
fix merge conflicts
|
2013-04-22 12:54:33 -04:00 |
|
Your Name
|
7994e1b344
|
pep8 fixes
|
2013-04-22 12:53:30 -04:00 |
|
chrisndodge
|
0eed587571
|
Merge pull request #1839 from MITx/feature/sef/pressreleases
Press Releases: generic matching rule instead of explicit lines in url.py
|
2013-04-22 07:01:36 -07:00 |
|
ichuang
|
977eb6530c
|
allow staff to toggle masquerade on info pages (otherwise can get
blocked from courseware pages, if course hasn't started yet)
|
2013-04-21 21:43:18 -04:00 |
|
Kevin Chugh
|
7bc75844b2
|
fix indentation
|
2013-04-21 06:24:23 -04:00 |
|
Kevin Chugh
|
e8c646142f
|
Merge branch 'master' into feature/kevin/flagging
|
2013-04-21 06:15:55 -04:00 |
|
Kevin Chugh
|
649578ea2f
|
unify flag moderator permissions
|
2013-04-21 06:15:23 -04:00 |
|
ichuang
|
f1a899ac1c
|
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3
|
2013-04-20 12:25:47 -04:00 |
|
ichuang
|
81621fbe3a
|
for staff masquerading as student be kind and don't 404 for inaccessible content
|
2013-04-20 12:12:25 -04:00 |
|
ichuang
|
6cbd353992
|
make masquerade work properly even if DISABLE_START_DATES true
|
2013-04-20 11:57:56 -04:00 |
|
Your Name
|
0a627bb5d9
|
update permissions for flagging
|
2013-04-19 17:40:13 -04:00 |
|
Jay Zoldak
|
be76f73107
|
Consolidate and upgrade factories
|
2013-04-18 15:11:10 -04:00 |
|
ichuang
|
0ffc399f7d
|
move masquerade call up, to make sure it is used for start date checks
|
2013-04-17 22:12:12 -04:00 |
|
Will Daly
|
b42c4dacf7
|
Added test for "radio" choicegroup
|
2013-04-17 15:32:39 -04:00 |
|
Calen Pennington
|
6c7c49e6bd
|
Fix pep8 violations
|
2013-04-17 11:07:58 -04:00 |
|
Calen Pennington
|
3cd414afbb
|
Merge pull request #1825 from MITx/fix/cale/gradebook
Fix/cale/gradebook
|
2013-04-17 07:37:02 -07:00 |
|
Calen Pennington
|
904ec5d88b
|
Shorten long line
|
2013-04-17 10:05:43 -04:00 |
|
Calen Pennington
|
856b50531c
|
Remove errant copy of test_download_csv.py
It was added to 2 different locations by mistake.
|
2013-04-17 10:04:40 -04:00 |
|
Vik Paruchuri
|
d82ac2b747
|
Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe
|
2013-04-16 13:45:46 -04:00 |
|
brianhw
|
976b71929d
|
Merge pull request #1845 from MITx/feature/brian/doc-html-text
add documentation for HTML textbook
|
2013-04-16 10:15:49 -07:00 |
|
Vik Paruchuri
|
701bdc55c0
|
Minor fixes
|
2013-04-16 11:55:54 -04:00 |
|
Calen Pennington
|
9f3bad672a
|
Move the license test over to CourseFactory
|
2013-04-16 11:40:05 -04:00 |
|
Calen Pennington
|
a06c1a4b57
|
Fix warnings to actually use correct format for string interpolation
|
2013-04-16 11:40:04 -04:00 |
|
Calen Pennington
|
6644b78819
|
Fix gradebook when using grade cutoffs other than A/B/C
|
2013-04-16 11:38:58 -04:00 |
|
Vik Paruchuri
|
0d4b9d26cf
|
Add in a test, rescale preview images
|
2013-04-16 10:51:23 -04:00 |
|
ichuang
|
5f74ccd1a0
|
use ENABLE_MASQUERADE in masquerade.py
|
2013-04-13 22:52:17 -04:00 |
|
ichuang
|
5ca0393e05
|
add test for masquerade
|
2013-04-13 22:47:49 -04:00 |
|
ichuang
|
1c2452e401
|
make is_masquerading_as_student work with Mock for tests
|
2013-04-13 22:47:34 -04:00 |
|
ichuang
|
857a6e0bd0
|
pylint masquerade fixes
|
2013-04-13 22:47:28 -04:00 |
|
ichuang
|
fdfc37e4e3
|
masquerade pep8
|
2013-04-13 22:47:21 -04:00 |
|
ichuang
|
af3e08e8c7
|
masquerade link in courseware/views.py
|
2013-04-13 22:47:15 -04:00 |
|
ichuang
|
168a3aadf6
|
masquerade - remove debug line, careful with ifs in course_nav.html
|
2013-04-13 22:46:55 -04:00 |
|
ichuang
|
fb0a23238a
|
allow staff to masquerade as student - works
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/course_navigation.html
|
2013-04-13 22:46:39 -04:00 |
|
ichuang
|
c905cc7416
|
add masquerade.py
|
2013-04-13 22:46:30 -04:00 |
|
Brian Wilson
|
2d9deaf38c
|
remove code for supporting anchor_id on html textbooks, since it doesn't work
|
2013-04-12 11:53:06 -04:00 |
|
Jay Zoldak
|
d8c186d3a1
|
fix pylint errors in test_login.py
|
2013-04-12 10:25:12 -04:00 |
|
Jay Zoldak
|
1cc6a0a60d
|
Fix pylint errors
|
2013-04-11 17:20:38 -04:00 |
|
Jay Zoldak
|
bb1134b8ee
|
Convert login tests to use factories
|
2013-04-11 16:54:16 -04:00 |
|
Brian Wilson
|
123cfa333f
|
add documentation for HTML textbook
|
2013-04-11 16:42:14 -04:00 |
|
Jay Zoldak
|
88852c4b26
|
pep8 and pylint cleanup of new files
|
2013-04-11 14:11:30 -04:00 |
|
Jay Zoldak
|
442141fa04
|
Create a mock comment service that will listen for HTTP requests on a port
|
2013-04-11 14:08:32 -04:00 |
|