Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,566 Commits 1 Branch 0 Tags
db331b7fa9ee705b32a398d0052f880daaa2cbda
Commit Graph

27566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
db331b7fa9 Merge pull request #6382 from edx/zoldak/fix-master 
Revert "Better i18n for credit card charge failures"
 2014-12-26 12:41:50 -05:00
Jesse Zoldak
6122f9c9ee Revert "Better i18n for credit card charge failures" 
This reverts commit 619a5ea3eb.
 2014-12-26 09:10:01 -05:00
David Baumgold
619a5ea3eb Better i18n for credit card charge failures 2014-12-24 15:17:45 -05:00
chrisndodge
64fb434dbf Merge pull request #6330 from edx/cdodge/filter-unpurchased-coupons 
[WL-186] only display the count for coupon redemptions that actually went through...
 2014-12-24 13:22:49 -05:00
Christina Roberts
d97bf059bb Merge pull request #6366 from edx/christina/fix-editing-bug 
Revert #6192. It was causing a JS error on devstack.
 2014-12-23 17:04:57 -05:00
cahrens
6846e25bbb Revert #6192. It was causing a JS error on devstack. 
TNL-1070
 2014-12-23 16:13:45 -05:00
David Baumgold
fa6299cf61 Merge pull request #6309 from edx/db/edx-studio-as-format-string 
Replace "edX Studio" with "{studio_name}"
 2014-12-23 15:41:03 -05:00
David Baumgold
320941e850 Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME 2014-12-23 13:32:15 -05:00
David Baumgold
34c6415527 Use STUDIO_SHORT_NAME for Studio 
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
 2014-12-23 11:14:58 -05:00
John Eskew
0d874def09 Merge pull request #6350 from edx/jeskew/asset_md_contract_fix 
Change contracts to allow user_id with type long().
 2014-12-23 11:11:05 -05:00
Fred Smith
cc0789a104 Merge pull request #6355 from edx/release 
Release
 2014-12-23 08:32:58 -05:00
Jesse Zoldak
05ca4c4645 Merge pull request #6343 from jzoldak/zoldak/quiet-factory-debug-msgs 
Quiet factory debug msgs for troubleshooting failing lms unit tests
 2014-12-22 17:18:16 -05:00
John Eskew
1ad08cc303 Change contracts to allow user_id with type long(). Add tests. 2014-12-22 17:08:54 -05:00
Will Daly
de22ccd531 Merge pull request #6345 from edx/hotfix/third-party-auth-inactive-linked-fix 
Send the user to the login page if registering with a linked but inactiv...
 2014-12-22 16:46:33 -05:00
Jesse Zoldak
8f6cb60c45 Merge pull request #6344 from jzoldak/zoldak/better-ff-msg 
Improve the message to console for the wrong FireFox version
 2014-12-22 15:15:10 -05:00
Will Daly
fe01291d34 Merge pull request #6333 from edx/will/pay-and-verify-js-tests 
Jasmine tests for verification / payment; small bugfixes
 2014-12-22 14:34:47 -05:00
Will Daly
d3459be05a Add Jasmine tests for the payment/verification flow. 2014-12-22 13:25:49 -05:00
Will Daly
30549bd7ad Send the user to the login page if registering with a linked but inactive account 2014-12-22 13:23:29 -05:00
Jesse Zoldak
55d7125fd4 fix pylint errors in test.py 2014-12-22 13:07:41 -05:00
Jesse Zoldak
16fe8478f2 Silence noisy factory loggers in lms unit tests 2014-12-22 13:07:41 -05:00
Stephen Sanchez
9bd1f3a8d7 Merge pull request #6327 from edx/sanchez/logging-verified-split 
Adding a number of logging messages for verification process.
 2014-12-22 10:49:29 -05:00
Awais Qureshi
cf83a3cc2c Merge pull request #6323 from edx/awais786/ECOM-759 
ECOM-759  if course is none return 404 error code.
 2014-12-22 20:39:35 +05:00
Chris Dodge
6198b90051 only display the count for coupon redemptions that actually went through to purchase completion 2014-12-22 10:38:34 -05:00
Fred Smith
a7042ca31d Merge pull request #6319 from edx/hotfix/analytics-mobile-shim 
Update segment.io shim for mobile event syntax change.
 2014-12-22 10:30:19 -05:00
