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
Mark Hoeber
62035c03c7
rn for 12/9/13
...
new file
2013-12-06 16:28:53 -05: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
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
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
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
Don Mitchell
b5691cd4d1
Upgrade pymongo usage from deprecated connection to client
...
LMS-1551
2013-12-06 10:47:06 -05:00
Mark Hoeber
faf5af1c7a
New Release Notes
...
Release notes in RST format
2013-12-06 09:52:28 -05:00
spearce
94b8f11cba
test
2013-12-06 09:33:28 -05:00
Mark Hoeber
5bf2f4b07b
New release notes project
...
added files for past dates
2013-12-05 16:40:00 -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
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
