Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 34c6415527 Use STUDIO_SHORT_NAME for Studio David Baumgold 2014-12-23 11:14:56 -05:00
• 0d874def09 Merge pull request #6350 from edx/jeskew/asset_md_contract_fix John Eskew 2014-12-23 11:11:05 -05:00
• cc0789a104 Merge pull request #6355 from edx/release Fred Smith 2014-12-23 08:32:58 -05:00
• 05ca4c4645 Merge pull request #6343 from jzoldak/zoldak/quiet-factory-debug-msgs Jesse Zoldak 2014-12-22 17:18:16 -05:00
• 1ad08cc303 Change contracts to allow user_id with type long(). Add tests. John Eskew 2014-12-22 15:21:37 -05:00
• de22ccd531 Merge pull request #6345 from edx/hotfix/third-party-auth-inactive-linked-fix Will Daly 2014-12-22 16:46:33 -05:00
• 8f6cb60c45 Merge pull request #6344 from jzoldak/zoldak/better-ff-msg Jesse Zoldak 2014-12-22 15:15:10 -05:00
• fe01291d34 Merge pull request #6333 from edx/will/pay-and-verify-js-tests Will Daly 2014-12-22 14:34:47 -05:00
• d3459be05a Add Jasmine tests for the payment/verification flow. Will Daly 2014-12-17 11:24:55 -05:00
• 30549bd7ad Send the user to the login page if registering with a linked but inactive account Will Daly 2014-12-22 09:39:16 -05:00
• 55d7125fd4 fix pylint errors in test.py Jesse Zoldak 2014-12-22 10:31:18 -05:00
• 16fe8478f2 Silence noisy factory loggers in lms unit tests Jesse Zoldak 2014-12-22 10:32:01 -05:00
• 9bd1f3a8d7 Merge pull request #6327 from edx/sanchez/logging-verified-split Stephen Sanchez 2014-12-22 10:49:29 -05:00
• cf83a3cc2c Merge pull request #6323 from edx/awais786/ECOM-759 Awais Qureshi 2014-12-22 20:39:35 +05:00
• 6198b90051 only display the count for coupon redemptions that actually went through to purchase completion Chris Dodge 2014-12-19 13:38:55 -05:00
• a7042ca31d Merge pull request #6319 from edx/hotfix/analytics-mobile-shim Fred Smith 2014-12-22 10:30:19 -05:00
• da1d0870a3 Improve the message to console for wrong FireFox version Jesse Zoldak 2014-12-22 10:15:49 -05:00
• 1fa1d357ee Merge pull request #6326 from edx/renzo/split-verification-dashboard-analytics Renzo Lucioni 2014-12-22 09:34:44 -05:00
• 9d9f0c2f75 ECOM-759 if course is none return 404 error code. Awais 2014-12-19 17:08:25 +05:00
• ccb5bfbc9a Merge pull request #6244 from wwj718/patch-1 Sarina Canelake 2014-12-19 17:41:00 -05:00
• 5ef2770391 Merge pull request #6329 from edx/dhm/bug_split_index Don Mitchell 2014-12-19 17:10:42 -05:00
• aeeb45cf57 Update virtual pageview event categories, general polish Renzo Lucioni 2014-12-19 11:58:48 -05:00
• 3d717a895a Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard Renzo Lucioni 2014-12-18 18:23:53 -05:00
• 33f62685a8 Adding a number of logging messages for verification process. stephensanchez 2014-12-19 17:19:19 +00:00
• e1035aa844 Fix get_courses to handle inflight changes more rigorously. Don Mitchell 2014-12-19 13:09:28 -05:00
• 5360d77b79 Refactor sock HTML to have text in Mako template David Baumgold 2014-12-19 14:20:14 -05:00
• 7366d2b1a2 Replace "edX Studio" with "{studio_name}" David Baumgold 2014-12-18 13:38:15 -05:00
• c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup Renzo Lucioni 2014-12-19 13:29:13 -05:00
• 251407d7d2 Merge pull request #6314 from edx/release Fred Smith 2014-12-19 13:23:22 -05:00
• 1cf5aa0c16 Merge pull request #6325 from cpennington/update-db-for-cms Calen Pennington 2014-12-19 13:18:59 -05:00
• ad7a67da2b Update segment.io shim for mobile event syntax change. Nimisha Asthagiri 2014-12-18 14:21:14 -05:00
• dbc6166f7e Merge pull request #6306 from edx/hotfix/2014-12-18 Adam 2014-12-19 12:34:06 -05:00
• 59eba9599d Merge pull request #6324 from edx/benp/remove-tddium Ben Patterson 2014-12-19 12:20:52 -05:00
• 519b0f5e14 Make paver update_db run against both LMS and Studio models Calen Pennington 2014-12-19 11:56:38 -05:00
• 526bc9637b Merge pull request #6231 from edx/adam/fix-unenroll-enroll-inst-dash Adam 2014-12-19 11:53:53 -05:00
• 84a2eeb812 Merge pull request #6209 from edx/plat/fix-pure-system Calen Pennington 2014-12-19 10:19:42 -05:00
• 106fba70cf Remove Solano artifacts, Solano-only logic. Ben Patterson 2014-12-19 10:13:00 -05:00
• 988785545e Merge pull request #6311 from edx/renzo/photo-submission-confirmation-email Renzo Lucioni 2014-12-19 09:51:54 -05:00
• 60bfb13b1a for tests change the default xml data dir to a place where it will get cleaned up Jesse Zoldak 2014-12-17 12:24:15 -05:00
• e653af4da2 Tender widget inavailability stops loading studio page Waqas Khalid 2014-12-18 21:01:23 +05:00
• 2faff29a21 Fix PureSystem so that runtime.publish() works for a pure XBlock. Brian Wilson 2014-12-09 22:50:52 -05:00
• 61ba910255 Add a test of pure xblock and xmodule event publishing Calen Pennington 2014-12-16 16:38:01 -05:00
• 368dbf2ed8 Merge pull request #6293 from edx/will/set-donation-amount Will Daly 2014-12-19 08:44:07 -05:00
• cff12eea1d Merge pull request #6317 from edx/hotfix/val-error Christopher Lee 2014-12-18 18:41:22 -05:00
• 1e4f890120 Send confirmation email on successful photo submission Renzo Lucioni 2014-12-18 13:57:49 -05:00
• 7bf8221b89 updated commit hash for VAL christopher lee 2014-12-18 17:04:19 -05:00
• 708fd87bb6 Merge pull request #6310 from edx/studio-translate-program-manager David Baumgold 2014-12-18 16:10:43 -05:00
• d73eca48ba Merge pull request #6296 from edx/dhm/studio_asides Don Mitchell 2014-12-18 15:41:58 -05:00
• 8e14c9f05d Merge pull request #6313 from cpennington/bok-choy-clean-mako Calen Pennington 2014-12-18 15:38:30 -05:00
• d49c82f9bd Add configuration to studio for asides Don Mitchell 2014-12-17 11:57:00 -05:00
• 3b8b6a33a7 Merge pull request #6307 from edx/benp/clean-analytics-init Ben Patterson 2014-12-18 14:39:23 -05:00
• 198e9c7c0e Do a better job translating "Program Manager" David Baumgold 2014-12-18 13:47:50 -05:00
• e88c00a25c Make bok_choy tests clean up test files before executing Calen Pennington 2014-12-18 14:08:20 -05:00
• f2293b9508 Quiet analytics.init stderr output for tests. Ben Patterson 2014-12-18 13:21:52 -05:00
• 0e58e7cb23 Merge pull request #6216 from edx/sanchez/cleanup-restful-layer Stephen Sanchez 2014-12-18 11:00:23 -05:00
• 22a18e350d Updating the design of the DRF views for enrollments. stephensanchez 2014-11-17 16:59:10 +00:00
• 7a227bb2b9 Merge pull request #6292 from edx/zoldak/default-xml-test-dir Jesse Zoldak 2014-12-18 09:45:04 -05:00
• ca8faf92cd Merge pull request #6294 from edx/renzo/split-verification-analytics Renzo Lucioni 2014-12-18 09:39:14 -05:00
• 90f32134f0 Update AUTHORS wwj718 2014-12-18 19:24:55 +08:00
• c1de1001a6 Merge pull request #6192 from edx/waheed/tnl920-fix-code-mirror-editor-view-height Waheed Ahmed 2014-12-18 14:28:31 +05:00
• 2ffe6032bf Fixed CodeMirror editor view height in studio. TNL-920 Waheed Ahmed 2014-12-09 16:22:57 +05:00
• cbfca0afe6 Update AUTHORS wwj718 2014-12-18 11:00:52 +08:00
• f733d1d8bd Merge pull request #6234 from edx/afzaledx/WL-172-order-history chrisndodge 2014-12-17 20:46:54 -05:00
• 66ab165594 Merge pull request #6291 from edx/hotfix/2014-12-17 Fred Smith 2014-12-17 17:08:30 -05:00
• f2e83bf57f Split payment/verification business intelligence analytics Renzo Lucioni 2014-12-16 17:28:30 -05:00
• 872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased Afzal Wali 2014-12-11 16:53:08 +05:00
• 4360a78142 Studio render XBlockAside views PLAT-280 Don Mitchell 2014-12-16 14:42:33 -05:00
• a07df1a645 Merge pull request #6202 from edx/dhm/xmlms_asides Don Mitchell 2014-12-17 15:42:16 -05:00
• 94f3596d21 Merge pull request #6288 from edx/zoldak/update-django-nose Jesse Zoldak 2014-12-17 15:40:31 -05:00
• 5109a862e0 Preserve the contribution amount specified on the track selection page. Will Daly 2014-12-17 11:58:52 -05:00
• de5e88561f Make XmlModuleStore handle asides PLAT-221 Don Mitchell 2014-12-09 15:56:54 -05:00
• 4d2df01d7d update ora version Adam Palay 2014-12-17 10:39:19 -05:00
• 208ee26c2f Added test for OpenAssessmentBlock mixin. TNL-1022 Waheed Ahmed 2014-12-17 20:01:35 +05:00
• 40aaf5de6d for tests change the default xml data dir to a place where it will get cleaned up Jesse Zoldak 2014-12-17 12:24:15 -05:00
• 128d763047 Merge pull request #6218 from edx/jarv/env-revision-override John Jarvis 2014-12-17 11:37:13 -05:00
• cb7f725d2d Merge pull request #6282 from edx/diana/kill-courseware-bi-events Diana Huang 2014-12-17 11:26:06 -05:00
• 18deda9342 Merge pull request #6270 from edx/diana/track-refunds Diana Huang 2014-12-17 10:44:53 -05:00
• df46e843c1 Merge pull request #6271 from edx/will/show-receipt-take-two Will Daly 2014-12-17 10:01:50 -05:00
• c7fde04433 Merge pull request #6067 from mlkwaqas/waqas/tnl107-changing-pages-not-reposition Waqas Khalid 2014-12-17 19:58:28 +05:00
• 8260bee9c3 Merge pull request #6266 from mitocw/fix_lti_callback Oleg Marshev 2014-12-17 16:53:48 +02:00
• e5a2742d6f Merge pull request #6275 from edx/zoldak/update-lettuce Jesse Zoldak 2014-12-17 09:34:13 -05:00
• 2df2f60a32 Update django-nose version Jesse Zoldak 2014-12-17 09:33:46 -05:00
• efbeb9212b Merge pull request #5993 from mlkwaqas/waqas/tnl752-discussion-id-should-be-unique Waqas Khalid 2014-12-17 18:25:36 +05:00
• daa1797fc4 OAuth signature should be verified against URL provided to the tool. Ivica Ceraj 2014-09-05 11:04:27 -04:00
• 0eab14a334 In user profile changing page should reposition window to top Waqas Khalid 2014-11-26 16:00:54 +05:00
• d9d8775757 Advanced settings discussion category ids should be unique. Waqas Khalid 2014-11-20 16:28:01 +05:00
• a643f6d806 Merge pull request #6229 from edx/waheed/tnl527-fix-unicode-error-for-non-utf8-transcript Waheed Ahmed 2014-12-17 14:48:19 +05:00
• d23e772dd0 Fixed unicode problem if transcript file is not UTF-8 encoded. TNL-527 Waheed Ahmed 2014-12-12 19:26:08 +05:00
• a268c91236 Hook up new payment/verification flow to dashboard, track selection page, and upgrade Renzo Lucioni 2014-12-15 10:26:26 -05:00
• 2ea2b8f674 Add JSON end-point for shoppingcart receipt information Will Daly 2014-12-15 14:30:45 -05:00
• 28fb3c8e69 Merge pull request #6180 from edx/jeskew/import_export_asset_xml_pt_2 John Eskew 2014-12-16 17:14:48 -05:00
• 402b8b1547 Merge pull request #6261 from edx/sanchez/add-activate-account Stephen Sanchez 2014-12-16 16:56:06 -05:00
• 26fd9d23e8 Remove Segment events from courseware. Diana Huang 2014-12-16 16:53:06 -05:00
• eb465b3034 Update to the latest lettuce and install from pypi Jesse Zoldak 2014-12-16 14:11:14 -05:00
• b518cfa0a0 Add wrapper class that enables storage of Mongo document id separately from dictionary of all asset metadata by asset type. John Eskew 2014-12-15 15:55:07 -05:00
• 94ea35d3be Export modulestore-stored asset metadata as XML to exported course. Import asset metadata XML into modulestore. Optimize importing many items of asset metadata by avoiding multiple round-trips to MongoDB. John Eskew 2014-12-08 12:53:22 -05:00
• e66cb05c03 Return empty values and log a warning instead of raising NotImplemented exceptions for XML modulestore asset metadata methods. John Eskew 2014-12-04 09:42:22 -05:00
• 96e22097b2 Add the activate account step to the verified workflow. stephensanchez 2014-12-12 19:57:06 +00:00
• 2341bf1d1b Merge pull request #6272 from edx/sanchez/change-skip-step-logic Stephen Sanchez 2014-12-16 15:38:30 -05:00
• f3c26c895e Add tracking for refunds. Diana Huang 2014-12-16 10:08:21 -05:00