Commits · e984ca15a13a743ea138d8065a5485e96a2c5640 · edx / edx-platform · GitLab

09 Jul, 2014 1 commit
- Add revert_to_published method. · e984ca15
```
STUD-1860
```
  cahrens committed Jul 09, 2014
  e984ca15 Browse Files
08 Jul, 2014 7 commits
- Merge pull request #4341 from edx/db/release-script-always-fetch · 45084258
```
Always call `git fetch edx` before finding PR branches
```
  David Baumgold committed Jul 08, 2014
  45084258 Browse Files
- Always call `git fetch edx` before finding PR branches · 326ca21d
  David Baumgold committed Jul 08, 2014
  
  326ca21d Browse Files
- Merge pull request #4326 from edx/andya/fix-stud-1948 · 4cb1a510
```
Fix user handling bug in split test module
```
  Andy Armstrong committed Jul 08, 2014
  4cb1a510 Browse Files
- Fix user handling bug in split test module · afb311ff
```
STUD-1948
```
  Andy Armstrong committed Jul 08, 2014
  afb311ff Browse Files
- Merge pull request #4323 from edx/will/ora2-release-2014-07-07T19.28 · d352d4ae
```
ORA2 release-2014-07-07T19.28
```
  Will Daly committed Jul 08, 2014
  d352d4ae Browse Files
- ORA2 release-2014-07-07T19.28 · e5823375
  Will Daly committed Jul 08, 2014
  
  e5823375 Browse Files
- Merge pull request #4320 from edx/merge-rc-to-master · 115d8c64
```
Merge rc to master
```
  Adam committed Jul 08, 2014
  115d8c64 Browse Files
07 Jul, 2014 9 commits
- Revert "First attempt to fix split test" · 5f11aa9a
```
This reverts commit a16f5487.
```
  Andy Armstrong committed Jul 07, 2014
  5f11aa9a Browse Files
- First attempt to fix split test · a16f5487
  Andy Armstrong committed Jul 07, 2014
  
  a16f5487 Browse Files
- Merge pull request #4315 from edx/bug/delete_draft · 356da9ca
```
Deleting a child of a unit should convert the unit to draft
```
  Don Mitchell committed Jul 07, 2014
  356da9ca Browse Files
- Merge pull request #4314 from edx/sarina/070714-language-update · cda3d296
```
Sarina/070714 language update
```
  Sarina Canelake committed Jul 07, 2014
  cda3d296 Browse Files
- Merge branch 'rc/2014-07-02' into testmergemaster · d63a5abf
```
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
```
  Adam Palay committed Jul 07, 2014
  d63a5abf Browse Files
- Merge pull request #4316 from edx/anton/group-experiments · 34ac6abe
```
BLD-1117, BLD-1217: Add read-only list of Group Configurations, Create feature flag.
```
  Tim Babych committed Jul 07, 2014
  34ac6abe Browse Files
- Clean up i18n paver commands · a9b35ab2
  Sarina Canelake committed Jul 07, 2014
  
  a9b35ab2 Browse Files
- Update translations (autogenerated message) · 1b37c0b4
  Sarina Canelake committed Jul 07, 2014
  
  1b37c0b4 Browse Files
- Deleting a child of a unit should convert the unit to draft · 1f71a67a
```
if the unit is draftable but isn't yet draft.
```
  Don Mitchell committed Jul 07, 2014
  1f71a67a Browse Files
04 Jul, 2014 1 commit
- Hide GroupConfiguration behind feature flag in cms/templates/settings.html. · 453c5837
  Tim Babych committed Jul 04, 2014
  
  453c5837 Browse Files
03 Jul, 2014 18 commits
- Merge pull request #4306 from edx/db/openedx-analytics · 1bc48af7
```
Add openedx-analytics discussion group to CONTRIBUTING file
```
  David Baumgold committed Jul 03, 2014
  1bc48af7 Browse Files
- Merge pull request #4302 from edx/benmcmorran/fix-has-changes · 62d0e534
```
Fixes has_changes to search all the way to leaf nodes
```
  Christina Roberts committed Jul 03, 2014
  62d0e534 Browse Files
