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
Calen Pennington
f252c62f31
Enable test colors in nosetests
...
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
2013-04-17 09:58:52 -04:00
brianhw
91d84c0208
Merge pull request #1863 from MITx/fix/brian/jobs-20130410
...
Update with 2013-04-10 changes
2013-04-16 12:56:58 -07:00
Brian Wilson
7f90e31709
Update with 2013-04-10 changes
2013-04-16 15:43:14 -04:00
Carlos Andrés Rocha
a947f620a0
Merge pull request #1861 from MITx/fix/btalbot/stanford-logo
...
fixing the visual display of the stanford logo
2013-04-16 11:50:43 -07:00
Brian Talbot
b417651cf1
fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off)
2013-04-16 14:47:26 -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
d7796f4d47
Put test database into test_root
2013-04-16 11:40:04 -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
5f4004c5ad
Clean up whitespace
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
Vik Paruchuri
9acc592279
Comments for hotkeys
2013-04-16 10:23:08 -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
fac9d758d8
fix typo in masquerade url name
2013-04-13 22:47:43 -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
3b4093ab7b
url and mitx_settings for masquerade
2013-04-13 22:47:04 -04:00
ichuang
168a3aadf6
masquerade - remove debug line, careful with ifs in course_nav.html
2013-04-13 22:46:55 -04:00
ichuang
ffb125f8a9
course_navigation for masquerade
2013-04-13 22:46:48 -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
marco
15de4120ac
blankslate edited, header bar now with home button
2013-04-11 23:20:49 -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
Chris Dodge
e0bc823365
remove auto-provisioning because of a dependency problem between cms and lms
2013-04-11 10:42:03 -04:00
Vik Paruchuri
9f04769c00
Better confirmation for flagging
2013-04-10 16:16:13 -04:00
Vik Paruchuri
a64d57ae1d
Add popup when flag box is checked
2013-04-10 16:01:56 -04:00
Vik Paruchuri
d0ecbbb4cf
Fix hotkeys in peer and staff grading to use ctrl prefix
2013-04-10 15:10:48 -04:00
John Jarvis
54e5e3d31f
Adding the EDX_MKTG feature flag and links back to the marketing site
2013-04-10 14:29:55 -04:00
Brian Talbot
22a56fddb4
edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed
2013-04-10 13:38:25 -04:00
Brian Talbot
b5ec11afa0
edx.org - adding in more UI status when processing login/register forms
2013-04-10 11:26:00 -04:00
Chris Dodge
07b9d6353e
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
2013-04-10 09:26:51 -04:00
Sef Kloninger
bd2330a8f0
press releases: more explicitly match on slug (safety)
2013-04-10 08:20:30 -04:00
Sef Kloninger
bcdc6db4a9
press releases: fix stanford announcement in rss feed
2013-04-10 02:26:43 -04:00
Sef Kloninger
4b68e0282f
press releases: use generic matching rule
...
This way instead of having to explicitly add releases to the urls.py
file, we just add the relase to the static_templates/press_releases
directory and the right thing happens.
Getting rid of the current "feature" where /pressrelease redirects to
the current press release. It was broken, looks like it's unused.
Limitation: release file name must match slug, but with underscores and
all lower case.
Why bother? I wanted to do something small to learn the edX toolchain.
2013-04-10 02:16:35 -04:00
Sef Kloninger
f57028b8e8
press releases: standardize template names (move 2)
2013-04-10 01:23:32 -04:00
Sef Kloninger
b118b73143
press releases: standardize template names (move 1)
2013-04-10 01:19:20 -04:00
