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

Commit Graph

  • d6dab577a8 Merge pull request #9202 from edx/waheed/plat776-fix-course-id-regex Waheed Ahmed 2015-08-11 15:56:19 +05:00
  • 1ba82819bc Merge pull request #9208 from open-craft/smarnach/course-masquerade-session-fix Sven Marnach 2015-08-11 11:41:03 +02:00
  • 55ace6baa8 Make new masquerading code compatible to existing session data. Sven Marnach 2015-08-04 12:43:10 +02:00
  • 5e2c2b1e93 Fixed course_id pattern regex. PLAT-776 Waheed Ahmed 2015-08-05 18:37:54 +05:00
  • 9f58f656de Merge pull request #9261 from edx/peter-fogg/test-rc-fix Peter Fogg 2015-08-10 22:08:42 -04:00
  • a6891609be Test Cale's RC fix. Peter Fogg 2015-08-10 19:36:32 -04:00
  • 891dab621f Merge pull request #9141 from Stanford-Online/aliang8/devstack-https Kevin Falcone 2015-08-10 17:29:05 -04:00
  • 2632fd7ecd Show vaguer error message if using default start date Akiva Leffert 2015-08-10 17:26:36 -04:00
  • 25537da0c4 Merge pull request #9256 from cpennington/fix-user-state-client Peter Fogg 2015-08-10 16:59:38 -04:00
  • 026c7edf32 Merge pull request #9252 from edx/no-studio-short-name-in-lms David Baumgold 2015-08-10 15:39:53 -04:00
  • 584453202f Use the correct attribute when accessing StudentModuleHistory creation dates Calen Pennington 2015-08-10 14:43:44 -04:00
  • 34892b9680 Add more information when logging data about differing history and score entries Calen Pennington 2015-08-10 14:42:37 -04:00
  • 93b1b69854 Don't violate the empty-dict vs None semantics of student_module during delete_many Calen Pennington 2015-08-10 14:42:18 -04:00
  • 7e1de6ef2d Merge pull request #9090 from edx/kyle/course-overviews-race-fix Nimisha Asthagiri 2015-08-10 14:29:41 -04:00
  • d502987c5f Merge pull request #9253 from edx/studio-short-name-bugfix David Baumgold 2015-08-10 13:38:28 -04:00
  • 86ad26e960 Merge pull request #9254 from edx/ned/update-staticfiles Ned Batchelder 2015-08-10 13:06:22 -04:00
  • cea274dc52 Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit Diana Huang 2015-08-10 13:04:30 -04:00
  • ba8fd8f082 Update the version of django-staticfiles Ned Batchelder 2015-08-10 11:54:13 -04:00
  • 02cf9caca6 Merge pull request #8958 from edx/mattdrayer/SOL-981 Matt Drayer 2015-08-10 11:51:36 -04:00
  • c940814c8c OSPR-535 Partial Credit Colin-Fredericks 2015-06-30 12:06:43 -04:00
  • 5953debee1 settings.STUDIO_SHORT_NAME doesn't exist in LMS David Baumgold 2015-08-10 10:40:40 -04:00
  • 8daf2a7854 settings.STUDIO_SHORT_NAME doesn't exist in LMS David Baumgold 2015-08-10 10:40:40 -04:00
  • e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application Matt Drayer 2015-07-16 12:20:03 -04:00
  • 4e9b7ea9ec Merge pull request #9235 from edx/christina/tnl-1776 Christina Roberts 2015-08-10 10:08:52 -04:00
  • 7da0864997 Merge pull request #9110 from edx/dsego/SOL-611 Davorin Šego 2015-08-10 15:50:07 +02:00
  • f4aa92f0aa Merge pull request #9229 from edx/mushtaq/tnl-2882-fix-ie10-group-config-bug Mushtaq Ali 2015-08-10 17:48:59 +05:00
  • 96779dfe52 Merge pull request #9214 from edx/tasawer/bugfix/ecom-1987-fixing-validation-error-in-minimum-grade tasawernawaz 2015-08-10 12:41:18 +05:00
  • cb678b9c35 Merge pull request #8979 from mitocw/feature/cg/lti_provider_config Carson Gee 2015-08-09 09:10:14 -04:00
  • 0d730f373f Merge pull request #9239 from edx/andya/lms-performance-fixes Andy Armstrong 2015-08-08 12:44:56 -04:00
  • 420696ba80 Separate out the Backbone image field Andy Armstrong 2015-08-07 15:00:49 -04:00
  • 42e78463a7 Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment" Peter Fogg 2015-08-07 16:59:56 -04:00
  • 440c1575e0 Revert "Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model" Peter Fogg 2015-08-07 16:59:50 -04:00
  • 99dea49d15 Merge pull request #9243 from stvstnfrd/upstream-branding Sarina Canelake 2015-08-07 16:51:11 -04:00
  • c1d9f731a1 Merge pull request #9242 from edx/sarina/update-i18n-tools Sarina Canelake 2015-08-07 16:49:01 -04:00
  • d7c87221da Remove Stanford branding from external_auth view stv 2015-08-07 12:30:15 -07:00
  • 7d0cde60f4 Update i18n-tools [LOC-88] Sarina Canelake 2015-08-07 15:45:06 -04:00
  • d80e83649a Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model Peter Fogg 2015-08-07 15:44:12 -04:00
  • 235c45f1fb Add the CcxMembership model back Brandon DeRosier 2015-08-07 15:31:59 -04:00
  • fb5506a6f7 Merge pull request #9238 from edx/renzo/info-logging Clinton Blackburn 2015-08-07 15:29:31 -04:00
  • 3efbc369dd Merge pull request #9236 from edx/ahsan/Update-reverification-block Ahsan Ulhaq 2015-08-07 23:26:34 +05:00
  • 3a735591d1 Emit INFO-level messages when a mode does not have a SKU Renzo Lucioni 2015-08-07 14:11:42 -04:00
  • ac9a291778 Update edx reverification block on plateform Ahsan Ulhaq 2015-08-07 22:30:15 +05:00
  • 2b57603436 Handle case of video in a content library with no transcripts. cahrens 2015-08-07 13:19:12 -04:00
  • 9c58489b38 Merge pull request #9223 from edx/peter-fogg/discussion-admin-delete Peter Fogg 2015-08-07 11:03:50 -04:00
  • e09f9ac434 Merge pull request #9230 from edx/sarina/20150807-update-translations Sarina Canelake 2015-08-07 10:35:34 -04:00
  • e845dda8b0 Enable teams and deprecate the advanced setting Andy Armstrong 2015-08-06 11:56:17 -04:00
  • dbe74ea340 Merge pull request #9221 from edx/christina/less-assets Christina Roberts 2015-08-07 10:34:20 -04:00
  • 19b44b477f Update translations (autogenerated message) Sarina Canelake 2015-08-07 09:53:55 -04:00
  • 32b0dc1989 Merge pull request #8871 from edx/aj/tnl2669-invalid-display-name-export-not-working Waheed Ahmed 2015-08-07 18:51:24 +05:00
  • 69a460fdca Merge pull request #9206 from edx/bderusha/teams-full-country-language-names Bill DeRusha 2015-08-07 09:49:48 -04:00
  • 90d8774745 Test that discussion admins can delete team posts. Peter Fogg 2015-08-06 16:07:01 -04:00
  • c7aefd4b21 Fix IE10 issue with delete button. Delete button should not be clickable if in use by a unit. Mushtaq Ali 2015-08-07 18:31:10 +05:00
  • f37860d36c Merge pull request #9220 from jzoldak/zoldak/circle-noprereq Jesse Zoldak 2015-08-07 09:20:50 -04:00
  • fd31c68404 Include coffee dependency files in discussion_js. cahrens 2015-08-06 16:43:01 -04:00
  • e95e23faf1 Allow discussion vendor files to be bundled. cahrens 2015-08-06 15:19:38 -04:00
  • 68645db38b Reduce dependency on courseware_js. cahrens 2015-08-06 14:57:12 -04:00
  • 7bf81195ad Strip aways slashes from the asset 'displayname' as they cause export to fail. TNL-2669 Awais Jibran 2015-07-10 12:16:00 +05:00
  • a14667c6f2 MA-1061 Fix IntegrityError caused by race condition in CourseOverview.get_from_id Kyle McCormick 2015-07-27 14:57:25 -04:00
  • 0d4f602e33 pep8 Davorin Sego 2015-08-06 22:35:44 +02:00
  • d06e16d953 Initialize signal handler, so we can remove getattr Davorin Sego 2015-08-06 22:06:56 +02:00
  • 24bca27b46 Merge pull request #9219 from edx/peter-fogg/url-routing-bok-choy Peter Fogg 2015-08-06 15:47:35 -04:00
  • 65a9c05adb Merge pull request #9213 from edx/ziafazal/SOL-1075 Matt Drayer 2015-08-06 15:04:58 -04:00
  • a7c06fd296 Allow image files to be cached. cahrens 2015-08-06 14:56:28 -04:00
  • 97c3bd1cfd on clicking Edit of certificate config show prompt Zia Fazal 2015-08-06 13:59:01 +05:00
  • e0e895a531 Add Bok Choy tests for teams page URL routing. Peter Fogg 2015-08-06 11:35:00 -04:00
  • 2398824bba Add Full Country & Language Names to Teams [TNL-2891] Bill DeRusha 2015-08-05 11:35:46 -04:00
  • f8766891f0 No need to install prereqs twice on circleci.com Jesse Zoldak 2015-08-06 10:48:39 -04:00
  • 117bc4a94e Merge pull request #9216 from edx/ned/speed-i18n-extract Ned Batchelder 2015-08-06 12:37:12 -04:00
  • 1a251a4900 Merge pull request #9105 from edx/andya/team-discussion-component Andy Armstrong 2015-08-06 12:21:27 -04:00
  • 3570d08856 Merge pull request #9197 from edx/ziafazal/SOL-1077-fix Matt Drayer 2015-08-06 11:36:03 -04:00
  • 2f7fa6fd8b Enforce discussions permissions in teams UI. Peter Fogg 2015-07-31 11:40:53 -04:00
  • f5840489a0 Allow editing of own post in team discussion Daniel Friedman 2015-08-04 13:52:40 -04:00
  • dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming Marco Morales 2015-08-04 11:19:47 -04:00
  • 41173fefee Only verify course access for threads with course context. cahrens 2015-07-29 13:50:17 -04:00
  • 63da1907eb Show inline discussion component on Team view Andy Armstrong 2015-07-21 17:39:44 -04:00
  • 2300f382cf Ignore more directories to speed up extracting i18n strings. Ned Batchelder 2015-08-06 10:39:04 -04:00
  • 80b0edf082 Fixing course settings page for change in minimum grade ECOM-1987 Tasawer 2015-08-06 15:39:01 +05:00
  • df936837ae Merge pull request #9210 from edx/dont-click-here David Baumgold 2015-08-06 10:10:43 -04:00
  • 58c9291728 updated the help text for cert_whitelist arbabnazar 2015-08-04 16:29:06 +05:00
  • c4eed7bbc2 Merge pull request #9196 from edx/benp/bok-choy-shard-7 Ben Patterson 2015-08-06 07:27:56 -04:00
  • 486aa58fe7 Merge pull request #8889 from edx/shr/bug/TNL-2686-library-export-then-import-error Syed Hasan raza 2015-08-06 02:09:05 -07:00
  • 668c7fdca3 Should never just link the word 'here' David Baumgold 2015-08-05 15:53:51 -04:00
  • 4c1c4619f0 Test library failed to export after import Syed Hassan Raza 2015-07-13 17:10:44 +05:00
  • 4c9b66376a Merge pull request #9205 from edx/zoldak/script-cleanup-2 Jesse Zoldak 2015-08-05 15:21:33 -04:00
  • 92c9c1d529 New bok-choy shard (#7). Ben Patterson 2015-08-04 08:58:15 -04:00
  • a147857a43 Merge pull request #9091 from jzoldak/zoldak/test-circle Jesse Zoldak 2015-08-05 13:27:56 -04:00
  • 8672455fda Get circleci configuration working for forks Jesse Zoldak 2015-07-23 09:36:43 -04:00
  • f7594ecdcb Merge pull request #9149 from edx/ziafazal/SOL-1088 Matt Drayer 2015-08-05 12:38:37 -04:00
  • 73810f6a23 Merge pull request #8888 from edx/mobile/MA-977-supports Nimisha Asthagiri 2015-08-05 12:29:25 -04:00
  • 5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support Nimisha Asthagiri 2015-07-09 10:37:55 -04:00
  • 7713bed48f Clean up unused CI scripts Jesse Zoldak 2015-08-03 11:28:28 -04:00
  • 5c8f79c067 Merge pull request #9203 from edx/release Clinton Blackburn 2015-08-05 11:31:48 -04:00
  • 09405a758e Merge pull request #9193 from edx/patch/2015-08-04 Clinton Blackburn 2015-08-05 10:08:18 -04:00
  • 205f341730 Merge pull request #9075 from edx/ammar/tnl1899-create-new-team Muhammad Ammar 2015-08-05 18:44:00 +05:00
  • 69450fce47 create a new team muhammad-ammar 2015-07-16 05:02:02 +05:00
  • 70d4d885e7 Merge pull request #9185 from edx/asadiqbal08/SOL-1035 Matt Drayer 2015-08-05 08:31:30 -04:00
  • e11c1d120c certificate edit/delete is only allowed if user is edX PM or certificate is not active Zia Fazal 2015-08-05 12:56:10 +05:00
  • 56da28526e Merge pull request #9155 from edx/jeskew/csm_api_events_to_datadog John Eskew 2015-08-04 18:19:55 -04:00
  • f3e59acbf1 Add DataDog histogram events to DjangoXBlockUserStateClient class. John Eskew 2015-07-31 11:52:53 -04:00
  • 39cccac7e5 Merge pull request #9176 from edx/diana/add-team-creator-automatically Diana Huang 2015-08-04 17:06:54 -04:00