- Merge pull request #4299 from edx/clytwynec/skip_update_assets_for_unittests · 71ae04b9
```
skipping update assets, not just collectstatic, in unit tests
```
  clytwynec committed Jul 03, 2014
  71ae04b9 Browse Files
- Update AUTHORS · 890eba26
  swdanielli committed Jul 03, 2014
  
  890eba26 Browse Files
- Add openedx-analytics discussion group to CONTRIBUTING file · 05d6c630
  David Baumgold committed Jul 03, 2014
  
  05d6c630 Browse Files
- Merge pull request #4304 from rocha/display-na-on-instructor-dashboard · d11bb29c
```
Use deprecated course_key when calling the analytics API.
```
  Carlos Andrés Rocha committed Jul 03, 2014
  d11bb29c Browse Files
- Use deprecated course_key when calling the analytics API. · 19396789
```
Previously it was serializing the course_key directly, which is not
interpreted correctly by the API.
```
  Carlos Andrés Rocha committed Jul 03, 2014
  19396789 Browse Files
- skipping update assets, not just collectstatic, in unit tests · 52bc1754
  Christine Lytwynec committed Jul 03, 2014
  
  52bc1754 Browse Files
- Merge pull request #4301 from rocha/display-na-on-instructor-dashboard · 2518d8e9
```
Don't show 500 errors if connection to data API fails
```
  Carlos Andrés Rocha committed Jul 03, 2014
  2518d8e9 Browse Files
- Don't show 500 errors if connection to data API fails · 5be08cc2
```
Some of the metrics on the instructor dashboard are computed by the new
analytics data pipeline. Don't show 500 errors if the connection to the
pipeline API fails. Instead display that the data is not available and
log an error.

AN-1476
```
  Carlos Andrés Rocha committed Jul 03, 2014
  5be08cc2 Browse Files
- Fixes has_changes to search all the way to leaf nodes · db5dd34a
  Ben McMorran committed Jul 03, 2014
  
  db5dd34a Browse Files
- Merge pull request #4287 from louyihua/localization-cms · 30c573c7
```
Missing "_()" in course_module.py
```
  Andy Armstrong committed Jul 03, 2014
  30c573c7 Browse Files
- Merge pull request #4267 from edx/tim/feature-group-configurations · cfbf317b
```
BLD-1217: Create feature flag for switching Group Configurations editing on and off
```
  Tim Babych committed Jul 03, 2014
  cfbf317b Browse Files
- Merge pull request #4289 from edx/will/revert-ora2-release · c7f66715
```
Revert ORA2 release
```
  Will Daly committed Jul 03, 2014
  c7f66715 Browse Files
- Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. · a153092c
  Tim Babych committed Jul 03, 2014
  
  a153092c Browse Files
- Merge pull request #4286 from louyihua/studio-advanced-settings-localization · b48bf54f
```
Make the strings in "Advanced Settings" page localizable
```
  Andy Armstrong committed Jul 03, 2014
  b48bf54f Browse Files
- Make the strings in "Advanced Settings" page localizable · ac8d6fc1
```
The fields should be translated before render into html templates.
```
  louyihua committed Jul 03, 2014
  ac8d6fc1 Browse Files
- Missing "_()" in course_module.py · ba30f038
  louyihua committed Jul 03, 2014
  
  ba30f038 Browse Files
02 Jul, 2014 4 commits
- Merge pull request #4273 from edx/benmcmorran/subtree-edited-info · 19527439
```
Adds subtree_edited_on, subtree_edited_by, and fixes has_changes
```
  Ben McMorran committed Jul 02, 2014
  19527439 Browse Files
- Merge pull request #4291 from edx/forum-sidebar-improvements · be04740e
```
Forum sidebar improvements
```
  Greg Price committed Jul 02, 2014
  be04740e Browse Files
- Adds subtree_edited_on, subtree_edited_by, and fixes has_changes · a59f8494
  Ben McMorran committed Jul 02, 2014
  
  a59f8494 Browse Files
- Update discussion tab sidebar header · 6d87443a
```
The home button is removed, the search box is always displayed, and many
visual adjustments are made, along with a large amount of refactoring.

Originally reviewed in #4211
```
  Greg Price committed Jul 02, 2014
  6d87443a Browse Files