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

Commit Graph

  • 7d33892284 Update testing.rst Utkarsh 2015-06-09 10:43:46 -04:00
  • 570c524b0e move lms edx notes tests to shard_4 Christine Lytwynec 2015-06-09 10:13:31 -04:00
  • 9643aca40e Use dicts when defining JSON David Baumgold 2015-06-09 10:02:58 -04:00
  • 00970a0f5a Update testing.rst Utkarsh 2015-06-09 10:02:49 -04:00
  • 0881cdf366 Updating account_settings_url for bulk emails. muzaffaryousaf 2015-06-09 19:02:42 +05:00
  • 3cd48e4d61 Merge pull request #8317 from edx/aj/plat643-cms-export-command-export-to-wrong-place Awais Jibran 2015-06-09 18:59:03 +05:00
  • b185a686d8 Removing course_title from email subject. muzaffaryousaf 2015-06-09 18:48:55 +05:00
  • 0003bf7aaf Merge pull request #8319 from edx/talbs/UX-2011-v4 Brian Talbot 2015-06-09 09:38:05 -04:00
  • e54ce29587 Fix flaky lettuce test. TE-572. Ben Patterson 2015-06-09 07:33:42 -04:00
  • b91287bfe3 Merge pull request #8425 from edx/gprice/discussion-api-parent-id Greg Price 2015-06-09 09:33:17 -04:00
  • 73ce054c54 Merge pull request #8415 from edx/clytwynec/re-enable_acid_block_tests Christine Lytwynec 2015-06-09 09:31:34 -04:00
  • ab46de59c2 Merge pull request #8407 from edx/awais786/ECOM-1644-course-access-roles Awais Qureshi 2015-06-09 18:23:03 +05:00
  • c4175c7dc6 Merge pull request #8363 from edx/ziafazal/SOL-861 Matt Drayer 2015-06-09 09:01:04 -04:00
  • fee8f6db64 Merge pull request #8037 from edx/aj/tnl2167-pause-vide-event-not-emitting-at-video-end Awais Jibran 2015-06-09 16:18:51 +05:00
  • 956e41348e ECOM-1644 Implementing course-access roles. Awais 2015-06-08 17:12:57 +05:00
  • 3e6670d1a4 PLAT-643 Fixed cms course export Awais Jibran 2015-06-02 17:51:42 +05:00
  • 0c7623d530 [LTI Provider] Fix bug preventing unenrolled users from accessing content Phil McGachey 2015-06-08 21:38:34 -04:00
  • 9a55497e72 Merge pull request #8417 from open-craft/badges-events-rename Kelketek 2015-06-08 20:45:33 -05:00
  • 33b7fbbbd4 UX-2011: adding print-based styles for Open edX web certs Brian Talbot 2015-05-26 23:20:48 -04:00
  • 2c7590d197 Use parent_id returned from the comments service Greg Price 2015-06-08 16:59:21 -04:00
  • 96a9a7e7cc Merge pull request #8355 from edx/clee/discussion_api_delete_thread Christopher Lee 2015-06-08 16:34:28 -04:00
  • 8ffe7c65e6 Merge pull request #8397 from edx/peter-fogg/category-subnavigation Peter Fogg 2015-06-08 16:32:41 -04:00
  • a5204310b1 Merge pull request #8267 from edx/clrux/UX-2078-error-heading-reduction Chris 2015-06-08 16:12:57 -04:00
  • cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab Diana Huang 2015-06-08 16:08:27 -04:00
  • 659c72a03e move bok choy studio split tests to shard_2 Christine Lytwynec 2015-06-08 15:53:34 -04:00
  • e31a78cbb7 move bok choy video license tests to shard_2 Christine Lytwynec 2015-06-08 15:51:13 -04:00
  • 2005734e1c move bok choy discussion tests to shard_2 Christine Lytwynec 2015-06-08 15:45:46 -04:00
  • 30884d192b Added delete thread in discussion api christopher lee 2015-06-03 18:02:03 -04:00
  • 6809d5e799 Merge pull request #8420 from edx/db/improve-openedx-readme David Baumgold 2015-06-08 15:20:22 -04:00
  • 7461a2fd37 Refactor and merge CourseViewType and CourseTab. Diana Huang 2015-06-04 11:55:42 -04:00
  • 3b34cb8407 Improve README for openedx directory David Baumgold 2015-06-08 15:11:54 -04:00
  • 17d3906c86 TNL-1891 Browse Teams: Category Subnavigation Peter Fogg 2015-06-04 15:25:43 -04:00
  • 402c3f329f Removing conflict from header Chris Rodriguez 2015-06-08 14:59:17 -04:00
  • 4fd1ebce1c Fixing test to match CSS Chris Rodriguez 2015-06-08 14:55:56 -04:00
  • a57cc930b6 add ccx-keys as a dependency of edx cewing 2015-05-28 19:38:25 -07:00
  • 424e1f5b3c ECOM-1572 implementing code to new branch. Awais 2015-06-03 15:16:03 +05:00
  • ada51a3b31 Tweaked names of badge events. Jonathan Piacenti 2015-06-08 18:07:51 +00:00
  • cdfc213c7d linda adding name to authors file tlindaliu 2015-06-08 13:44:59 -04:00
  • 77395bdf0d Merge pull request #8366 from edx/carol/doc/StudioTempl_Certs Carol Tong 2015-06-08 13:44:32 -04:00
  • e5a62aaaba Credit provider integration Python API Will Daly 2015-05-29 08:13:01 -04:00
  • de5e12d995 Merge pull request #8405 from edx/cdodge/feature-flag-course-search-on-courses-page chrisndodge 2015-06-08 13:12:16 -04:00
  • a7ebe17dfb Merge pull request #8414 from edx/jsa/fix-deactivate-enrollment Jim Abramson 2015-06-08 13:09:54 -04:00
  • e488896f2f Merge pull request #8409 from edx/dsego/SOL-875 Feanil Patel 2015-06-08 13:08:50 -04:00
  • 924bbe6b9f Update github.txt to use a tag instead of a commit Feanil Patel 2015-06-08 13:07:14 -04:00
  • d0f7a08cc4 Merge pull request #8408 from edx/release Adam 2015-06-08 11:00:20 -05:00
  • 7e19142b01 unskip acid xblock tests Christine Lytwynec 2015-06-08 11:53:46 -04:00
  • c9796b83a9 Merge pull request #8403 from edx/sarina/remove-redefine-django14-cors Sarina Canelake 2015-06-08 11:44:25 -04:00
  • 6aa7f810f3 DOC: Finalize Help targets, sidebar text for certificates Carol Tong 2015-06-04 11:28:16 -04:00
  • 688d62293b Merge pull request #8406 from antoviaque/badges-migration-fix Xavier Antoviaque 2015-06-08 17:26:21 +02:00
  • a02b242e5e Merge pull request #8413 from edx/diana/fix-allow-multiple Diana Huang 2015-06-08 11:09:55 -04:00
  • f4b2c197db don’t trigger a refund request in otto, if otto requested unenrollment. jsa 2015-06-05 15:45:17 -04:00
  • 445d0dabb6 Correct deactivation logic in enrollment api and test. jsa 2015-06-04 17:23:47 -04:00
  • a224d06a89 Allow multiple external_link tabs for one course. Diana Huang 2015-06-08 10:10:45 -04:00
  • 69799cc1e0 Merge pull request #8344 from cpennington/update-xblock-repo Calen Pennington 2015-06-08 09:56:42 -04:00
  • 5cc599af3f Bump edx-submissions hash to latest version. Sven Marnach 2015-06-08 15:48:18 +02:00
  • 40e89e6cb8 update edx-search commit reference Davorin Sego 2015-06-08 15:31:14 +02:00
  • 9e30bdb2c7 (SOL-835) Addressing flakiness of the reindex acceptance test Marko Jevtic 2015-06-03 14:16:16 +02:00
  • e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag Chris Dodge 2015-06-07 17:43:10 -04:00
  • b32629d62f Default to filestorage when S3 isn't configured (aws.py) Xavier Antoviaque 2015-06-08 08:14:46 +02:00
  • 20800ea561 refactored code to make certificate PDF generation optional Zia Fazal 2015-06-03 19:41:04 +05:00
  • fd737d4dce Merge pull request #8385 from edx/asadiqbal08/SOL-961 Matt Drayer 2015-06-07 21:45:18 -04:00
  • 6f0606a00b asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button asadiqbal 2015-06-05 18:29:17 +05:00
  • f37fdaf47d Merge pull request #8386 from edx/benp/lint-fix-test_import_export Ben Patterson 2015-06-07 17:13:16 -04:00
  • dc4b4f9022 Merge pull request #8404 from edx/benp/skip-settings-test-jun2015 Ben Patterson 2015-06-07 13:32:04 -04:00
  • 82f7238f9d Merge pull request #8398 from edx/jibsheet/release-script-updates Kevin Falcone 2015-06-07 11:45:02 -04:00
  • d3f7bdc1e8 Skip test that has become too flaky. SOL-449. Ben Patterson 2015-06-07 10:43:53 -04:00
  • 96c09f6bc0 Merge pull request #8378 from edx/mattdrayer/SOL-947 Matt Drayer 2015-06-07 07:45:10 -04:00
  • 3e52b8fad1 mattdrayer/SOL-947: Refactor Web/HTML certificate URL patterns Matt Drayer 2015-06-04 15:31:16 -04:00
  • c8b8717944 Merge pull request #8399 from open-craft/fix-badging-name Kelketek 2015-06-06 09:31:02 -05:00
  • 780ec6ee2c Allow released languages to be previewed under dark lang Sarina Canelake 2015-06-05 10:11:04 -04:00
  • eba951fe69 Fix self-paced badge naming. Jonathan Piacenti 2015-06-05 15:59:11 -05:00
  • e53b9c83d9 Use Django 1.4 @ensure_csrf_cookie method PLAT-664 Sarina Canelake 2015-06-06 00:42:59 -04:00
  • c5dc84f891 Merge pull request #8394 from edx/gprice/discussion-api-vote-thread Greg Price 2015-06-05 23:12:41 -04:00
  • 6b40a6e2ab Merge pull request #8393 from edx/sylvia/docs/ECommerceTabUI chrisndodge 2015-06-05 21:52:50 -04:00
  • 37ebbc45e3 Add thread voting to discussion API Greg Price 2015-06-02 22:26:36 -04:00
  • f91764abbe Merge pull request #8390 from edx/hotfix/2015-06-05 Adam 2015-06-05 15:15:45 -04:00
  • 53e2f2ee13 Merge pull request #8392 from edx/sarina/20150605-update-translations Sarina Canelake 2015-06-05 14:43:38 -04:00
  • 6c2df96c5f Merge pull request #8372 from edx/gprice/discussion-api-follow-thread Greg Price 2015-06-05 14:12:29 -04:00
  • eabc4c2488 Change name of section from Sales to Course Seat Purchases Sylvia Pearce 2015-06-05 14:00:46 -04:00
  • ef5cd63cf2 Merge pull request #8345 from edx/adam/time-imports Adam 2015-06-05 13:52:55 -04:00
  • c64567045a Update translations (autogenerated message) Sarina Canelake 2015-06-05 13:52:52 -04:00
  • f9fe00ff6c Fixed youtube video was not loading even youtube is available. TNL-2361 Waheed Ahmed 2015-06-05 21:41:42 +05:00
  • 9ff8749716 Add ability to follow a thread in discussion API Greg Price 2015-06-02 21:50:44 -04:00
  • 65bcc50e9b Merge pull request #8240 from edx/mobile/render_xblock Nimisha Asthagiri 2015-06-05 12:13:05 -04:00
  • d240785b17 MA-722 Render xBlock API Support Nimisha Asthagiri 2015-05-27 11:48:53 -04:00
  • b7f8bd3c80 Follow imports order guidelines. Ben Patterson 2015-06-05 09:43:47 -04:00
  • 8d1651cc19 Merge pull request #8381 from edx/benp/flaky-milestones-jun2015 Ben Patterson 2015-06-05 09:16:42 -04:00
  • 03c0159029 Merge pull request #8368 from edx/benp/flag-flaky-import-export Ben Patterson 2015-06-05 09:15:46 -04:00
  • c820ae146a Merge pull request #8374 from edx/alasdair/ECOM-1684-new-footer-style-updates AlasdairSwan 2015-06-05 08:05:29 -04:00
  • db36c4439d Merge pull request #8230 from edx/ahsan/ECOM-1555-Set-up-Credit-Provider-model Ahsan Ulhaq 2015-06-05 14:27:15 +05:00
  • 5f74a1406e Set up Credit Provider Model Ahsan Ulhaq 2015-05-28 17:00:35 +05:00
  • 4a24363c33 www.stage.edx.org is our Drupal site Kevin Falcone 2015-06-04 22:28:35 -04:00
  • 60b73b48aa Merge pull request #8361 from edx/asadiqbal08/SOL-946 Matt Drayer 2015-06-04 21:11:12 -04:00
  • dc5f650338 Merge pull request #8371 from edx/mattdrayer/SOL-953 Matt Drayer 2015-06-04 21:10:52 -04:00
  • ec088193e4 Merge pull request #8376 from edx/release Greg Price 2015-06-04 21:03:02 -04:00
  • 4e39799f49 Flag test as flaky. SOL-449 Ben Patterson 2015-06-04 19:24:42 -04:00
  • 8e37e68c3f Flag test as flaky. TNL-2386 Ben Patterson 2015-06-04 12:08:29 -04:00
  • d4b99561d1 Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM srpearce 2015-06-04 17:35:03 -04:00
  • 803a73fdad mattdrayer/SOL-953: Remove Mako UNDEFINED overrides Matt Drayer 2015-06-04 13:22:25 -04:00
  • 815e408055 asadiqbal08/SOL-946: Remove default value for course title override asadiqbal 2015-06-04 16:37:18 +05:00