Commits · 87313a4e0f53bf0e9396bd6ab8da5732fa445b90 · edx / edx-platform · GitLab

21 Jan, 2016 1 commit
- Merge pull request #11282 from open-craft/bump-xblock-utils · 87313a4e
```
Bump xblock-utils hash.
```
  Ned Batchelder committed Jan 21, 2016
  87313a4e Browse Files
20 Jan, 2016 1 commit
- Bump xblock-utils hash. · 2c0948f5
  Tim Krones committed Jan 20, 2016
  
  2c0948f5 Browse Files
15 Dec, 2015 4 commits
- Merge pull request #10996 from edx/ormsbee/revert_staff_info · 1ebb78c9
```
Revert "Remove staff debug category type whitelist."
```
  Diana Huang committed Dec 15, 2015
  1ebb78c9 Browse Files
- Merge pull request #10995 from open-craft/smarnach/activate-activetable · dd79a697
```
Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES.
```
  Sven Marnach committed Dec 15, 2015
  dd79a697 Browse Files
- Revert "Remove staff debug category type whitelist." · e15907c7
```
This reverts commit bb25473a.

Reason for revert: Was breaking display on Course About and Info
pages.
```
  David Ormsbee committed Dec 15, 2015
  e15907c7 Browse Files
- Add the ActiveTable and Vector Draw XBlocks to ADVANCED_COMPONENT_TYPES. · d35effc8
  Sven Marnach committed Dec 15, 2015
  
  d35effc8 Browse Files
14 Dec, 2015 8 commits
- Merge pull request #10838 from edx/jeskew/standardize_mongo_connections · 0ed79032
```
All feedback above was addressed, the commits were squashed, and tests passed. Merging.
```
  John Eskew committed Dec 14, 2015
  0ed79032 Browse Files
- Merge pull request #10959 from edx/course_overview/manual_seeding · 160f3914
```
Course Overview - require manual seeding of the table
```
  Nimisha Asthagiri committed Dec 14, 2015
  160f3914 Browse Files
- Merge pull request #10928 from edx/clytwynec/problem-type-a11y-tests · e45ac60c
```
add AnnotationProblemTypeTest and SymbolicProblemTypeTest
```
  Christine Lytwynec committed Dec 14, 2015
  e45ac60c Browse Files
- Merge pull request #10946 from edx/bderusha/fa-require-country · 67c322e7
```
Validate country on FA form
```
  Bill DeRusha committed Dec 14, 2015
  67c322e7 Browse Files
- Use a common MongoDB connection function. · 74e70119
```
Add some missing @autoretry_read() decorators.
Change to PyMongo 3.x-compatible syntax.
```
  John Eskew committed Dec 14, 2015
  74e70119 Browse Files
- Merge pull request #10972 from edx/ziafazal/SOL-1375-text-update · e9c8b4b0
```
SOL-1375: org help text updated
```
  Matt Drayer committed Dec 14, 2015
  e9c8b4b0 Browse Files
- org help text updated · 772a4d4b
  Zia Fazal committed Dec 14, 2015
  
  772a4d4b Browse Files
- Course Overview - require manual seeding of the table. · d6364312
  Nimisha Asthagiri committed Dec 13, 2015
  
  d6364312 Browse Files
13 Dec, 2015 2 commits
- Merge pull request #10968 from edx/mattdrayer/SOL-1519 · 7a8f372e
```
mattdrayer/SOL-1519: Include course-level configuration in feature check
```
  Matt Drayer committed Dec 13, 2015
  7a8f372e Browse Files
- mattdrayer/SOL-1519: Include course-level configuration in feature check · 115b1692
  Matt Drayer committed Dec 13, 2015
  
  115b1692 Browse Files
11 Dec, 2015 24 commits
- Merge pull request #10845 from edx/kill-ora1 · 5386d0a4
```
Remove ORA1: Main Pull Request
```
  Sarina Canelake committed Dec 11, 2015
  5386d0a4 Browse Files
