Will Daly
09befd2a7f
Merge pull request #1757 from edx/will/static-url-double-slash
...
Static URL double-slash
2013-12-05 11:15:20 -08:00
Will Daly
e0fe8bcdc7
Removed extra trailing slash from STATIC_URL in devstack
...
Let staticfiles determine the footer URLs
2013-12-05 13:47:10 -05:00
Greg Price
3853c9265a
Merge pull request #1850 from edx/gprice/change-staff-forum-role
...
Change forum role granted to staff on enrollment
2013-12-05 10:17:39 -08:00
Greg Price
88610cb8fb
Change forum role granted to staff on enrollment
...
This applies to global staff (is_staff=True), not course staff.
Previously, staff were granted the Moderator role but not the Student
role upon enrolling in a course. If the Moderator role were later
revoked, then the user would have no role and be unable to post in the
forums, which is confusing for the user. edX staff indicated they would
prefer to not automatically receive the Moderator role, so the Student
role is granted instead. Note that staff will still be able to grant
themselves Moderator privileges through the instructor dashboard if
they wish.
JIRA: FOR-338
2013-12-05 12:54:12 -05:00
Adam
f7d86bfff5
Merge pull request #1814 from edx/adam/fix-ora-typo
...
fix typo in ORA template (ORA-136)
2013-12-05 07:37:52 -08:00
Sarina Canelake
2c2c238269
Merge pull request #1817 from edx/sarina/lms-197
...
Encode header row (LMS-197)
2013-12-05 07:20:02 -08:00
Julia Hansbrough
a040f3f66d
Merge pull request #1845 from edx/flowerhack/update-devstack-settings
...
Added developer-specific settings to devstack
2013-12-05 07:14:29 -08:00
Alexander Kryklia
bceadd4830
Merge pull request #1819 from edx/anton/fix-lti-scores
...
Fix LTI max_score method.
2013-12-05 02:40:19 -08:00
Anton Stupak
68e1985db1
Merge pull request #1807 from edx/anton/transcripts
...
Video Transcripts: Fix clear and download buttons.
2013-12-05 02:38:58 -08:00
polesye
b4f82b3837
BLD-438: Fix clear and download buttons.
2013-12-05 11:43:29 +02:00
David Baumgold
beda1f8bbf
Merge pull request #1846 from edx/db/update-logging
...
Update logging.getLogger() calls to use edx instead of mitx
2013-12-04 13:37:44 -08:00
David Baumgold
b33bb1a836
Merge pull request #1848 from edx/db/remove-deploy-rake
...
Removed unused rake tasks
2013-12-04 13:01:16 -08:00
David Baumgold
6baf195a4a
Removed unused rake tasks
2013-12-04 15:37:18 -05:00
David Baumgold
e26fc08d2b
Update logging.getLogger() calls to use edx instead of mitx
2013-12-04 15:18:15 -05:00
David Baumgold
bbcd8affa9
Merge pull request #1839 from edx/db/mitx-root-url
...
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:17:13 -08:00
Julia Hansbrough
f06f333b8a
Added developer-specific settings to devstack
2013-12-04 20:06:55 +00:00
Brian Talbot
1f056c37f0
Merge pull request #1777 from edx/talbs/studio-fix-tos
...
Studio: FIX - reinstating Terms of Service and Privacy Policy references
2013-12-04 11:50:09 -08:00
Mark Hoeber
7b82de53a7
Merge pull request #1835 from edx/documentation/new_studio_doc/12-04-13
...
Documentation/new studio doc/12 04 13
2013-12-04 10:29:32 -08:00
Ned Batchelder
e93e632017
Merge pull request #1825 from edx/ned/make-runone-work-with-more-test-output
...
Make runone work with more test output.
2013-12-04 10:14:13 -08:00
David Baumgold
b32f2bc170
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:59:35 -05:00
David Baumgold
1a585a88a9
Merge pull request #1833 from edx/db/mitx_markdown-edx_markdown
...
mitx_markdown => edx_markdown
2013-12-04 09:58:50 -08:00
Brian Talbot
d95b46dd19
Studio: adding back in links (and supporting styling) to ToS and Privacy Policy to footer and sign up UI
...
STUD-151
2013-12-04 12:03:25 -05:00
zubair-arbi
5347923304
Merge pull request #1829 from zubair-arbi/zub/bugfix/std1008-disablepeertrackchanges
...
Disable Peer Track Changes
2013-12-04 08:04:33 -08:00
Mark Hoeber
c63dbe87ea
Continued edits
...
Worked through Andy's list
2013-12-04 11:04:26 -05:00
Mark Hoeber
c495fdd3ae
Continued Editorial work
...
Continued Editorial work
2013-12-04 11:04:25 -05:00
Mark Hoeber
7c7bfc658c
adding images for ORA
2013-12-04 11:04:25 -05:00
Mark Hoeber
29b49ce10d
Editorial updates
...
update to checking student progress, create new course, index, open
response assessment
2013-12-04 11:04:25 -05:00
Mark Hoeber
89c2832e9e
New Updated Studio Documentation
...
New documentation from rewrite, audit, and integration of some
documentation from edx101. Intent to release by training on 12/5.
2013-12-04 11:04:25 -05:00
David Baumgold
6af8ecef03
mitx_markdown => edx_markdown
2013-12-04 10:23:47 -05:00
David Baumgold
d1f3e3a6b5
Merge pull request #1827 from edx/db/remove-mitx-from-features
...
settings.MITX_FEATURES => settings.FEATURES
2013-12-04 07:13:19 -08:00
Christina Roberts
2682a14d43
Merge pull request #1790 from edx/christina/transcripts
...
Change video transcripts to use locators instead of locations.
2013-12-04 06:41:44 -08:00
Zubair Afzal
5dba3fb47a
Disable Peer Track Changes
...
STUD-1008
2013-12-04 16:43:17 +05:00
Sarina Canelake
0426e51d06
Encode header row (LMS-197)
2013-12-03 18:10:13 -05:00
David Baumgold
79815acc6e
Fall back on MITX_FEATURES env variable if FEATURES isn't found
...
For a smoother transition to the new world
2013-12-03 16:29:48 -05:00
David Baumgold
f3f4af8087
settings.MITX_FEATURES => settings.FEATURES
2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df
Merge pull request #1823 from edx/db/mitxmako-edxmako
...
mitxmako => edxmako
2013-12-03 11:36:50 -08:00
Adam Palay
c812c5509a
fix typo in ORA template (ORA-136)
2013-12-03 14:35:20 -05:00
Ned Batchelder
e872c4f276
Merge pull request #1824 from edx/ned/show-full-diff-in-responsetype-tests
...
Show full diffs in ResponseType tests.
2013-12-03 11:34:19 -08:00
David Ormsbee
842355293d
Merge pull request #1816 from edx/ormsbee/grading_tests
...
Add basic tests of gradeset iteration.
2013-12-03 11:24:00 -08:00
David Ormsbee
f10df353d2
Add basic tests of gradeset iteration.
2013-12-03 14:23:12 -05:00
David Baumgold
8eff442752
mitxmako => edxmako
2013-12-03 14:15:09 -05:00
Ned Batchelder
149c3fd05f
Make runone work with more test output.
2013-12-03 14:13:54 -05:00
Ned Batchelder
599bdbb102
Show full diffs in ResponseType tests.
2013-12-03 14:05:33 -05:00
Ned Batchelder
c62abeddb7
Merge branch 'release'
2013-12-03 13:20:29 -05:00
polesye
e0f2ece2f2
Merge pull request #1820 from edx/anton/fix-lti-display-name
...
LTI: Add display name.
2013-12-03 09:36:30 -08:00
Александр
1cd9325ef5
Fix LTI tests.
2013-12-03 19:04:21 +02:00
Александр
932d13ede8
Make has_score to be XField insted of decriptor property.
2013-12-03 17:48:27 +02:00
polesye
41d82dfcc1
BLD-542: Add display name.
2013-12-03 17:21:04 +02:00
polesye
29e3a03db5
Merge pull request #1810 from edx/anton/fix-math-operations-in-numerical-input
...
Fix Numerical input to support mathematical operations.
2013-12-03 07:18:54 -08:00
brianhw
c8adbe3895
Merge pull request #1182 from carsongee/add_mitx_ssl_bypass_signup
...
Add feature to do auto signup with external auth
2013-12-03 07:03:43 -08:00
