cahrens
df09e99ad1
Create explicit Locations.
...
Part of STUD-1030
2013-12-12 14:37:00 -05:00
Don Mitchell
f4e69275ee
Use mongo indices for all queries
...
STUD-1039
2013-12-12 12:55:39 -05:00
Don Mitchell
985417fcf6
Auth converting to new course_id syntax
2013-12-12 12:35:23 -05:00
Christina Roberts
455a327bb7
Merge pull request #1925 from edx/christina/underscore
...
Fix missing _ import.
2013-12-12 07:42:02 -08:00
David Baumgold
cc31b5cce6
Fix another unbound underscore
2013-12-11 14:38:36 -05:00
cahrens
249aa8ef23
Fix missing _ import.
...
Fallout from #1792 .
2013-12-11 14:33:18 -05:00
cahrens
0b161998a1
Revert "Fix missing _ import."
...
This reverts commit 82d7da8253
2013-12-11 14:30:02 -05:00
cahrens
82d7da8253
Fix missing _ import.
...
Fallout from #1792 .
2013-12-11 14:29:22 -05:00
polesye
39e97225ff
Fix tests.
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
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
David Baumgold
28f22393bf
whitespace-only changes
2013-12-10 11:45:49 -05:00
Don Mitchell
7e4820af52
Reduce sql queries for groupname tests. (STUD-1039)
...
Conflicts:
cms/djangoapps/auth/authz.py
2013-12-10 11:17:23 -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
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
David Baumgold
b784979976
Merge pull request #1792 from edx/man2life-i18n-no-forums
...
i18n (no forums)
2013-12-09 11:28:18 -08: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
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
Adam Palay
11b635c00b
import GlobalStaff to legacy.py (LMS-1599)
2013-12-06 12:49:51 -05: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
d15391fdfa
Update factory_boy to 2.2.1
2013-12-05 15:50:49 -05: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
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
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
Александр
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
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
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
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
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
Jay Zoldak
341875bb18
Remove code related to Pearson Testing Centers
2013-11-26 17:04:19 -05:00
