Commits · b54dd4d83b5bd184b9d1c049d2bb992c4ece0a21 · edx / edx-platform · GitLab

21 Jul, 2014 14 commits
- Merge pull request #4503 from edx/markhoeber-release-notes-studio-urls · b54dd4d8
```
Added item for Studio URL changes to Release Notes
```
  Mark Hoeber committed Jul 21, 2014
  b54dd4d8 Browse Files
- Added item for Studio URL changes · 520108f9
  Mark Hoeber committed Jul 21, 2014
  
  520108f9 Browse Files
- Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title · 00377652
```
Remove course ID from title in course about page
```
  Ned Batchelder committed Jul 21, 2014
  00377652 Browse Files
- resolving merge conflicts · 7023eb4c
  John Jarvis committed Jul 21, 2014
  
  7023eb4c Browse Files
- Merge pull request #4495 from edx/ora2/release-2014-07-21T12.20 · 0d5c6ba3
```
Updating the ORA2 hash for July 21st, 2014
```
  Stephen Sanchez committed Jul 21, 2014
  0d5c6ba3 Browse Files
- Merge pull request #4433 from edx/sylvia/docs/rel_notes_7_16 · 4dac56e6
```
Add course author notes for 7/16 release
```
  srpearce committed Jul 21, 2014
  4dac56e6 Browse Files
- Merge pull request #4484 from edx/talbs/fix-new-course-copy · 70da8990
```
Studio: New Course Field Tip Copy Correction
```
  Brian Talbot committed Jul 21, 2014
  70da8990 Browse Files
- Add course author notes for 7/16 release · 0f340368
  Sylvia Pearce committed Jul 21, 2014
  
  0f340368 Browse Files
- Merge remote-tracking branch 'origin/release' into rc/2014-07-16 · a03134b3
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
```
  Nimisha Asthagiri committed Jul 21, 2014
  a03134b3 Browse Files
- Updating the ORA2 hash for July 21st, 2014 · 77d3c3fd
  Stephen Sanchez committed Jul 21, 2014
  
  77d3c3fd Browse Files
- Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors · c139c2a5
```
Don't update ancestors while bulk editing.
```
  Nimisha Asthagiri committed Jul 21, 2014
  c139c2a5 Browse Files
- Merge pull request #4025 from edx/zub/bugfix/std1725-duplicatefilesonimport · ce3d6f84
```
ignore MAC meta files on import and also remove any such files from the ...
```
  zubair-arbi committed Jul 21, 2014
  ce3d6f84 Browse Files
- ignore MAC meta files on import and also remove any such files from the course · cfa873cc
```
STUD-1725
```
  zubair-arbi committed Jul 21, 2014
  cfa873cc Browse Files
- Don't update ancestors while bulk editing. · 80f078cf
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
```
  Nimisha Asthagiri committed Jul 20, 2014
  80f078cf Browse Files
20 Jul, 2014 1 commit
- Studio: corrects new course field tip copy to reflect what provided course… · 9c9e4a90
```
Studio: corrects new course field tip copy to reflect what provided course values cannot be changed later
STUD-2001
```
  Brian Talbot committed Jul 20, 2014
  9c9e4a90 Browse Files
19 Jul, 2014 4 commits
- Merge pull request #4381 from edx/nimisha/split-converge-api · d53a6669
```
Nimisha/split converge api
```
  Nimisha Asthagiri committed Jul 19, 2014
  d53a6669 Browse Files
- Merge pull request #4488 from edx/christina/ispublic · 40625c45
```
ispublic is in active use by Stanford.
```
  Christina Roberts committed Jul 18, 2014
  40625c45 Browse Files
- split create_item and create_child out as separate methods · 483e2a6a
  Calen Pennington committed Jul 18, 2014
  
  483e2a6a Browse Files
- ispublic is in active use by Stanford. · 77a86602
  cahrens committed Jul 18, 2014
  
  77a86602 Browse Files
