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
Ned Batchelder
488923fd5c
Add a test for Django-based file uploads to problems.
2013-12-07 19:53:23 -05: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
Ned Batchelder
faa8f16fff
Merge pull request #1877 from edx/ned/hotfix-2013-12-04-with-temp-stuff-removed
...
Update 12/3 RC branch with the part of the hotfix we want permanently.
2013-12-06 07:49:46 -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
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
Adam Palay
76c8a7a38d
add all clear message
2013-12-05 14:57:36 -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
Julia Hansbrough
f06f333b8a
Added developer-specific settings to devstack
2013-12-04 20:06:55 +00:00
Adam Palay
175e1aab9e
adds more temporary error messages
2013-12-04 14:30:09 -05:00
Adam Palay
eb23b65992
add temporary error message for ORA panel
2013-12-04 14:10:47 -05:00
David Baumgold
b32f2bc170
MITX_ROOT_URL => EDX_ROOT_URL
2013-12-04 12:59:35 -05:00
David Baumgold
6af8ecef03
mitx_markdown => edx_markdown
2013-12-04 10:23:47 -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
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
Александр
1cd9325ef5
Fix LTI tests.
2013-12-03 19:04:21 +02:00
Greg Price
62a25824df
Merge pull request #1765 from edx/gprice/inline-discussion-a11y
...
Improve accessibility of inline discussions
2013-12-02 15:12:19 -08:00
polesye
0dbb7603fb
BLD-533: Improve calculator's tooltip accessibility.
2013-12-02 09:56:24 +02:00
Ned Batchelder
c8a7b259ff
Resolve conflicts merging master to rc/2013-11-21
2013-11-27 11:55:44 -05:00
Julia Hansbrough
30cd57f539
New migrations file
2013-11-27 15:16:25 +00:00
Julia Hansbrough
280e3c3856
Merge conflicts
2013-11-27 14:43:16 +00:00
vagrant
006b8f8298
Removed old migration
2013-11-27 14:38:59 +00:00
