polesye
2ea166313b
Fix comment.
2013-12-11 16:52:46 +02:00
polesye
e5f583294a
Address comments.
2013-12-11 13:28:34 +02:00
polesye
39e97225ff
Fix tests.
2013-12-11 13:28:33 +02:00
polesye
2e87b1a66f
BLD-543: Fix bug with reordering in Studio.
2013-12-11 13:28:33 +02:00
Julia Hansbrough
421f02518b
Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events
...
Events for entering verified flow & buying
2013-12-10 11:47:47 -08:00
David Baumgold
2bc4198760
Merge pull request #1853 from edx/db/update-comments
...
Updating comments and docs for MITx -> edX transition
2013-12-10 11:10:37 -08:00
Calen Pennington
80fd12b9aa
Merge pull request #1692 from cpennington/pure-xblock-handler-urls
...
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
2013-12-10 10:54:55 -08:00
Julia Hansbrough
2f9380c296
response to cr
2013-12-10 18:51:45 +00:00
Julia Hansbrough
5b5fa7c202
response to cr
2013-12-10 18:45:34 +00:00
David Baumgold
fb13bed947
Updating comments and docs for MITx -> edX transition
2013-12-10 13:21:18 -05:00
Calen Pennington
d937da8d47
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
...
[LMS-1613]
2013-12-10 12:04:18 -05:00
Greg Price
c84164510e
Merge pull request #1882 from edx/gprice/remove-moderator-toggle
...
Remove forum user profile moderator toggle button
2013-12-10 07:40:39 -08:00
Greg Price
8f9f3bb914
Merge pull request #1883 from edx/gprice/markdown-button-keypress
...
Activate Markdown editor buttons on keypress
2013-12-10 07:38:15 -08:00
Will Daly
9b4b3dfa12
Merge pull request #1903 from edx/will/fix-underscore-staff-grading
...
Add underscore to staff grading template
2013-12-10 06:29:46 -08:00
Will Daly
8374989c11
Add underscore to staff grading template
2013-12-09 23:55:29 +00:00
Sarina Canelake
874d7a02d6
Fix LTI acceptance tests
2013-12-09 18:28:41 -05:00
Sarina Canelake
b406ba0f83
Acceptance tests for grades download
...
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.
LMS-58
2013-12-09 18:28:41 -05:00
Sarina Canelake
c547ac7286
Fix bulk email acceptance test
2013-12-09 18:28:41 -05:00
Diana Huang
1ee6d151e2
Merge pull request #1894 from edx/diana/remove-extraneous-text
...
Remove extraneous refund text
2013-12-09 13:24:09 -08:00
David Baumgold
b784979976
Merge pull request #1792 from edx/man2life-i18n-no-forums
...
i18n (no forums)
2013-12-09 11:28:18 -08:00
Diana Huang
12a771e2f3
Remove extraneous refund text
...
Bug: LMS-1603
2013-12-09 11:29:10 -05:00
Greg Price
cec58f885b
Remove forum user profile moderator toggle button
...
This button has been broken for at least a year, so the code has
suffered from bit rot and should be reimplmemented if the feature is
necessary in the short term (which is unlikely since it has been broken
for so long).
2013-12-09 10:23:21 -05: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
Julia Hansbrough
3b9cd02bea
response to cr
2013-12-06 22:57:06 +00:00
Greg Price
b5eeef01a0
Activate Markdown editor buttons on keypress
...
The buttons now activate on pressing space or enter.
JIRA: FOR-66
2013-12-06 14:51:43 -05:00
Adam Palay
11b635c00b
import GlobalStaff to legacy.py (LMS-1599)
2013-12-06 12:49:51 -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
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
Julia Hansbrough
5aa1b231d1
Added segment.io tracking
2013-12-06 16:09:45 +00: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
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
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
Adam Palay
9d48bb0ef1
removes temporary error messages
2013-12-05 12:08:39 -05: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
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
Calen Pennington
b9926a2fd3
Add message explaining partial recovery
2013-12-04 16:42:57 -05:00
Александр
e96108629d
Fix LTI tests.
2013-12-04 15:55:47 -05:00
David Baumgold
e26fc08d2b
Update logging.getLogger() calls to use edx instead of mitx
2013-12-04 15:18:15 -05:00
