Commits · a0bae0c794cc7951cabdc15dd28d5c77a1e3282d · edx / edx-platform · GitLab

31 Mar, 2015 8 commits
- Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock · a0bae0c7
  Calen Pennington committed Mar 31, 2015
  
  a0bae0c7 Browse Files
- Move type-checking of position earlier in courseware.views.index · 8341f1b7
  Calen Pennington committed Mar 31, 2015
  
  8341f1b7 Browse Files
- Move more common operations (which work in both XBlocks and XModules) into XModuleMixin · 85fce7e3
  Calen Pennington committed Mar 31, 2015
  
  85fce7e3 Browse Files
- Linting cleanups · 391db6a8
  Calen Pennington committed Mar 31, 2015
  
  391db6a8 Browse Files
- Extract a pure-XBlock version of XmlDescriptor · da296442
  Calen Pennington committed Mar 31, 2015
  
  da296442 Browse Files
- Extract a pure-XBlock version of StudioEditingModule · 62a90db1
  Calen Pennington committed Mar 31, 2015
  
  62a90db1 Browse Files
- Make mongo/draft.py pass the active descriptor system through item loading · ee401f15
  Calen Pennington committed Mar 31, 2015
  
  ee401f15 Browse Files
- Extract a pure-XBlock version of MakoModuleDescriptor · bf62c4b7
  Calen Pennington committed Mar 31, 2015
  
  bf62c4b7 Browse Files
30 Mar, 2015 2 commits
- Make XBlockToXModuleShim use json-init-args to record the XModule constructor to shim to · b50876fc
  Calen Pennington committed Mar 30, 2015
  
  b50876fc Browse Files
- Clean up tests in preparation for switching Vertical from an XModule to an XBlock · 1f17538d
  Calen Pennington committed Mar 30, 2015
  
  1f17538d Browse Files
27 Mar, 2015 1 commit
- Merge pull request #7490 from edx/ned/dont-put-test-data-in-working-tree · 33361a05
```
Don't use the working tree as storage for test-created files.
```
  Ned Batchelder committed Mar 27, 2015
  33361a05 Browse Files
26 Mar, 2015 19 commits
- Merge pull request #7469 from edx/jeskew/datadog_events_vs_compat · c5e198f7
```
Squashed and tests passed - merging.
```
  John Eskew committed Mar 26, 2015
  c5e198f7 Browse Files
- Add datadog counters everywhere a "VS[compat]" comment exists. · 34adb256
```
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
```
  John Eskew committed Mar 26, 2015
  34adb256 Browse Files
- Merge pull request #7494 from edx/benp/flag-cohort-test-flaky · 5615f0bf
```
Fix empty promise. It was always evaluating to true.
```
  Ben Patterson committed Mar 26, 2015
  5615f0bf Browse Files
- Merge pull request #7480 from edx/clee/MA-169_MA-77 · 44235108
```
Clee/ma 169 ma 77
```
  Christopher Lee committed Mar 26, 2015
  44235108 Browse Files
- Merge pull request #7492 from edx/release · c2dcbd70
```
Release
```
  Adam committed Mar 26, 2015
  c2dcbd70 Browse Files
- MA-77 Auto VAL clone course · e8dfac09
```
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
```
  christopher lee committed Mar 26, 2015
  e8dfac09 Browse Files
- Merge pull request #7439 from edx/benp/add-markdown-tests · 93068e0a
```
Benp/add markdown tests
```
  Ben Patterson committed Mar 26, 2015
  93068e0a Browse Files
- Fix empty promise. It was always evaluating to true. · dae5cdfc
```
This addresses TNL-1808 (and likely other flaky tests
in this area).
```
  Ben Patterson committed Mar 26, 2015
  dae5cdfc Browse Files
- Merge pull request #7457 from edx/db/openedx-logo-on-edx.org · c856b6dc
```
"Powered by Open edX" logo on edx.org footer
```
  David Baumgold committed Mar 26, 2015
  c856b6dc Browse Files
- Merge pull request #7489 from edx/hotfix/2015-03-26 · a3744190
```
default discussion modules' discussion_id field to xblock's UNIQUE_FIELD...
```
  Adam committed Mar 26, 2015
  a3744190 Browse Files
- Opening wiki editor should be extracted into a method. · b03c4eca
  Ben Patterson committed Mar 26, 2015
  
  b03c4eca Browse Files
- Add course wiki acceptance tests. · 6e2e40cc
  Ben Patterson committed Mar 26, 2015
  
  6e2e40cc Browse Files
- Fix footer stylings for RTL · d66bb883
  Sarina Canelake committed Mar 26, 2015
  
  d66bb883 Browse Files
- Adjust styling for Open edX footer details · 67168869
  Brian Talbot committed Mar 26, 2015
  
  67168869 Browse Files
- Put Open edX logo in CMS footer · 8abfe4a8
  David Baumgold committed Mar 26, 2015
  
  8abfe4a8 Browse Files
- Put Open edX logo in LMS edx.org footer · 89252ec1
  David Baumgold committed Mar 26, 2015
  
  89252ec1 Browse Files
- Don't use the working tree as storage for test-created files. · 84f6e118
  Ned Batchelder committed Mar 26, 2015
  
  84f6e118 Browse Files
- Merge pull request #7481 from edx/clytwynec/flaky-mathjax · 9edda950
```
update bokchoy with fix for TNL-1770
```
  Christine Lytwynec committed Mar 26, 2015
  9edda950 Browse Files
- default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) · 43abe399
  Adam Palay committed Mar 26, 2015
  
  43abe399 Browse Files
25 Mar, 2015 9 commits
- update bokchoy with fix for TNL-1770 · 3a8716a3
  Christine Lytwynec committed Mar 25, 2015
  
  3a8716a3 Browse Files
- Merge pull request #7475 from edx/adjust-indentation · 609b1144
```
Fix whitespace
```
  David Baumgold committed Mar 25, 2015
  609b1144 Browse Files
- MA-169 return requested val encoded video profiles · 3b150da1
```
MA-169 Mobile api now calls for mobile_low (default), mobile_high,
 and youtube profiles instead of only mobile_low.
```
  christopher lee committed Mar 25, 2015
  3b150da1 Browse Files
- Merge pull request #7454 from edx/andya/user-api-transaction-handling · 3f07660d
```
Clean up transactional behavior in User API
```
  Christina Roberts committed Mar 25, 2015
  3f07660d Browse Files
- Clean up transactional behavior in User API · a9dce7c3
  Andy Armstrong committed Mar 25, 2015
  
  a9dce7c3 Browse Files
- Merge branch 'release' · 8107f803
  Matt Drayer committed Mar 25, 2015
  
  8107f803 Browse Files
- Fix whitespace · 6840ced4
```
Don't mix tabs and spaces!
```
  David Baumgold committed Mar 25, 2015
  6840ced4 Browse Files
- Merge pull request #7453 from edx/will/ecom-1198 · aeff0880
```
ECOM-1198: Login/Registration page can skip track selection.
```
  Will Daly committed Mar 25, 2015
  aeff0880 Browse Files
- Login/Registration page can skip track selection. · 735b4009
```
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
```
  Will Daly committed Mar 25, 2015
  735b4009 Browse Files
24 Mar, 2015 1 commit
- Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context · e1251bfe
```
adds additional context for SR users and corrects heading order
```
  Mark Sadecki committed Mar 24, 2015
  e1251bfe Browse Files