Diana Huang
12a771e2f3
Remove extraneous refund text
...
Bug: LMS-1603
2013-12-09 11:29:10 -05:00
Mark Hoeber
3f6997e616
Merge pull request #1892 from edx/sylvia/documentation/test
...
ORA documentation updates
2013-12-09 07:39:31 -08:00
Valera Rozuvan
3730eb3ba2
Merge pull request #1856 from edx/valera/fix_e_reader_error_new_page
...
Fix for BLD-465: e-reader error when popping out window.
2013-12-09 03:03:03 -08:00
Valera Rozuvan
9072b9cc5d
e-reader error when popping out window
...
Moving work on BLD-465 from PR 1811.
Fixing missing import clause in Python.
Addressing DB's comment.
BLD-465.
2013-12-09 10:38:57 +02:00
Don Mitchell
0684f6a40a
Merge pull request #1878 from edx/dhm/pymongo_client
...
Upgrade pymongo usage from deprecated connection to client
2013-12-06 13:14:28 -08:00
Will Daly
f7ffc1d25b
Merge pull request #1884 from edx/will/disable-js-course-overview-test
...
Disabled AJAX Errors Course Overview JS test
2013-12-06 12:49:40 -08:00
Don Mitchell
298e7a2343
Shorten collection name to keep index name w/in limit
2013-12-06 15:37:38 -05:00
Adam
8f990a09cc
Merge pull request #1881 from edx/adam/fix/instr-dash-500
...
import GlobalStaff to legacy.py (LMS-1599)
2013-12-06 11:04:40 -08:00
Will Daly
fa1acae80d
Disabled AJAX Errors Course Overview JS test
2013-12-06 13:55:49 -05:00
spearce
cb5afe9709
ORA documentation updates
...
Updated main ORA documentation based on several bugs; added new
student-facing ORA docs
2013-12-06 13:19:08 -05:00
Christina Roberts
95c86248bd
Merge pull request #1869 from edx/christina/export-error
...
On export error, handle quotes within string.
2013-12-06 09:54:25 -08:00
Adam Palay
11b635c00b
import GlobalStaff to legacy.py (LMS-1599)
2013-12-06 12:49:51 -05:00
cahrens
bbeded71ec
On export error, handle quotes within string.
...
STUD-1013
2013-12-06 12:02:02 -05:00
David Baumgold
03c8c0e1e7
Merge pull request #1880 from edx/db/mitx-edx-locmem
...
update LocMemCache location to use edx instead of mitx
2013-12-06 08:30:07 -08:00
David Baumgold
c436c6aa13
Merge pull request #1879 from edx/db/mitx-edx-sqlite
...
Change mitx.db to edx.db for dev sqlite
2013-12-06 08:29:17 -08:00
David Baumgold
1134b88415
update LocMemCache location to use edx instead of mitx
2013-12-06 11:22:26 -05:00
David Baumgold
2666b96976
Change mitx.db to edx.db for dev sqlite
2013-12-06 11:21:19 -05:00
Don Mitchell
b5691cd4d1
Upgrade pymongo usage from deprecated connection to client
...
LMS-1551
2013-12-06 10:47:06 -05:00
spearce
94b8f11cba
test
2013-12-06 09:33:28 -05:00
Don Mitchell
39f4cb806c
Merge pull request #1832 from edx/dhm/publish
...
SplitMongo publish method
2013-12-05 13:34:38 -08:00
David Baumgold
f747c762d8
Merge pull request #1772 from edx/db/locator-refactor-textbooks
...
Refactor textbooks to use locator URLs
2013-12-05 13:25:14 -08:00
David Baumgold
effee03bd7
Merge pull request #1867 from edx/db/update-factory-boy
...
Update factory_boy to 2.2.1
2013-12-05 13:22:22 -08:00
Don Mitchell
43789a9252
Fixed test to ensure deletion on publish
2013-12-05 16:15:19 -05:00
Don Mitchell
7a4204b72a
SplitMongo publish method
...
STUD-451
2013-12-05 16:15:19 -05:00
Ned Batchelder
2bc156cd69
Merge pull request #1865 from edx/ned/merge-hotfix-2013-12-04-to-master
...
The changes from hotfix/2013-12-04 that we want permanently
2013-12-05 13:11:18 -08:00
David Baumgold
d15391fdfa
Update factory_boy to 2.2.1
2013-12-05 15:50:49 -05:00
Ned Batchelder
1cbc171616
Merge master in prep for merging back the hotfix changes.
2013-12-05 15:48:49 -05:00
Ned Batchelder
be3ab1c5e9
Drop the temp table
2013-12-05 14:56:30 -05:00
Ned Batchelder
108e02e1ed
Remove the one-time-use managemant command.
2013-12-05 14:41:30 -05:00
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
David Baumgold
d8103d4377
course.save() is no longer necessary
2013-12-05 13:21:55 -05:00
David Baumgold
c93198235e
Pass PDF textbooks to template separately
2013-12-05 13:19:00 -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
David Baumgold
06f400191f
Use window.course instead of window.section
2013-12-05 13:17:39 -05:00
David Baumgold
0d3490374e
Refactor textbooks to use locator URLs
...
STUD-945
2013-12-05 13:13:28 -05: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 Palay
9d48bb0ef1
removes temporary error messages
2013-12-05 12:08:39 -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
Calen Pennington
72bb0f8cab
Merge pull request #1854 from cpennington/wording-fixes
...
modify partial recovery message
2013-12-04 18:35:39 -08:00
Adam Palay
a458b469d1
modify partial recovery message
2013-12-04 21:26:45 -05:00
Ned Batchelder
326d9dbeac
Merge pull request #1851 from edx/ned/merge-lti-hotfix
...
Ned/merge lti hotfix
2013-12-04 13:48:22 -08:00
Ned Batchelder
3118a5de1b
Merge pull request #1852 from cpennington/more-db-error-fixes
...
Add recovery command
2013-12-04 13:46:56 -08:00
Calen Pennington
b9926a2fd3
Add message explaining partial recovery
2013-12-04 16:42:57 -05: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