Jesse Zoldak
da1d0870a3 Improve the message to console for wrong FireFox version 2014-12-22 10:15:49 -05:00
Renzo Lucioni
1fa1d357ee Merge pull request #6326 from edx/renzo/split-verification-dashboard-analytics 
Split verification dashboard analytics
 2014-12-22 09:34:44 -05:00
Awais
9d9f0c2f75 ECOM-759 if course is none return 404 error code. 2014-12-22 14:48:32 +05:00
Sarina Canelake
ccb5bfbc9a Merge pull request #6244 from wwj718/patch-1 
variable name error
 2014-12-19 17:41:00 -05:00
Don Mitchell
5ef2770391 Merge pull request #6329 from edx/dhm/bug_split_index 
Fix get_courses to handle inflight changes
 2014-12-19 17:10:42 -05:00
Renzo Lucioni
aeeb45cf57 Update virtual pageview event categories, general polish 2014-12-19 17:03:14 -05:00
Renzo Lucioni
3d717a895a Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard 2014-12-19 17:03:14 -05:00
stephensanchez
33f62685a8 Adding a number of logging messages for verification process. 2014-12-19 20:43:49 +00:00
Don Mitchell
e1035aa844 Fix get_courses to handle inflight changes 
more rigorously.
 2014-12-19 15:27:23 -05:00
David Baumgold
5360d77b79 Refactor sock HTML to have text in Mako template 2014-12-19 14:20:14 -05:00
David Baumgold
7366d2b1a2 Replace "edX Studio" with "{studio_name}" 
For theming and internationalization
 2014-12-19 13:58:42 -05:00
Renzo Lucioni
c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup 
Hook up new payment and verification flow
 2014-12-19 13:29:13 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release 
Release
 2014-12-19 13:23:22 -05:00
Calen Pennington
1cf5aa0c16 Merge pull request #6325 from cpennington/update-db-for-cms 
Make paver update_db run against both LMS and Studio models
 2014-12-19 13:18:59 -05:00
Nimisha Asthagiri
ad7a67da2b Update segment.io shim for mobile event syntax change. 2014-12-19 12:39:39 -05:00
Adam
dbc6166f7e Merge pull request #6306 from edx/hotfix/2014-12-18 
Tender widget inavailability stops loading studio page
 2014-12-19 12:34:06 -05:00
Ben Patterson
59eba9599d Merge pull request #6324 from edx/benp/remove-tddium 
Remove Solano artifacts, Solano-only logic.
 2014-12-19 12:20:52 -05:00
Calen Pennington
519b0f5e14 Make paver update_db run against both LMS and Studio models 2014-12-19 11:56:38 -05:00
Adam
526bc9637b Merge pull request #6231 from edx/adam/fix-unenroll-enroll-inst-dash 
fix enrollment issue in instructor dash (ECOM-776)
 2014-12-19 11:53:53 -05:00
Calen Pennington
84a2eeb812 Merge pull request #6209 from edx/plat/fix-pure-system 
Fix PureSystem so that runtime.publish() works for a pure XBlock.
 2014-12-19 10:19:42 -05:00
Ben Patterson
106fba70cf Remove Solano artifacts, Solano-only logic. 2014-12-19 10:13:00 -05:00
Renzo Lucioni
988785545e Merge pull request #6311 from edx/renzo/photo-submission-confirmation-email 
Send confirmation email on successful photo submission
 2014-12-19 09:51:54 -05:00
Jesse Zoldak
60bfb13b1a for tests change the default xml data dir to a place where it will get cleaned up 2014-12-19 09:22:34 -05:00
Waqas Khalid
e653af4da2 Tender widget inavailability stops loading studio page 
When tender_widget.js is inavailable studio page stops
loading becuase of error in the requirejs. It is
dependency in the requirejs so when it doesn't load
it cause other dependencies to stop loading.

TNL-1018
 2014-12-19 09:22:34 -05:00
Brian Wilson
2faff29a21 Fix PureSystem so that runtime.publish() works for a pure XBlock. 
Fix extracted from https://github.com/edx/edx-platform/pull/6035.
 2014-12-19 09:00:32 -05:00
Calen Pennington
61ba910255 Add a test of pure xblock and xmodule event publishing 2014-12-19 08:55:42 -05:00