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

Commit Graph

  • f3a0327541 Merge pull request #4841 from edx/sarina/minor-i18n-fixes Sarina Canelake 2014-08-14 18:03:54 -04:00
  • c830537ea3 Merge pull request #4844 from edx/release Adam 2014-08-14 17:06:39 -04:00
  • 79f3526c6f Update i18n-tools David Baumgold 2014-08-14 17:05:10 -04:00
  • 09d86c2281 Merge pull request #4832 from edx/hotfix/2014-08-14 Adam 2014-08-14 16:34:23 -04:00
  • 88ebac4faf Use English for the marketing site buttons in an edx-controlled domain Will Daly 2014-08-14 15:47:52 -04:00
  • 5c64c5b21f Merge pull request #3784 from mtyaka/patch-1 Feanil Patel 2014-08-14 15:03:20 -04:00
  • 19ca6c845c Minor i18n fixes prompted by translators Sarina Canelake 2014-08-14 14:58:26 -04:00
  • 963f77e40e Merge pull request #4818 from edx/jhelbert/contributing-generalization jhelbert 2014-08-14 14:55:51 -04:00
  • 260aa88c52 Generalizing CONTRIBUTING.rst to all repos Justin Helbert 2014-08-13 13:23:29 -04:00
  • bdc4fd4d86 set root logging level for acceptance tests to ERROR Christine Lytwynec 2014-08-14 14:18:51 -04:00
  • b5aaf8b01f jquery.immediateDescendents cannot be loaded until jQuery is loaded. cahrens 2014-08-13 12:31:44 -04:00
  • eee0d35bfe Ignore errors on rmtree cleanup Jesse Zoldak 2014-08-12 12:30:37 -04:00
  • 323a23f53a Verify loading indicator has been hidden. cahrens 2014-08-13 11:55:34 -04:00
  • 16a2940977 Update django-splash. Matjaz Gregoric 2014-05-20 14:07:47 +02:00
  • 0edac1540d Merge pull request #4833 from edx/waheed/hotfix/2014-08-12 Adam 2014-08-14 12:53:09 -04:00
  • d9ccaa650a Check REQUEST_CONTEXT.context exists before accessing it. Waheed Ahmed 2014-08-13 20:00:40 +05:00
  • 2ca86a8d87 Merge pull request #4735 from edx/oleg/validate-content-experiments Oleg Marshev 2014-08-14 19:14:20 +03:00
  • a94e942480 BLD-1125: Validation of content experiments after managing a group. Oleg Marshev 2014-08-05 15:21:20 +03:00
  • 1caa8cc41a Merge pull request #4827 from edx/ecom/include-optimizely Renzo Lucioni 2014-08-14 10:15:12 -04:00
  • 9d4a28e962 Merge pull request #4826 from edx/sarina/jsme-hotfix Sarina Canelake 2014-08-14 10:11:47 -04:00
  • 3eaac3b839 Factor out Optimizely project ID Renzo Lucioni 2014-08-07 16:53:45 -04:00
  • db13868f3e Release edx-jsme 1.0 Chris Rossi 2014-07-28 15:46:46 -04:00
  • 6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 Sarina Canelake 2014-08-14 10:02:55 -04:00
  • c285bda69f Merge pull request #4625 from fmyzjs/ipv6 Sarina Canelake 2014-08-14 09:26:57 -04:00
  • 3c6a3bacd5 Merge pull request #4825 from edx/sarina/annotations-fixes Sarina Canelake 2014-08-14 09:17:50 -04:00
  • c5f85eff87 Annotation Tools: Adding try-catch in case Annotator is missing from LMS lduarte1991 2014-08-13 22:05:42 -04:00
  • c88bd15922 Annotation Tools: Adding comments and adding CSS groups lduarte1991 2014-08-13 21:35:33 -04:00
  • e19878548a Annotation Tools: Adding Annotator to CMS lduarte1991 2014-08-13 17:26:23 -04:00
  • 244554f71f Merge pull request #4823 from lduarte1991/lduarte-harvardx-pr19 Sarina Canelake 2014-08-14 09:13:14 -04:00
  • f2b34d80ed - replaced tabs with 4 spaces lduarte1991 2014-08-12 13:35:42 -04:00
  • a00a2de85b Annotation Tools: Explicit typecasting === changes and reorganizing plugins lduarte1991 2014-08-11 17:01:15 -04:00
  • c12ed3ae9a Merge pull request #4808 from edx/tim/open-STUD-1264 Tim Babych 2014-08-14 12:18:13 +03:00
  • 13846e074d Support ipv6 in geoinfo and Embargo Jason Zhu 2014-07-31 15:20:28 +08:00
  • 76b8891b69 Annotation Tools: Adding try-catch in case Annotator is missing from LMS lduarte1991 2014-08-13 22:05:42 -04:00
  • 8cfdb8f14c Annotation Tools: Adding comments and adding CSS groups lduarte1991 2014-08-13 21:35:33 -04:00
  • 5c859c7128 Annotation Tools: Adding Annotator to CMS lduarte1991 2014-08-13 17:26:23 -04:00
  • 76516f52b8 Merge pull request #4796 from lduarte1991/lduarte-harvardx-pr18 Sarina Canelake 2014-08-13 20:38:09 -04:00
  • c389a445ae Merge pull request #4814 from edx/christina/bug-2090 Christina Roberts 2014-08-13 15:41:42 -04:00
  • f02093f010 Merge pull request #4819 from edx/minimaster Julia Hansbrough 2014-08-13 14:48:21 -04:00
  • 2204eb7390 Fixed merge conflict between release and master. Julia Hansbrough 2014-08-13 18:11:30 +00:00
  • a35cbf1c63 Verify loading indicator has been hidden. cahrens 2014-08-13 11:55:34 -04:00
  • 7e975f78d0 Merge pull request #4815 from edx/christina/bug-1999 Christina Roberts 2014-08-13 13:19:29 -04:00
  • 9b53c80993 Merge pull request #4801 from edx/prof-ed-cherry-picked-changes Julia Hansbrough 2014-08-13 13:04:41 -04:00
  • 1272f049f6 jquery.immediateDescendents cannot be loaded until jQuery is loaded. cahrens 2014-08-13 12:31:44 -04:00
  • 63f1d9834d - replaced tabs with 4 spaces lduarte1991 2014-08-12 13:35:42 -04:00
  • aa1b9fece9 Properly (de)serialize references in old mongo LMS-11204 Don Mitchell 2014-08-11 14:42:33 -04:00
  • 7234d39bcc Documentation: create_sinon.js - update referenced JIRA issue. Tim Babych 2014-08-13 17:57:51 +03:00
  • 5789b98b63 Merge pull request #4759 from edx/dhm/key_munging Don Mitchell 2014-08-13 09:36:08 -04:00
  • 681438f093 Merge pull request #4791 from edx/talbs/studio-stylesweep-fontsize Brian Talbot 2014-08-13 09:16:01 -04:00
  • 998e33ec37 Studio: refactoring font-size to use existing Sass scale-based placeholders Brian Talbot 2014-08-12 00:04:15 -04:00
  • 422a6e20db Update the reference to gsehub/xblock-mentoring#4 and gsehub/xblock-mentoring#5 Filippo Valsorda 2014-08-08 09:36:08 -07:00
  • 1720ddf93f Studio: refactoring font-size to use Sass mixin * moving font-size to use @include font-size() mixin * re-organizing vendor reset styling into _vendor.scss override rather than _reset.scss * initial rule re-organization and minor line-height tweaks Brian Talbot 2014-08-11 22:49:58 -04:00
  • 2edf1aef31 Merge pull request #4798 from edx/zoldak/rmtree-cleanup Jesse Zoldak 2014-08-12 17:05:20 -04:00
  • 680d5031d7 Merge pull request #4802 from edx/will/unit-test-staticfiles Will Daly 2014-08-12 16:42:19 -04:00
  • 9f1779ed6e Merge pull request #4795 from edx/zoldak/clean-mako-dir Jesse Zoldak 2014-08-12 16:12:40 -04:00
  • 563b62a872 Merge pull request #4797 from edx/lms/add-optimizely Renzo Lucioni 2014-08-12 15:28:23 -04:00
  • a827df27fe Remove update assets from unit test suite Update settings so unit tests pass Will Daly 2014-08-12 11:18:55 -04:00
  • d60907d725 Consider profession ed courses as paid courses. Diana Huang 2014-08-12 14:01:18 -04:00
  • 5caaec7b82 LMS: adding rendering/styling support for initial professional ed course types on student dashboard Brian Talbot 2014-08-11 17:29:17 -04:00
  • 905ce6319c Add integration tests for professional ed flow Will Daly 2014-08-11 15:27:59 -04:00
  • 9aa095dd21 Adapt flow for new 'professional' mode. Diana Huang 2014-08-08 17:12:47 -04:00
  • 805c325653 Update redirect and wording for prof ed Julia Hansbrough 2014-08-08 17:51:22 +00:00
  • 2ad9557403 Factor out Optimizely project ID Renzo Lucioni 2014-08-07 16:53:45 -04:00
  • ee836d4c40 Merge branch 'release' from 2014-08-12 release. cahrens 2014-08-12 13:51:58 -04:00
  • e727bd2202 Merge pull request #4790 from edx/talbs/studio-stylesweep-fontweight Brian Talbot 2014-08-12 13:20:51 -04:00
  • f8ec92949f Studio: refactoring font-weight CSS rules to use Sass placeholders Brian Talbot 2014-08-11 22:16:39 -04:00
  • 9a25c9ff54 Ignore errors on rmtree cleanup Jesse Zoldak 2014-08-12 12:30:37 -04:00
  • d9a2d229a7 Merge pull request #4768 from edx/sarina/remove-legacy-banner Sarina Canelake 2014-08-12 12:21:34 -04:00
  • e399c0b198 Clean out the mako temp dirs before running tests Jesse Zoldak 2014-08-12 11:10:53 -04:00
  • 4c065eb670 Merge pull request #4783 from edx/ahodges/documentation/relnotes08_12_14 Mark Hoeber 2014-08-12 11:00:11 -04:00
  • 927a55f4e4 Release Notes for 8/12/14 Alison Hodges 2014-08-11 15:01:31 -04:00
  • 7e9f917f62 Merge pull request #4237 from starteam/master Oleg Marshev 2014-08-12 17:38:57 +03:00
  • 4e8a290220 Merge pull request #4356 from edx/markhoeber/documentation/publishing-changes Mark Hoeber 2014-08-12 10:34:57 -04:00
  • 620d31022b Merge pull request #4781 from edx/christina/publishing-tests Christina Roberts 2014-08-12 09:20:19 -04:00
  • 8e722af080 Merge pull request #4785 from edx/adam/add-link-to-readme Adam 2014-08-12 09:18:58 -04:00
  • ab78c758f1 Merge pull request #4638 from edx/zoldak/lettuce-log-js-console Jesse Zoldak 2014-08-12 09:06:53 -04:00
  • be17040f9d Fix for empty imsx_messageIdentifier Ivica Ceraj 2014-08-12 08:30:33 -04:00
  • b7486133cc Doc changes for new publishing workflow Mark Hoeber 2014-07-09 15:17:57 -04:00
  • 41425a4647 Merge pull request #4773 from edx/ahodges/documentation/DOC804 Alison Hodges 2014-08-11 18:12:19 -04:00
  • b55362b925 make unit tests respect mongo port/host settings (with default) Jason Bau 2014-08-08 00:50:15 -07:00
  • 7114b25a40 Annotation Tools: Explicit typecasting === changes and reorganizing plugins lduarte1991 2014-08-11 17:01:15 -04:00
  • 25963797c6 Merge pull request #3227 from FiloSottile/enforce_type Calen Pennington 2014-08-11 16:13:53 -04:00
  • 83f1231f5a Updates for Sylvia's edits Alison Hodges 2014-08-11 15:45:47 -04:00
  • df83f5279f Merge pull request #4766 from edx/flowerhack/update-testing-md Julia Hansbrough 2014-08-11 15:45:37 -04:00
  • 7720969965 add how to file a bug report link to readme Adam Palay 2014-08-11 15:23:34 -04:00
  • f06c99fec6 Update testing.md Julia Hansbrough 2014-08-08 20:57:02 +00:00
  • 367bdf18c8 Improve stability of test_studio_outline tests. cahrens 2014-08-11 14:30:45 -04:00
  • f59dd647c5 Capture console log on lettuce test failure Jesse Zoldak 2014-07-31 17:14:06 -04:00
  • e7fbf1327f Merge pull request #4778 from edx/tim/improve-python-group-configuration-tests Tim Babych 2014-08-11 21:10:47 +03:00
  • 05bddae34a Merge pull request #4633 from edx/dhm/create_xthing Don Mitchell 2014-08-11 12:53:59 -04:00
  • 192d701899 Code review changes re split import/export, create_xblock Don Mitchell 2014-08-08 10:40:27 -04:00
  • 06cb6008f0 Use UrlResetMixin to test GroupConfiguration feature Tim Babych 2014-08-11 17:16:27 +03:00
  • c34cf558ef Added Will's nuance and info on availability from Lyla Alison Hodges 2014-08-11 11:15:32 -04:00
  • ad37d93d24 Merge pull request #4775 from edx/alex/fix-reenable-user-partitions Christina Roberts 2014-08-11 10:39:06 -04:00
  • 9643120390 Reenable user partition in Advanced Settings. Alexander Kryklia 2014-08-11 16:41:29 +03:00
  • 88af00904f Release edx-jsme 1.0 Chris Rossi 2014-07-28 15:46:46 -04:00
  • cd5b3bf230 wrapping Alison Hodges 2014-08-11 08:34:26 -04:00
  • 27927a78d8 cleanup Alison Hodges 2014-08-11 07:22:45 -04:00
  • 452d69654e Merge pull request #4386 from edx/ammar/bok-choy-cms-video-tests muhammad-ammar 2014-08-11 14:42:17 +05:00
  • 936bd4d5ad Bok-Choy CMS Video Tests Muhammad Ammar 2014-08-11 07:50:02 +00:00