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
85495bb5d1
Merge pull request #1864 from edx/adam/add-all-clear-message
...
add all clear message
2013-12-05 12:43:21 -08:00
Adam Palay
76c8a7a38d
add all clear message
2013-12-05 14:57:36 -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
Julia Hansbrough
2b7587d6a8
Added alternate upsell copy flag
...
For waffle / split testing purposes
2013-12-05 19:14:45 +00:00
Julia Hansbrough
83f42f5691
Response to CR
2013-12-05 19:14:45 +00:00
Julia Hansbrough
8c612ba975
Quick fix
2013-12-05 19:14:45 +00:00
Julia Hansbrough
f880bcb652
Response to CR
2013-12-05 19:14:45 +00:00
Julia Hansbrough
cc187a3183
Added refund datetime info to Orders, OrderItems
...
Finance would like to have info about the date any given refund is requested.
This commit adds a refund_requested_time field to OrderItem and a refund_time to Order.
When a user *requests* a refund, the refund_requested_time field on OrderItem is updated; when a user actually *receives* their refund, the refund_time on Order is updated.
Note that only the refund_requested_teim field is actually used right now; later on, when we're able to actually automate the process of actually giving users refunds, we will start usings Order's refund_time field.
2013-12-05 19:10:27 +00:00
Julia Hansbrough
e8196d9761
Events for entering verified flow & buying
2013-12-05 19:10:27 +00:00
David Baumgold
03d7d0e952
more i18n work
2013-12-05 14:03:02 -05: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
7e15b1025c
update npm package name to edx
2013-12-05 13:44:25 -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
Ned Batchelder
f1f0111648
Merge pull request #1860 from edx/hotfix/no-error-messages
...
removes temporary error messages
2013-12-05 10:01:18 -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 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
Calen Pennington
e561c1354d
Add managemant command to generate sql to clean up tp truncated student ids in ORA db
2013-12-04 16:18:40 -05:00
Adam Palay
4d506016e7
Add a backwards migration to delete the archive table
2013-12-04 16:07:43 -05: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
Александр
e96108629d
Fix LTI tests.
2013-12-04 15:55:47 -05:00
Александр
c4515faedf
Make has_score to be XField insted of decriptor property.
...
Conflicts:
common/lib/xmodule/xmodule/lti_module.py
2013-12-04 15:55:42 -05:00
polesye
e4403815e7
Fix LTI max_score method.
2013-12-04 15:54:51 -05: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
Ned Batchelder
c7ac4100ff
Merge pull request #1840 from edx/adam/db-error
...
Fixes to database columns
2013-12-04 12:07:07 -08:00
Julia Hansbrough
f06f333b8a
Added developer-specific settings to devstack
2013-12-04 20:06:55 +00:00
