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

Commit Graph

  • b60b7c7e5a Merge pull request #4054 from edx/zub/bugfix/std1775-uploadpdfbutton zubair-arbi 2014-06-16 20:17:14 +05:00
  • b47e397d64 Merge pull request #4089 from edx/zoldak/courses-test Jay Zoldak 2014-06-16 10:45:39 -04:00
  • c74b34c1a8 Merge pull request #4041 from edx/jsa/forums-search-users Jim Abramson 2014-06-16 10:15:01 -04:00
  • c2ebfde429 implement forums endpoint for searching users jsa 2014-06-10 11:45:00 -04:00
  • 1d5f5db9c6 Merge pull request #4104 from edx/alex/return_html5_video_sources_in_docstring_for_easy_testing Alexander Kryklia 2014-06-16 13:37:16 +03:00
  • e032ab1877 Add examples of html5 videos to docstrings. Alexander Kryklia 2014-06-16 12:44:14 +03:00
  • 8e47219a8d trigger change event for file field while uploading pdf STUD-1775 zubair-arbi 2014-06-11 19:34:25 +05:00
  • 5aabd3a48e Add scope/field selector settings for LinkedIn provider. Matjaz Gregoric 2014-06-11 09:19:32 +02:00
  • 6fdb4dc8da missed commit e0d 2014-06-13 17:48:38 -04:00
  • be1479deb2 shim to update ruby/node, not python reqs e0d 2014-06-13 17:42:28 -04:00
  • f1bc7a162d Merge pull request #4098 from edx/e0d/paver-shim e0d 2014-06-14 10:36:53 -04:00
  • 04fcebaf47 Allow xblocks to be added as advanced problem types Andy Armstrong 2014-06-11 13:21:46 -04:00
  • 5d1c5ca5f8 Merge pull request #4059 from edx/andya/xblocks-as-advanced-problems Andy Armstrong 2014-06-14 08:00:24 -04:00
  • 6704d59db0 Allow xblocks to be added as advanced problem types Andy Armstrong 2014-06-11 13:21:46 -04:00
  • 27cdb6820f Merge pull request #4084 from edx/jmclaus/i18n-formula-equation-input jmclaus 2014-06-13 23:48:48 +02:00
  • fbde5fcd7c missed commit e0d 2014-06-13 17:48:38 -04:00
  • c3520fa1e0 Merge pull request #4085 from edx/jmclaus/i18n-chemical-equation-input jmclaus 2014-06-13 23:48:07 +02:00
  • a14be4716d Merge pull request #4087 from edx/jmclaus/i18n-matlab-input jmclaus 2014-06-13 23:44:06 +02:00
  • 2250338eba shim to update ruby/node, not python reqs e0d 2014-06-13 17:42:28 -04:00
  • 290906acb0 Merge pull request #4094 from edx/db/http-stub-respond-to-HEAD David Baumgold 2014-06-13 16:33:40 -04:00
  • 7c71725f11 Merge pull request #4008 from edx/stv/jsinput Steven Burch 2014-06-13 13:01:31 -07:00
  • 3a5ba4ba83 Bump opaque_key dependency to 0.1.1 David Ormsbee 2014-06-13 14:51:24 -04:00
  • 060b8680f4 update opaque keys dependency to fix install David Ormsbee 2014-06-13 13:39:53 -04:00
  • 230aa5e9f6 Merge pull request #4070 from edx/ammar/video-tests-improvements muhammad-ammar 2014-06-13 23:43:45 +05:00
  • bafdb8ecb1 make our HTTP stub services respond to HEAD requests David Baumgold 2014-06-13 14:42:23 -04:00
  • fd10fbf725 Fix JSInput scope leak stv 2014-06-05 12:41:18 -07:00
  • cf14dee790 Fix JSInput test fixture stv 2014-06-05 12:49:34 -07:00
  • bdf90bfcfb Remove superfluous JSInput test stv 2014-06-05 10:00:59 -07:00
  • 60a9e99871 Fix JSInput tests stv 2014-06-04 18:41:35 -07:00
  • e2cab19084 Ensure JSInput tests actually run stv 2014-06-04 17:56:10 -07:00
  • 858f3ae5c9 Merge pull request #4075 from edx/han/regenerate_user Han Su Kim 2014-06-13 11:39:56 -04:00
  • a58149eb81 Merge pull request #4091 from edx/sarina/06132014-language-update Sarina Canelake 2014-06-13 10:55:12 -04:00
  • dc135e4398 Video Test Improvements Muhammad Ammar 2014-06-12 11:58:56 +00:00
  • 8fdec439ee Changing over imports to opaque_keys.edx Han Su Kim 2014-06-13 09:36:40 -04:00
  • 11d3ddfc10 Update translations (autogenerated message) Sarina Canelake 2014-06-13 09:27:28 -04:00
  • c0bdd9b2f3 Merge pull request #4088 from edx/will/ora2-release-2014-06-13T11.52 Will Daly 2014-06-13 09:26:35 -04:00
  • b2c0e0584d Fix the CoursePagesTest Jay Zoldak 2014-06-13 08:17:29 -04:00
  • cc457b4458 ORA2 release-2014-06-13T11.52 Will Daly 2014-06-13 08:06:47 -04:00
  • 5833af2489 MatlabInput: i18n jmclaus 2014-06-13 14:01:09 +02:00
  • e7d3538c07 ChemicalEquationInput: i18n jmclaus 2014-06-13 13:29:08 +02:00
  • f52c1d48de FormulaEquationInput: i18n jmclaus 2014-06-13 12:10:47 +02:00
  • 501a1b59c4 Merge pull request #4083 from edx/alex/fix_syntax_error_in_video_player_test Alexander Kryklia 2014-06-13 11:24:12 +03:00
  • eb8d45b97c Fix incorrect video bok choy test. Alexander Kryklia 2014-06-13 10:25:45 +03:00
  • 0b93c5a827 Squashing commits, Han Su Kim 2014-06-12 13:26:24 -04:00
  • 147dda73e0 Merge pull request #4076 from edx/sarina/ignore-maps Sarina Canelake 2014-06-12 14:39:43 -04:00
  • ca64189f0f Ignore *.css.map files Sarina Canelake 2014-06-12 13:58:39 -04:00
  • acf298e9ad Merge pull request #4074 from edx/alex/fix_video_saved_editor Alexander Kryklia 2014-06-12 20:03:53 +03:00
  • 5bcd4c54cc Merge pull request #4055 from edx/sarina/fix-underscore-resource Sarina Canelake 2014-06-12 12:20:57 -04:00
  • 6ea3c8cbdd Fix failing test and update docstrings for video player Alexander Kryklia 2014-06-10 13:04:40 +03:00
  • 6418f6fe8b Add Chinese (Hong Kong) language Sarina Canelake 2014-06-11 10:51:29 -04:00
  • 52756cf829 Fix Transifex configuration so we can merge translations Sarina Canelake 2014-06-11 10:48:25 -04:00
  • ed2358ab04 Merge pull request #4063 from edx/dhm/mongo_tweaks Don Mitchell 2014-06-12 10:07:03 -04:00
  • 14ad71f206 Merge pull request #3462 from edx/andya/source-maps Brian Talbot 2014-06-11 22:31:37 -04:00
  • 3adc2f0a2e Fix opaque_keys imports from hotfixes Sarina Canelake 2014-06-11 21:32:41 -04:00
  • 7e36c35043 Merge branch 'release' Sarina Canelake 2014-06-11 21:30:05 -04:00
  • 786655f890 correcting poorly scoped Sass variables set in xmodules' .scss files to adhere to Sass 3.3 scoping Brian Talbot 2014-06-10 16:35:14 -04:00
  • 44982ae3ca correcting for updated Bourbon radial-gradient mixin syntax Brian Talbot 2014-06-10 11:57:00 -04:00
  • 02b0725456 correcting for Bourbon deprecated inline-block() mixin Brian Talbot 2014-06-10 10:18:18 -04:00
  • 5150b03423 updating Bourbon gem file to version 4.0.2 and Bourbon spec version requirement to 4.0.1 Brian Talbot 2014-06-10 09:59:09 -04:00
  • 71ea2fe27b updating static common/static/sass bourbon/neat files Brian Talbot 2014-06-05 14:12:48 -04:00
  • ae86c2a31c setting Bourbon spec version requirement to 4.0.1 and Neat spec version requirements to 1.6.0 Brian Talbot 2014-06-05 13:24:33 -04:00
  • cf63512538 updating Bourbon gem file to version 4.0.1 Brian Talbot 2014-04-24 23:50:21 -04:00
  • eca836c988 updating Neat gem file to version 1.6.0 Brian Talbot 2014-04-24 23:51:32 -04:00
  • e8ca25f2af Set sass spec version requirement to 3.3.5. Ben Patterson 2014-05-28 12:35:19 -04:00
  • f3dd8aee8a Update SASS pipeline to generate source maps Andy Armstrong 2014-04-23 18:07:07 -04:00
  • 1816f97fba Merge pull request #4064 from edx/ahodges/documentation/20140611chglog Alison Hodges 2014-06-11 16:12:51 -04:00
  • 4959f3b85b Fix wiki search query and formatting error in a doc file. Don Mitchell 2014-06-11 15:57:51 -04:00
  • 2e36fb293b Merge pull request #4046 from edx/hotfix/2014-06-11 Sarina Canelake 2014-06-11 14:23:25 -04:00
  • 236f36b349 Merge pull request #4057 from louyihua/dark_lang Sarina Canelake 2014-06-11 14:16:46 -04:00
  • 5037d97837 Merge pull request #4033 from edx/db/kill-reviewboard David Baumgold 2014-06-11 13:53:56 -04:00
  • 6d7839007a Do not merge zh-hk into zh-tw in darklang louyihua 2014-06-12 01:19:49 +08:00
  • b6bf1b8848 Merge pull request #4056 from edx/jsa/search-spell-correction-fixes Jim Abramson 2014-06-11 13:14:56 -04:00
  • 13ec3698d5 Merge pull request #4058 from cpennington/hotfix/lms-2830 Calen Pennington 2014-06-11 13:05:12 -04:00
  • 5dfd4d4dcc clarify and internationalize the search spell correction message. jsa 2014-06-11 11:09:26 -04:00
  • f6ea16223b Allow users that have unregistered from a verified course to re-register. Calen Pennington 2014-06-11 12:06:37 -04:00
  • ff42848ccc Merge pull request #4035 from edx/db/jenkins-is-not-special David Baumgold 2014-06-11 11:58:20 -04:00
  • fd002500e9 Merge pull request #4042 from edx/mathewpeterson/authors Mathew Peterson 2014-06-11 11:40:33 -04:00
  • dc33897241 Merge pull request #4053 from edx/harvard-annotations-on-hotfix Julia Hansbrough 2014-06-11 11:39:11 -04:00
  • beca9b51d9 Merge pull request #4051 from edx/anton/i18n-choicetextgroup Anton Stupak 2014-06-11 18:19:24 +03:00
  • 6d682787c5 Merge pull request #4047 from edx/dhm/mongo_indices Don Mitchell 2014-06-11 11:07:59 -04:00
  • e0b693f1bf Merge pull request #4034 from edx/db/kill-nginx-proxy David Baumgold 2014-06-11 10:32:10 -04:00
  • 48824b817a 3 entries for June -> 1 entry Alison Hodges 2014-06-11 10:26:29 -04:00
  • e48cc16d45 Annotations Tools: i18n Make stati strings extractable lduarte1991 2014-06-09 14:04:54 -04:00
  • 848c7165e3 Annotation Tool: PR #4019 lduarte1991 2014-06-06 15:40:03 -04:00
  • fecb2e1682 Annotation Tool: PR #3969 lduarte1991 2014-06-02 23:22:26 -04:00
  • a7fe6faa53 Merge pull request #4052 from edx/will/ora2-release-2014-06-11T10.43 Will Daly 2014-06-11 10:16:40 -04:00
  • 643a7bfa95 Annotation Tools: PR #3907 lduarte1991 2014-05-28 14:38:37 -04:00
  • 1ef65f58e9 Merge pull request #3881 from edx/markhoeber/documentation/doc-452 Mark Hoeber 2014-06-11 09:44:14 -04:00
  • 0e2bf2234d BLD-726: ChoiceTextGroup i18n. polesye 2014-06-11 13:34:52 +03:00
  • fa94360d69 Review all fs.files and modulestore indices and fix some gridfs calls to reduce traffic Don Mitchell 2014-06-10 10:39:39 -04:00
  • fecacf8e1d Merge pull request #4039 from edx/anton/context-aware-video-index Anton Stupak 2014-06-11 15:23:48 +03:00
  • b00398f5ee ORA2 release-2014-06-11T10.43 Install edx-submissions from PyPi instead of from edx-ora2 Will Daly 2014-06-06 06:35:47 -04:00
  • d9d11a21ef BLD-933: Add table of contents. polesye 2014-06-06 11:42:17 +03:00
  • cfec580a63 Add argument. Oleg Marshev 2014-06-11 11:41:03 +03:00
  • 04c9426524 Merge pull request #4048 from edx/sarina/fix-notes-import Sarina Canelake 2014-06-10 21:37:05 -04:00
  • 890093ebbf Fix Notes import Sarina Canelake 2014-06-10 18:13:32 -04:00
  • 0df7037650 Send the serialized string to the track_function in split_test_module. Diana Huang 2014-06-10 17:02:53 -04:00
  • 2aea261d48 Merge branch 'release' Sarina Canelake 2014-06-10 16:59:23 -04:00
  • 21a784b469 Merge pull request #3968 from edx/hotfix/2014-06-03 Sarina Canelake 2014-06-10 16:40:31 -04:00
  • e6cb73de59 Change log now lists one section for June Alison Hodges 2014-06-10 15:01:54 -04:00