18 Jul, 2014 9 commits
- Merge pull request #4482 from edx/markhoeber/documentation/doc-666 · 19fbabee
```
Corrected diff between 0K and 0 C
```
  Mark Hoeber committed Jul 18, 2014
  19fbabee Browse Files
- Corrected diff between 0K and 0 C · 26e303c1
  Mark Hoeber committed Jul 18, 2014
  
  26e303c1 Browse Files
- Merge pull request #4477 from edx/studio/minimal-fix-import-performance · 23cb5499
```
Studio/minimal fix import performance
```
  Nimisha Asthagiri committed Jul 18, 2014
  23cb5499 Browse Files
- Merge pull request #4424 from edx/anton/edit-group-configurations · 39f1f009
```
Edit group configurations.
```
  Anton Stupak committed Jul 18, 2014
  39f1f009 Browse Files
- BLD-1099: Edit group configurations. · 2a6a874a
  polesye committed Jul 18, 2014
  
  2a6a874a Browse Files
- more split_draft methods · 06ef306f
  Mathew Peterson committed Jul 17, 2014
  
  06ef306f Browse Files
- converge Split APIs with Mixed and Draft · 7efd0cb4
  Nimisha Asthagiri committed Jul 17, 2014
  
  7efd0cb4 Browse Files
- don't update ancestors while bulk editing. · a501aa94
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
```
  Nimisha Asthagiri committed Jul 17, 2014
  a501aa94 Browse Files
- fix bulk_write context manager. · 682c9fff
  Nimisha Asthagiri committed Jul 17, 2014
  
  682c9fff Browse Files
17 Jul, 2014 12 commits
- Merge pull request #4466 from edx/cdodge/change-course-access-role-admin · 1c595998
```
make sure the CourseAccessRole Django ORM Admin page uses a raw_id so th...
```
  chrisndodge committed Jul 17, 2014
  1c595998 Browse Files
- Merge pull request #4469 from edx/jbau/dev-environments-disable-ANALYTICS_ACTIVE_COUNT · 6e5f9fdb
```
Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
```
  Jason Bau committed Jul 17, 2014
  6e5f9fdb Browse Files
- Merge pull request #4467 from edx/swli/rc-hotpatch-recommender · 44e9e6f3
```
hotpatch for recommender (learning science)
```
  swdanielli committed Jul 17, 2014
  44e9e6f3 Browse Files
- Merge pull request #4462 from edx/bug/delete_draft · 801dcd07
```
Piecemeal conversion to draft needs to allow
```
  Don Mitchell committed Jul 17, 2014
  801dcd07 Browse Files
- Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs · aac0fac3
  Jason Bau committed Jul 17, 2014
  
  aac0fac3 Browse Files
- Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io · adae7c6d
```
always include GA file
```
  Renzo Lucioni committed Jul 17, 2014
  adae7c6d Browse Files
- recommender prototype · 0fdc7624
  swdanielli committed Jul 17, 2014
  
  0fdc7624 Browse Files
- Piecemeal conversion to draft needs to allow · 1103d057
```
already converted children.
STUD-1965
```
  Don Mitchell committed Jul 17, 2014
  1103d057 Browse Files
- Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register · fb927dd7
```
fix shib reg from course about page
```
  Jason Bau committed Jul 17, 2014
  fb927dd7 Browse Files
- always include GA file · 77c3d15d
  Giulio Gratta committed Jul 17, 2014
  
  77c3d15d Browse Files
- Merge pull request #4464 from edx/jbau/remove-branch-setting-cache · be80e005
```
removing thread-local cache for branch_setting
```
  Jason Bau committed Jul 17, 2014
  be80e005 Browse Files
- Merge pull request #4303 from edx/danielli/recommender_prototype · e81c33ce
```
recommender prototype
```
  swdanielli committed Jul 17, 2014
  e81c33ce Browse Files