- Validate country on FA form · 5504050a
  Bill DeRusha committed Dec 11, 2015
  
  5504050a Browse Files
- Merge pull request #10965 from edx/clintonb/credit-followup · 2695e7b3
```
Followup to Credit Patch
```
  Clinton Blackburn committed Dec 11, 2015
  2695e7b3 Browse Files
- Merge pull request #10964 from edx/kill-abtest · be1adc38
```
Remove outdated abtest_module
```
  Sarina Canelake committed Dec 11, 2015
  be1adc38 Browse Files
- Merge pull request #10952 from edx/pdesjardins/DOC-2478 · 557a411c
```
Pdesjardins/doc 2478 - Fix problems with the doc build
```
  Peter Desjardins committed Dec 11, 2015
  557a411c Browse Files
- Keep 'peergrading' and 'combinedopenended' defined as deprecated · 21e4c90c
  Sarina Canelake committed Dec 11, 2015
  
  21e4c90c Browse Files
- Followup to Credit Patch · 27f853d6
```
- Removed unused variable
- Updated message class and text
- HTML-escaping relevant fields

ECOM-2893
```
  Clinton Blackburn committed Dec 11, 2015
  27f853d6 Browse Files
- Comment out mock call to ORA1 stub server · 2b4a1be6
  Sarina Canelake committed Dec 11, 2015
  
  2b4a1be6 Browse Files
- Merge pull request #10961 from edx/release · 2f131faf
```
Merging patch/2015-12-11
```
  Clinton Blackburn committed Dec 11, 2015
  2f131faf Browse Files
- Remove ORA1 tabs from setup.py · dea671f9
  Sarina Canelake committed Dec 11, 2015
  
  dea671f9 Browse Files
- Remove ORA1 lettuce tests · 71a2a2a0
  Sarina Canelake committed Dec 11, 2015
  
  71a2a2a0 Browse Files
- Create sample deprecated blocks for bok choy tests · c6c52309
  Sarina Canelake committed Dec 11, 2015
  
  c6c52309 Browse Files
- Disable failing calculator test · ef035524
  Sarina Canelake committed Dec 11, 2015
  
  ef035524 Browse Files
- Remove ORA1 test units from xmodule test courses · 2e4bba0a
  Sarina Canelake committed Dec 11, 2015
  
  2e4bba0a Browse Files
- Remove combined_open_ended XModule CSS (ORA1) · 6280ccdb
  Sarina Canelake committed Dec 11, 2015
  
  6280ccdb Browse Files
- Remove combined_open_ended XModule JS code (ORA1) · 9d6ae576
  Sarina Canelake committed Dec 11, 2015
  
  9d6ae576 Browse Files
- Remove combined_open_ended XModule Python code (ORA1) · f6892716
  Sarina Canelake committed Dec 11, 2015
  
  f6892716 Browse Files
- Remove final CMS references to 'peergrading' and 'combinedopenended' · 27cb3080
  Sarina Canelake committed Dec 11, 2015
  
  27cb3080 Browse Files
- Remove references to deleted ORA1 test course · addbfa75
  Sarina Canelake committed Dec 11, 2015
  
  addbfa75 Browse Files
- Remove ORA1 references from LMS Python tests · e3a9721b
  Sarina Canelake committed Dec 11, 2015
  
  e3a9721b Browse Files
- Remove ORA1 management commands · 54262bc8
  Sarina Canelake committed Dec 11, 2015
  
  54262bc8 Browse Files
- Remove notification_image_for_tab logic (ORA1) · 2431baff
  Sarina Canelake committed Dec 11, 2015
  
  2431baff Browse Files
- Remove ORA1 staff grading coffeescript and templates · 92a7ea5d
  Sarina Canelake committed Dec 11, 2015
  
  92a7ea5d Browse Files
- Remove ORA1 images · 0532b87a
  stv committed Dec 11, 2015
  
  0532b87a Browse Files