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

Commit Graph

  • 6e5f9fdb70 Merge pull request #4469 from edx/jbau/dev-environments-disable-ANALYTICS_ACTIVE_COUNT Jason Bau 2014-07-17 17:49:21 -04:00
  • 44e9e6f359 Merge pull request #4467 from edx/swli/rc-hotpatch-recommender swdanielli 2014-07-17 17:01:08 -04:00
  • 801dcd07a2 Merge pull request #4462 from edx/bug/delete_draft Don Mitchell 2014-07-17 15:45:54 -04:00
  • aac0fac3d2 Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs Jason Bau 2014-07-17 15:04:22 -04:00
  • adae7c6d95 Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io Renzo Lucioni 2014-07-17 14:34:19 -04:00
  • 0fdc762452 recommender prototype swdanielli 2014-07-03 12:17:29 -04:00
  • a129fd4a27 adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups marco 2014-07-16 18:07:39 -04:00
  • 1103d057d7 Piecemeal conversion to draft needs to allow already converted children. STUD-1965 Don Mitchell 2014-07-17 10:10:45 -04:00
  • fb927dd790 Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register Jason Bau 2014-07-17 13:53:51 -04:00
  • 77c3d15d20 always include GA file Giulio Gratta 2014-07-15 15:30:38 -07:00
  • be80e0058e Merge pull request #4464 from edx/jbau/remove-branch-setting-cache Jason Bau 2014-07-17 13:03:08 -04:00
  • e81c33cea5 Merge pull request #4303 from edx/danielli/recommender_prototype swdanielli 2014-07-17 12:54:32 -04:00
  • bde448d950 make sure the CourseAccessRole Django ORM Admin page uses a raw_id so that we don't populate millions of rows from the production database in the drop down list Chris Dodge 2014-07-17 12:04:56 -04:00
  • 3f1e9993f5 recommender prototype swdanielli 2014-07-03 12:17:29 -04:00
  • f12fa05ae1 removing thread-local cache for branch_setting Jason Bau 2014-07-17 11:05:47 -04:00
  • 1607b7fc0d Merge pull request #4445 from cpennington/cross-store-xml-import-export Calen Pennington 2014-07-17 10:55:55 -04:00
  • e1fcac93c5 fix shib reg from course about page Jason Bau 2014-07-16 12:07:25 -04:00
  • d354571e95 Use field scopes to compute which metadata to strip from the definition during XML import of XMLModule subclasses Calen Pennington 2014-07-16 10:52:04 -04:00
  • 9a4e1f5cd1 Only compute block types with children once Calen Pennington 2014-07-09 19:06:53 -04:00
  • 3c7aa18d25 Don't use raw asserts in split (to handle different types of UsageKeys sanely) Calen Pennington 2014-07-09 12:55:32 -04:00
  • 1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore Calen Pennington 2014-07-07 17:35:36 -04:00
  • 4e67c2a9b3 Add the manual testing course for testing xml import/export across modulestores Calen Pennington 2014-07-16 09:08:13 -04:00
  • 8e0189bcf7 Skip DraftVersioningModuleStore tests Calen Pennington 2014-07-16 08:53:58 -04:00
  • 7a55f1207d Add tests of cross-modulestore import/export Calen Pennington 2014-07-07 15:32:21 -04:00
  • 2e13c5a813 Merge pull request #4456 from edx/cdodge/shopping-cart-only-paid-registrations chrisndodge 2014-07-17 09:43:34 -04:00
  • 4928fad415 add ability to inspect a cart for the existence of a particular type of item, e.g. PaidCourseRegistration. Only show the 'Shopping Cart' button if there's a PaidCourseRegistration in it. Chris Dodge 2014-07-17 00:43:00 -04:00
  • ebfcb5d8ce Merge pull request #4349 from louyihua/localization-cms Ned Batchelder 2014-07-16 17:06:37 -04:00
  • db39e6a311 Make TinyMCE editor translatable louyihua 2014-07-17 01:47:48 +08:00
  • 26d35ac4f8 Merge pull request #4441 from edx/anton/fix-flaky--bok-choy-test Anton Stupak 2014-07-16 21:11:46 +03:00
  • 18b7e6f59d Merge pull request #4347 from louyihua/studio-advanced-settings-localization Ned Batchelder 2014-07-16 13:51:02 -04:00
  • 7c6cd56ed3 Merge pull request #4447 from cpennington/squelch-deprecation-warnings-in-test Calen Pennington 2014-07-16 13:07:17 -04:00
  • 405c4f9eb3 Merge pull request #4244 from Stanford-Online/jbau/edx/course-specific-login-opaquekeys Sarina Canelake 2014-07-16 12:45:39 -04:00
  • 8f9c383c68 Merge pull request #4449 from edx/ned/tweaks-for-i18n-docs Ned Batchelder 2014-07-16 12:30:39 -04:00
  • 9d284d2f61 Fix quotation mark & apostrophe related i18n bug louyihua 2014-07-16 23:55:57 +08:00
  • fc16ee3a6e Tweaks for i18n docs Ned Batchelder 2014-07-16 11:37:43 -04:00
  • fba7bb91bd Merge pull request #3718 from jazkarta/idde-bugfix Sarina Canelake 2014-07-16 11:30:10 -04:00
  • ae3942baa2 Remove warning filter from library code (should be set by applications/tests directly) Calen Pennington 2014-07-16 11:14:24 -04:00
  • 347b660623 Merge pull request #4413 from edx/remove-loc-mapper Don Mitchell 2014-07-16 11:09:24 -04:00
  • e9022e74a8 Hotfix course_specific_reg/login for OpaqueKeys Jason Bau 2014-06-27 16:58:16 -07:00
  • 9f2fa7e105 sql migrations cannot use loc mapper Don Mitchell 2014-07-14 15:03:45 -04:00
  • a9695828ab Remove LocMapperStore LMS-2918 Don Mitchell 2014-07-14 11:43:56 -04:00
  • 37cccb85e4 BLD-1190: Fix bok-choy test. polesye 2014-07-16 13:34:00 +03:00
  • a71919efa7 Merge pull request #4422 from edx/ammar/fix-handout-tests muhammad-ammar 2014-07-16 12:25:48 +05:00
  • 713c2a4474 Handle bad children pointers during publish rather than aborting the publish, ignore them. Needed for import Don Mitchell 2014-07-15 20:10:17 -04:00
  • cd2315c1fb Merge pull request #4435 from edx/christina/stud-1963 Andy Armstrong 2014-07-15 17:48:11 -04:00
  • a5330052c8 Merge pull request #4430 from edx/feanil/fix_bokchoy Feanil Patel 2014-07-15 17:05:09 -04:00
  • 8a484b64d3 Disable test that is leaving modal open. cahrens 2014-07-15 16:20:03 -04:00
  • fb39111af3 Merge pull request #4417 from edx/jbau/event-responsetype Jason Bau 2014-07-15 16:51:42 -04:00
  • 666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional Sarina Canelake 2014-07-15 16:37:00 -04:00
  • 700504c52f Fix a bug in Individual Due Date Extensions (IDDE). Chris Rossi 2014-05-13 14:46:00 -04:00
  • aa1b623904 Make text on register button on About page conditional. David Adams 2014-05-08 15:48:51 -07:00
  • 9c929104c7 Merge pull request #4372 from edx/ahodges/documentation/discussionoverview Alison Hodges 2014-07-15 15:19:59 -04:00
  • 22b97338c9 Create the test database if it doesn't exist. Feanil Patel 2014-07-15 13:55:18 -04:00
  • c9a63657f6 Check to make sure that the mysql service is running. Feanil Patel 2014-07-15 13:54:25 -04:00
  • 4986a61877 Merge pull request #4414 from cpennington/fix-get-module-calls Calen Pennington 2014-07-15 12:55:12 -04:00
  • b96658c85e New chapter on discussion features for all users Alison Hodges 2014-07-10 15:23:40 -04:00
  • 242f3ce533 Merge pull request #4428 from edx/sarina/revert-i18n-change Sarina Canelake 2014-07-15 11:13:20 -04:00
  • df8f3bd39e Revert "Pull out edX into variables in password reset email" Sarina Canelake 2014-07-15 10:20:09 -04:00
  • 4ded4be700 Fix calls to get_module to not pass course ids as positions Calen Pennington 2014-07-14 14:34:43 -04:00
  • d1891542df Merge pull request #4420 from Stanford-Online/kluo/fix-name-changes-template Sarina Canelake 2014-07-15 09:03:10 -04:00
  • 682e3108a8 Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates. Usman Khalid 2014-07-15 17:37:23 +05:00
  • f86b031a20 Merge pull request #4416 from edx/will/timepicker-css-in-unit-editor Will Daly 2014-07-15 07:59:41 -04:00
  • b79fe85fd0 Merge pull request #4423 from edx/tim/group-conf-course-key-pattern Tim Babych 2014-07-15 12:40:56 +03:00
  • d7b396a98b Update (optional) Group Configuration urls to use settings.COURSE_KEY_PATTERN. Tim Babych 2014-07-15 12:28:37 +03:00
  • b2e08ddc72 Add promise to ensure unit visibility is changed Muhammad Ammar 2014-07-14 11:18:51 +00:00
  • 246e0e6f66 Merge pull request #4411 from edx/anton/group-experiments Tim Babych 2014-07-15 08:19:34 +03:00
  • 7f1c784629 Add defininition of window.location.origin in both CMS/LMS louyihua 2014-07-15 11:34:09 +08:00
  • adc7c13f45 Fix pending name changes template Kevin Luo 2014-07-14 17:04:42 -07:00
  • 851fe47a95 Merge pull request #4370 from edx/nimisha/split-drop-database-2952 Nimisha Asthagiri 2014-07-14 18:17:48 -04:00
  • faff8c577e Change answer <-> response matching in capa.get_submission_metadata Jason Bau 2014-07-14 17:09:06 -04:00
  • afa3e0d2d5 Merge pull request #4402 from edx/christina/staff-lock Christina Roberts 2014-07-14 16:34:33 -04:00
  • d7cf8b7fa0 Implement close_connections and drop_database on modulestores. Nimisha Asthagiri 2014-07-09 12:18:21 -04:00
  • e8d14b207b Merge pull request #4415 from edx/cdodge/enhanced_registration_fields chrisndodge 2014-07-14 15:50:18 -04:00
  • 66173ab9e6 Add "visible_to_staff_only" field to support staff locking in Studio. cahrens 2014-07-13 17:41:09 -04:00
  • f358f859b6 Merge pull request #4410 from edx/sarina/update-deprecation-warnings Sarina Canelake 2014-07-14 14:44:06 -04:00
  • 0c90b04ecd Add JQuery timepicker CSS to the unit and container templates Will Daly 2014-07-14 14:07:39 -04:00
  • bc03fb0881 Merge pull request #4380 from edx/nimisha/mongo-bwc-config Nimisha Asthagiri 2014-07-14 13:46:00 -04:00
  • 95dd2aad0b Merge pull request #3836 from mitocw/cg/add_default_logging Carson Gee 2014-07-14 13:08:05 -04:00
  • 88a3bac947 Update opaque-keys library Sarina Canelake 2014-07-14 11:30:44 -04:00
  • 57ec402433 Merge pull request #4397 from edx/split-migrator/lms-2936-ok Don Mitchell 2014-07-14 12:10:42 -04:00
  • 86f80c2532 Merge pull request #4407 from edx/ora2/release-2014-07-14T13.17 Stephen Sanchez 2014-07-14 12:02:05 -04:00
  • 23c5febc17 Added deprecation warnings. Nimisha Asthagiri 2014-07-14 11:57:31 -04:00
  • 7503cc2473 reverting back to migrating the settings in the env files Nimisha Asthagiri 2014-07-11 16:58:27 -04:00
  • 4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. Nimisha Asthagiri 2014-07-11 16:11:45 -04:00
  • a218e66d2e auto-migrate old mongo to draft modulestore Nimisha Asthagiri 2014-07-10 19:26:03 -04:00
  • 2c83dc3f09 Merge pull request #4401 from edx/ahodges/dosumentation/DOC719 Alison Hodges 2014-07-14 11:53:17 -04:00
  • 85df351cac Revising policy key names to match new UI Alison Hodges 2014-07-13 08:27:21 -04:00
  • c36b17260d Merge pull request #4405 from pdpinch/fix-calc-definition-of-T Ned Batchelder 2014-07-14 11:33:23 -04:00
  • d30e986abc Merge pull request #4290 from edx/anton/create-new-configurations Tim Babych 2014-07-14 18:25:09 +03:00
  • 639658913d Refactor split migrator LMS-2936 Don Mitchell 2014-07-08 15:24:08 -04:00
  • 930ba01bc2 Updating release tag for July 14th, 2014 Stephen Sanchez 2014-07-14 09:22:10 -04:00
  • 205d24f5cf BLD-1121: Create new group configurations page. polesye 2014-06-26 16:07:48 +03:00
  • 36352fa501 Merge pull request #4383 from mlkwaqas/waqas/for156-anonymous-posts-labels-user-roles Greg Price 2014-07-14 10:43:25 -04:00
  • a41d04e65b Updating release tag for July 14th, 2014 Stephen Sanchez 2014-07-14 09:22:10 -04:00
  • 8516c0dbff add ability for microsites to define additional profile fields to be captured in an overriden signup form - register.html- and then store additional profile in the profile's 'meta' field as JSON blob Chris Dodge 2014-07-12 13:43:12 -04:00
  • 0a73d403d7 Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service Stephen Sanchez 2014-07-14 09:22:40 -04:00
  • 8e8f6127e6 Merge pull request #4406 from edx/sarina/071414-language-update Sarina Canelake 2014-07-14 09:19:57 -04:00
  • 980016b59f Update translations (autogenerated message) Sarina Canelake 2014-07-14 09:18:53 -04:00
  • 5edcd969c8 Add new Transifex languages Sarina Canelake 2014-07-14 08:57:51 -04:00
  • 1807948f2e Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output clytwynec 2014-07-14 09:09:25 -04:00