Renzo Lucioni
52b6ef8978
Merge pull request #5976 from edx/hotfix-2014-11-17
...
disable "go to payment button" on click (ECOM-643)
2014-11-17 15:15:08 -05:00
Ben Patterson
4db5b31138
Don't use 'test' db for mysql since it's reserved.
...
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.
Conflicts:
scripts/reset-test-db.sh
2014-11-17 11:28:23 -05:00
Adam Palay
e7b23faa86
disable "go to payment button" on click (ECOM-643)
2014-11-17 10:38:44 -05:00
David Ormsbee
1a4ad061b1
Merge pull request #5928 from edx/diana/fix-pylint-complaint
...
Fix pylint violation.
2014-11-12 09:26:34 -05:00
Nimisha Asthagiri
3651f2c0e9
Merge pull request #5921 from edx/gprice/fix-oauth-token-login
...
Fix OAuth token login endpoint to set session user
2014-11-12 09:19:35 -05:00
Diana Huang
da5bfd45aa
Fix pylint violation.
2014-11-12 09:17:56 -05:00
chrisndodge
257b22e228
Merge pull request #5922 from edx/cdodge/fix-import-error
...
try importing the exact references we need rather than deferencing it fr...
2014-11-12 09:04:19 -05:00
Chris Dodge
a93faad78b
try importing the exact references we need rather than deferencing it from the djangoapp module
2014-11-11 21:49:13 -05:00
Greg Price
db8dd8de64
Fix OAuth token login endpoint to set session user
2014-11-10 18:06:25 -05:00
AlasdairSwan
790ac3f3ef
Merge pull request #5915 from edx/alasdair/rwd-trackselection
...
ECOM-574 Updated track selection page to be responsive
2014-11-10 16:41:50 -05:00
Greg Price
96b5637bef
Merge pull request #5911 from edx/gprice/login-oauth-csrf-exempt
...
Make OAuth token login endpoint CSRF exempt
2014-11-10 16:28:11 -05:00
chrisndodge
81c1ae35d8
Merge pull request #5903 from edx/cdodge/shoppingcart-isolation
...
harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTR...
2014-11-10 16:03:38 -05:00
AlasdairSwan
23081f076b
ECOM-574 Updated track selection page to be responsive
2014-11-10 15:39:17 -05:00
Greg Price
9270c7c77d
Make OAuth token login endpoint CSRF exempt
2014-11-10 15:20:35 -05:00
Chris Dodge
58b4982d2d
harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTRATION flag is not set (either via the main Django configuration settings) or through microsite overrides
2014-11-10 15:09:48 -05:00
Diana Huang
bd87a9dd29
Record processor response on both successful and
...
unsuccessful orders.
2014-11-10 14:36:12 -05:00
Adam
546d231cf0
Merge pull request #5904 from edx/adam/add-logging-multiple-purchases
...
add logging for orders when 'purchase' is called on them multiple times ...
2014-11-10 13:37:03 -05:00
Adam Palay
cc48800d54
add logging for orders when 'purchase' is called on them multiple times ECOM-630
2014-11-10 12:40:38 -05:00
Sarina Canelake
2f78b96778
Merge pull request #5897 from edx/sarina/20141110-update-translations
...
Update translations (autogenerated message)
2014-11-10 11:57:57 -05:00
Sarina Canelake
371805a8c3
Update translations (autogenerated message)
2014-11-10 10:52:34 -05:00
Usman Khalid
96b1a17b66
Merge pull request #5816 from edx/usman/plat71-mongo-autoreconnect-errors-2
...
Proxy to retry on mongo Autoreconnect errors.
2014-11-10 19:56:11 +05:00
chrisndodge
6df676b9b8
Merge pull request #5712 from edx/cdodge/change-shoppingcart-context-processor-to-be-microsite-aware
...
allow for overrides on ENABLE_PAID_COURSE_REIGSTRATIONS via mircosites
2014-11-10 09:08:16 -05:00
Sarina Canelake
0cedffc555
Merge pull request #5824 from edx/sarina/remove-unused-lms_static_images
...
Remove unused images from lms/static/images
2014-11-10 09:06:51 -05:00
Waheed Ahmed
57ce9aefcf
Merge pull request #5893 from edx/waheed/tnl765-fix-null-answer-in-checkbox-problem
...
Fixed null answer in checkbox problem as incorrect.
2014-11-10 19:03:00 +05:00
Waheed Ahmed
c397495eb9
Fixed null answer in checkbox problem as incorrect.
...
TNL-765
2014-11-10 18:41:26 +05:00
Waheed Ahmed
9688b868aa
Merge pull request #5861 from edx/waheed/tnl778-fix-youtube-stub-server
...
Fixed youtube stub server and removed unused variable.
2014-11-10 13:01:24 +05:00
Waheed Ahmed
3a71901f93
Fixed youtube stub server and removed unused variable.
...
TNL-778
2014-11-10 11:43:58 +05:00
Chris Dodge
3d955523d1
allow for overrides on ENABLE_PAID_COURSE_REIGSTRATIONS via mircosites
2014-11-09 21:05:45 -05:00
chrisndodge
c4a957c159
Merge pull request #5876 from edx/cdodge/catalog-visibility
...
Add new course_module field which describes what the catalog visibility ...
2014-11-09 21:02:49 -05:00
Chris Dodge
3c36f7cbad
Add new course_module field which describes what the catalog visibility should be (both, about, none)
2014-11-09 10:36:00 -05:00
Mark Hoeber
ec8d954f84
Merge pull request #5793 from edx/markhoeber-doc1160
...
WIP - Split Mongo Documentation
2014-11-07 19:38:22 -05:00
Mark Hoeber
3b84d60ce6
Split mongo overview documentation
2014-11-07 19:37:38 -05:00
Ned Batchelder
757e8f10e5
Merge pull request #5826 from edx/ned/no-which-dot-py
...
No need to use which on a .py file
2014-11-07 16:41:14 -05:00
Carlos Andrés Rocha
1b858e5497
Merge pull request #5749 from rocha/cache-oauth2-handler-course-values
...
Cache user course privileges during OpenID Connect authorization.
2014-11-07 14:38:09 -05:00
Adam
9a6acf2dff
Merge pull request #5837 from edx/adam/sandbox
...
change djfs settings not to throw an error when the app starts up
2014-11-07 13:49:53 -05:00
Sarina Canelake
efbf129ae7
Last references removed in 982d22df38
2014-11-07 12:57:37 -05:00
Sarina Canelake
691ab78c6b
Last references removed in dc60d107e9
2014-11-07 12:57:16 -05:00
Sarina Canelake
718e8012db
Rename homepage hero video thumbnail image
2014-11-07 11:18:50 -05:00
Sarina Canelake
6dde904f1b
Last reference removed in e1113d9ca9
2014-11-07 11:18:50 -05:00
Sarina Canelake
fefceca0a3
Last referenced in 186e5fc5e1
2014-11-07 11:18:50 -05:00
Sarina Canelake
8275bcb1a0
Last reference removed in 770ec2dbb3
2014-11-07 11:18:49 -05:00
Sarina Canelake
0551bc9092
Last references removed in b841591b0a
2014-11-07 11:18:49 -05:00
Sarina Canelake
a2f6d77ea6
Last reference removed in 2a1ddab224
2014-11-07 11:18:49 -05:00
Sarina Canelake
b432c18a3b
Last reference removed in 05b9e6cab2
2014-11-07 11:18:49 -05:00
Sarina Canelake
92c1efe85c
Last reference removed in 94886643b0
2014-11-07 11:18:49 -05:00
Sarina Canelake
20c13096ed
Last references removed in ab2995fc85
2014-11-07 11:18:49 -05:00
Sarina Canelake
d5ba04874e
Last references removed in ab2b7f344d
2014-11-07 11:18:49 -05:00
Sarina Canelake
1843dc4dda
Last references removed in 854621be60
2014-11-07 11:18:49 -05:00
Sarina Canelake
47e185d12b
Last reference removed in 1bc0b323b1
2014-11-07 11:18:48 -05:00
Sarina Canelake
6d415e484c
Last reference removed in 2bfe0cb92d
2014-11-07 11:18:48 -05:00
