Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 1de87f9112 Merge pull request #14213 from edx/beryl/mongocrazy Nimisha Asthagiri 2017-01-03 09:37:40 -05:00
  • 0d222b3ed4 Merge pull request #14203 from edx/saleem-latif/ENT-111 Saleem Latif 2016-12-30 11:35:39 +05:00
  • 6274758868 Merge pull request #14215 from edx/ziafazal/WL-755 Zia Fazal 2016-12-30 11:14:07 +05:00
  • 83bc318e37 Merge pull request #14235 from edx/sstudent/TNL-6214 sanfordstudent 2016-12-29 19:43:25 -05:00
  • 5fd94a6698 add verfication status and enrollment mode to user profile report for TNL-6214 Sanford Student 2016-12-29 08:14:59 -05:00
  • 99e6d53939 Preload definitions when collecting block structures Nimisha Asthagiri 2016-12-22 13:09:42 -05:00
  • df1bec4b98 Merge pull request #14214 from edx/aj/fix-grade-rescore Awais Jibran 2016-12-29 15:15:02 +05:00
  • 78790efdd8 Fix rescore TNL-6199 Awais Jibran 2016-12-23 15:23:02 +05:00
  • 9e5139dcb0 Merge pull request #14107 from edx/yro_flaky-bokchoy-test_progress_page Gregory Martin 2016-12-27 15:48:30 -05:00
  • 1ec9371f31 set wait for jquery decorator Gregory Martin 2016-12-05 15:50:36 -05:00
  • 47f7072ffe Merge pull request #14142 from edx/ECOM-6107-fix-error-handling-for-sr Anthony Mangano 2016-12-27 14:14:57 -05:00
  • 57f0999b3a improve screen reader support on logistration pages Anthony Mangano 2016-12-13 12:43:10 -05:00
  • 32eb016428 disable password reset button after click Zia Fazal 2016-12-27 11:39:56 +05:00
  • 82647ee8c0 Merge pull request #14212 from edx/ned/upgrade-drf-extensions Ned Batchelder 2016-12-23 17:30:47 -05:00
  • 5c5d5b789e Use DRF extensions 1.2.2 to fix test suite bug Ned Batchelder 2016-12-23 07:29:34 -05:00
  • eef4539355 Merge pull request #14153 from open-craft/jill/fix-insights-ccx-staff Jillian Vogel 2016-12-23 08:20:24 +10:30
  • 5c1f838dcb Give the bok choy server more time to start up Jesse Zoldak 2016-12-22 16:20:19 -05:00
  • 18e3e095d1 Merge pull request #14174 from edx/robrap/credo-hide-bookmarks-feature-in-lti-mode-3 Robert Raposa 2016-12-22 11:39:25 -05:00
  • 7774b7932b Merge pull request #14172 from edx/bjacobel/TNL-5770 Brian Jacobel 2016-12-22 10:28:07 -05:00
  • fc0577d081 Hide bookmarks link in the LTI mode Dmitry Viskov 2016-10-24 19:23:11 +03:00
  • f0aa24eff2 Merge pull request #14205 from cpennington/revert-14078 Calen Pennington 2016-12-22 09:44:10 -05:00
  • 47e21ca5b0 Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions" Calen Pennington 2016-12-22 09:29:33 -05:00
  • 562f35bc92 Merge pull request #14181 from edx/mdikan/add-utm-tracking-to-free-purchases mikedikan 2016-12-22 07:29:13 -05:00
  • 7daf1df96b Merge pull request #14202 from edx/TNL-6203-duplicate-button Attiya Ishaque 2016-12-22 17:22:48 +05:00
  • 8eb81ea585 TNL-6203 Fix Duplicate button in Studio if user language is changed. attiyaishaque 2016-12-22 11:18:30 +05:00
  • 80d85c4abf edx-enterprise version update for 'Added alphabetical ordering for catalog drop down ' Saleem Latif 2016-12-22 14:42:57 +05:00
  • 07c93a8ed5 Merge pull request #14140 from edx/mushtaq/video-upload-restrict Mushtaq Ali 2016-12-22 14:35:17 +05:00
  • 8f4cf6829a Adding support for UTM Tracking to apply to free purhases Mike Dikan 2016-12-20 18:55:28 -05:00
  • c3930956ca Remove flaky decorator from test, it's not flaky. Brian Jacobel 2016-12-19 14:07:49 -05:00
  • a56b30495d Merge pull request #14192 from edx/bjacobel/a11y-discussions-test-broken Brian Jacobel 2016-12-21 19:04:51 -05:00
  • 8493ff6028 Checks access using the CCX course key, Jillian Vogel 2016-12-15 18:29:02 +10:30
  • b3051ced35 Merge pull request #14195 from edx/cdyer/save-cl-data Cliff Dyer 2016-12-21 16:58:10 -05:00
  • 86975faa5f Skip this test until it can be fixed, in TNL-6215 Brian Jacobel 2016-12-21 12:31:56 -05:00
  • 4ead911f05 Merge pull request #14199 from cpennington/revert-wajeeha Calen Pennington 2016-12-21 16:23:31 -05:00
  • bd87061f1c Merge pull request #14196 from edx/release Calen Pennington 2016-12-21 16:17:40 -05:00
  • 147639ab85 Merge pull request #14197 from cpennington/fix-release-merge-conflict Calen Pennington 2016-12-21 16:16:52 -05:00
  • b90c21b138 Ensure selected blocks get saved into StudentModule when running transform phase Nimisha Asthagiri 2016-12-20 11:40:43 -05:00
  • 59daa1c022 Merge pull request #14189 from edx/yro_student-acct-timezone-fix Gregory Martin 2016-12-21 15:03:09 -05:00
  • a24ac5155b Merge remote-tracking branch 'edx/master' into release Calen Pennington 2016-12-21 15:01:46 -05:00
  • b34d110b15 Merge pull request #14193 from edx/release-candidate Calen Pennington 2016-12-21 14:57:35 -05:00
  • 3e0c8fb7ba Fix quality issues Calen Pennington 2016-12-21 14:20:36 -05:00
  • e6190c9911 Merge pull request #14190 from cpennington/revert-wajeeha Calen Pennington 2016-12-21 13:24:51 -05:00
  • 04115bfe43 Revert "Merge pull request #13235 from edx/jia/MA-2684" Calen Pennington 2016-12-21 13:21:47 -05:00
  • 7f942bfc49 Revert "Merge pull request #14177 from edx/naa/fix-marketing-pr" Calen Pennington 2016-12-21 13:19:59 -05:00
  • 07865ce087 Revert "Merge pull request #14187 from edx/jia/MA-3052" Calen Pennington 2016-12-21 13:19:54 -05:00
  • e860205e67 Merge pull request #14191 from edx/beryl/content_library_access sanfordstudent 2016-12-21 13:19:05 -05:00
  • d1d8d31bba Test retrieving subsection grade after losing access to block in subsection Nimisha Asthagiri 2016-12-20 11:40:43 -05:00
  • f7a0c1d901 Merge pull request #14187 from edx/jia/MA-3052 Calen Pennington 2016-12-21 10:42:45 -05:00
  • b5edd01812 MA-3052: avoid catalog integration for individual course when cached wajeeha-khalid 2016-12-21 19:25:34 +05:00
  • ce76e2c3f8 change variable name Gregory Martin 2016-12-21 10:24:55 -05:00
  • 74a666643c Merge pull request #14151 from edx/sstudent/TNL-6178 sanfordstudent 2016-12-21 09:26:28 -05:00
  • fc79fae565 Merge pull request #14089 from asadazam93/asadazam/tnl-5487-invalid-usage-key AsadAzam 2016-12-21 17:56:09 +05:00
  • 2c7941d1ef Prevent files larger than 5 GB Prevent file containig containing non-ascii or special characters in file name TNL-5855 TNL-5957 Mushtaq Ali 2016-12-13 14:57:36 +05:00
  • ff8c4a6eec Merge pull request #14178 from edx/yro_set-default-timezone-settings Gregory Martin 2016-12-20 20:58:35 -05:00
  • 909f35bbb6 add blankTitle option Gregory Martin 2016-12-20 13:36:21 -05:00
  • 8c0098812d Merge pull request #14078 from edx/yro_remove-datetimetext-functions Gregory Martin 2016-12-20 16:17:47 -05:00
  • 5b6e2dd5ee Merge pull request #14173 from edx/alisan/discussion-styles-fix-TNL-6187 alisan617 2016-12-20 15:57:47 -05:00
  • 30c84118e9 Merge pull request #14179 from edx/adam/fix-stringresponse-issue Adam 2016-12-20 15:37:05 -05:00
  • ac9b8fba5e context manager for course id in context Sanford Student 2016-12-14 16:04:16 -05:00
  • e28f42b11f discussion img upload dialog RTL and other clean-up alisan617 2016-12-19 16:53:12 -05:00
  • 9259156565 review response. J. Cliff Dyer 2016-12-20 14:00:47 -05:00
  • c4c5a8e8a9 Revert "tnl-4141 only whitespaces not allowed in answer and fixed the pep8 violation." Adam Palay 2016-12-20 13:34:28 -05:00
  • dec4034bc5 Merge pull request #14177 from edx/naa/fix-marketing-pr Nimisha Asthagiri 2016-12-20 13:02:57 -05:00
  • f24830918c Fix Enrollment database access in Marketing Course URL PR Nimisha Asthagiri 2016-12-20 12:03:03 -05:00
  • b0bf19a741 delete datetext functions, implement dateutils Gregory Martin 2016-11-30 11:30:21 -05:00
  • ef55cc4f5f Merge pull request #14176 from edx/ora_1_1_13_release Albert (AJ) St. Aubin 2016-12-20 10:33:31 -05:00
  • 872341ed0c ORA2 1.1.13 release Albert St. Aubin 2016-12-20 07:51:43 -05:00
  • 934dcce148 Merge pull request #14170 from edx/douglashall/session_cookie_domain_override Douglas Hall 2016-12-20 07:31:34 -05:00
  • 65f0420500 Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio Douglas Hall 2016-12-18 16:43:45 -05:00
  • 01f3233a50 Fix InvalidKeyError on render xblock asadazam93 2016-12-02 10:23:26 +00:00
  • 122aa55008 Merge pull request #14064 from edx/asadiqbal08/ENT-32-EC-branding Asad Iqbal 2016-12-20 11:45:51 +05:00
  • 99f73dfbb3 ENT-32 Show enterprise customer branding on Logistration. asadiqbal 2016-11-29 17:32:11 +05:00
  • aa3d6e8791 Merge pull request #14092 from edx/cdyer/validate-capa-xml Cliff Dyer 2016-12-19 12:03:19 -05:00
  • 12d8cc5021 Merge pull request #14171 from edx/feanil/add_more_docs Feanil Patel 2016-12-19 09:27:09 -05:00
  • b05282ac75 Add more docs to the monitoring requirements file. Feanil Patel 2016-12-19 09:24:02 -05:00
  • 6de2535ed3 Merge pull request #14158 from edx/release sanfordstudent 2016-12-16 11:25:01 -05:00
  • d3d3819fd0 Merge pull request #14161 from edx/andya/fix-discussion-ux-bugs Andy Armstrong 2016-12-16 11:18:26 -05:00
  • 467512abd7 Merge pull request #14159 from edx/high-contrast-sliders Ari Rizzitano 2016-12-16 11:09:40 -05:00
  • 1b06bdeec0 Merge pull request #14083 from edx/fix-unformatted-403 Ari Rizzitano 2016-12-16 11:08:19 -05:00
  • accbda34e2 Clean up discussion styling issues Andy Armstrong 2016-12-15 18:52:20 -05:00
  • b5b8175932 [video] add hidden borders to controls to support windows high contrast mode (AC-458) [video] add hidden borders to video controls for high contrast mode (AC-458) Ari Rizzitano 2016-12-15 14:51:01 -05:00
  • 311e6d7ffd [studio] fix unformatted html in connection error message (TNL-5818) display default error message for non-json responses (TNL-5818) Ari Rizzitano 2016-12-01 09:30:12 -05:00
  • 7d791ab932 Merge pull request #13590 from edx/mjevtic/SOL-2082 Marko Jevtić 2016-12-16 15:06:58 +01:00
  • 363a0c8d90 [SOL-2082] Add a value to SiteConfiguration to enable ecommerce Receipt Page usage Marko Jevtic 2016-09-28 13:25:18 +00:00
  • 024e2e4b33 Merge pull request #14045 from edx/afzaledx/WL-829_add_programs_to_courses_view_context Afzal Wali Naushahi 2016-12-16 16:43:47 +05:00
  • 0682618a57 fix docstring of tests jagonzalr 2016-12-16 08:26:16 +02:00
  • c9fb71c4a1 Add tests for context-sensitive Help button. cahrens 2016-12-15 16:42:06 -05:00
  • 22ce30039b Use new XMLString type for CAPA data field. J. Cliff Dyer 2016-12-02 11:20:18 -05:00
  • 9d545eca4c update_course_in_cache exception handler cleanup Eric Fischer 2016-12-15 14:35:42 -05:00
  • 2125a21f75 Merge pull request #14148 from edx/release-candidate sanfordstudent 2016-12-15 14:49:20 -05:00
  • c1cf4e7870 Merge pull request #14155 from edx/bjacobel/inline-discussion-redesign Brian Jacobel 2016-12-15 13:50:10 -05:00
  • fd9c26b11f Merge pull request #14152 from juananpe/honorbrowserlangs Gregory Martin 2016-12-15 12:07:52 -05:00
  • 15794b93cd Merge pull request #14138 from edx/alisan/new-post-discussion-TNL-6006 alisan617 2016-12-15 11:02:00 -05:00
  • 486dae94a2 Merge pull request #14154 from edx/ned/update-translations Ned Batchelder 2016-12-15 10:16:18 -05:00
  • 0e5f6c2e6f Fix bug on new post creation where we would try to hide an element that wasn't there Brian Jacobel 2016-12-15 10:04:48 -05:00
  • 41620e05f2 new discussion post form layout alisan617 2016-12-14 12:06:46 -05:00
  • e44e18592f Programs list conditionally added to the context of index and courses page. Afzal Wali 2016-11-23 16:14:19 +05:00
  • b56faaff34 Update translations (autogenerated message) Ned Batchelder 2016-12-15 12:40:38 +00:00
  • bde0f7b2a7 Merge pull request #13235 from edx/jia/MA-2684 wajeeha-khalid 2016-12-15 17:37:52 +05:00
  • 11356965b5 MA-2684: return correct marketing url for course about wajeeha-khalid 2016-08-11 11:43:15 +05:00