Commits · f26e88bdd95daa7e8e6b8331127ee26289142261 · edx / edx-platform

19 Aug, 2014 1 commit
- Fix messaging for professional ed under auto-registration · f26e88bd
  Will Daly committed Aug 19, 2014
  
  f26e88bd Browse Files
18 Aug, 2014 8 commits
- Merge pull request #4877 from edx/dhm/course_id_pattern · a3c2a54b
```
Rewrite course url matcher to not be greedy
```
  Don Mitchell committed Aug 18, 2014
  a3c2a54b Browse Files
- Merge pull request #4878 from edx/dhm/split_branch_agnostic · 716f5dfd
```
Make it branch agnostic
```
  Don Mitchell committed Aug 18, 2014
  716f5dfd Browse Files
- Make it branch agnostic · 3c3a316f
```
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
```
  Don Mitchell committed Aug 18, 2014
  3c3a316f Browse Files
- Rewrite course url matcher to not be greedy · 8d070e64
```
LMS-11181
```
  Don Mitchell committed Aug 18, 2014
  8d070e64 Browse Files
- Merge pull request #4865 from edx/ahodges/doc/DOC815 · 2c366427
```
Added a relaunch invitation template email
```
  Alison Hodges committed Aug 18, 2014
  2c366427 Browse Files
- Added a relaunch invitation template email · bcbe2657
  Alison Hodges committed Aug 18, 2014
  
  bcbe2657 Browse Files
- Merge pull request #4867 from louyihua/localization-cms · cbffcd2f
```
Translation & secure-aware changes to studio's settings page
```
  Sarina Canelake committed Aug 18, 2014
  cbffcd2f Browse Files
- Translation & secure-aware changes to studio's settings page · 14cd7d77
```
1. Change the link of course's about page secure aware, which displays 'https' or 'http' prefix according to the current protocol.
2. Make the email in this page translatable.
```
  louyihua committed Aug 19, 2014
  14cd7d77 Browse Files
16 Aug, 2014 2 commits
- Merge pull request #4740 from edx/dan-ben/staff-lock-outline · 70d47fb5
```
Add ability to set staff lock from course outline
```
  Daniel Friedman committed Aug 16, 2014
  70d47fb5 Browse Files
- Add ability to set staff lock from course outline · 12a57817
  Ben McMorran committed Aug 16, 2014
  
  12a57817 Browse Files
15 Aug, 2014 17 commits
- Merge pull request #4803 from edx/dhm/import_split_test · 23d78fe7
```
Dhm/import split test
```
  Don Mitchell committed Aug 15, 2014
  23d78fe7 Browse Files
- XML export maps keys into xml expected format · 3b43f34b
  Don Mitchell committed Aug 15, 2014
  
  3b43f34b Browse Files
- Merge pull request #4848 from Stanford-Online/njdupoux/no-pending-instructor-tasks · b6f82a94
```
Instructor Dash: Display message when no tasks running 
```
  Sarina Canelake committed Aug 15, 2014
  b6f82a94 Browse Files
- Instructor Dash: Display message when there are no tasks running · 93d08850
```
This commit adds a message to the instructor dashboard that is displayed when
no instructor tasks are currently running. This message is displayed where the
instructor pending tasks table would normally be placed, and is replaced
with the table when there are running tasks.
```
  njdup committed Aug 15, 2014
  93d08850 Browse Files
- Merge pull request #4777 from edx/anton/sync-groups-and-verticals · ccf85a94
```
Anton/sync groups and verticals
```
  Alexander Kryklia committed Aug 15, 2014
  ccf85a94 Browse Files
- Merge pull request #4838 from edx/clytwynec/remove_warnings_from_lettuce_test_logs · 310778df
```
set root logging level for acceptance tests to ERROR
```
  clytwynec committed Aug 15, 2014
  310778df Browse Files
- Merge pull request #4853 from edx/christina/stud-2093 · 33815f1c
```
Add a request-token to identify which xblock html was rendered as part o...
```
  Christina Roberts committed Aug 15, 2014
  33815f1c Browse Files
- Sync children vertical names with group names in split test module. · 867a5c05
  polesye committed Aug 15, 2014
  
  867a5c05 Browse Files
- Merge pull request #4824 from edx/will/auto-register · 3cd4610b
```
Auto enroll students even if there are multiple course modes
```
  Will Daly committed Aug 15, 2014
  3cd4610b Browse Files
- Add a request-token to identify which xblock html was rendered as part of the current request · 50082387
```
[STUD-2903]
```
  Calen Pennington committed Aug 15, 2014
  50082387 Browse Files
- Merge pull request #4846 from edx/db/update-i18n-tools · 5f149592
```
Update i18n-tools
```
  Sarina Canelake committed Aug 15, 2014
  5f149592 Browse Files
- Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests · 4d5b9489
```
make unit tests respect mongo port/host settings (with default)
```
  Jesse Zoldak committed Aug 15, 2014
  4d5b9489 Browse Files
- Template changes for course track AB-test · 6f810836
  marco committed Aug 15, 2014
  
  6f810836 Browse Files
- Auto enroll students even if there are multiple course modes · 714f9bb6
```
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
```
  Will Daly committed Aug 15, 2014
  714f9bb6 Browse Files
- Merge pull request #4842 from edx/will/ecom-90 · 1a9f7938
```
Use English for the marketing site buttons in an edx-controlled domain
```
  Will Daly committed Aug 15, 2014
  1a9f7938 Browse Files
- Merge pull request #4755 from FiloSottile/mentoring_studio · d54b347c
```
Update the reference to gsehub/xblock-mentoring#4
```
  Calen Pennington committed Aug 15, 2014
  d54b347c Browse Files
- Merge pull request #4746 from Stanford-Online/njdupoux/instructor-email-history-fixes · c9395662
```
Email content history fix and additions
```
  Sarina Canelake committed Aug 14, 2014
  c9395662 Browse Files
14 Aug, 2014 12 commits
- Email content history fix and additions · 55521590
```
This addresses a bug in the email content history table where
"Unknown" was displayed in the number of emails sent column if any sort of
failure occurred during email sending. This behavior has been editted so now
the number of emails that failed to send is displayed, along with the number
of emails that were successfully sent. If the email task is still pending,
"0 sent" is displayed.

As a small addition, the table now also includes the authors of previously
sent emails, and the modal window for an email also displays its author.
```
  njdup committed Aug 14, 2014
  55521590 Browse Files
- Merge pull request #4841 from edx/sarina/minor-i18n-fixes · f3a03275
```
Minor i18n fixes prompted by translators
```
  Sarina Canelake committed Aug 14, 2014
  f3a03275 Browse Files
- Merge pull request #4844 from edx/release · c830537e
```
Release
```
  Adam committed Aug 14, 2014
  c830537e Browse Files
- Update i18n-tools · 79f3526c
  David Baumgold committed Aug 14, 2014
  
  79f3526c Browse Files
- Merge pull request #4832 from edx/hotfix/2014-08-14 · 09d86c22
```
Hotfix/2014 08 14
```
  Adam committed Aug 14, 2014
  09d86c22 Browse Files
- Use English for the marketing site buttons in an edx-controlled domain · 88ebac4f
  Will Daly committed Aug 14, 2014
  
  88ebac4f Browse Files
- Merge pull request #3784 from mtyaka/patch-1 · 5c64c5b2
```
Update django-splash.
```
  Feanil Patel committed Aug 14, 2014
  5c64c5b2 Browse Files
- Minor i18n fixes prompted by translators · 19ca6c84
  Sarina Canelake committed Aug 14, 2014
  
  19ca6c84 Browse Files
- Merge pull request #4818 from edx/jhelbert/contributing-generalization · 963f77e4
```
Generalizing CONTRIBUTING.rst to all repos
```
  jhelbert committed Aug 14, 2014
  963f77e4 Browse Files
- Generalizing CONTRIBUTING.rst to all repos · 260aa88c
  Justin Helbert committed Aug 14, 2014
  
  260aa88c Browse Files
- set root logging level for acceptance tests to ERROR · bdc4fd4d
  Christine Lytwynec committed Aug 14, 2014
  
  bdc4fd4d Browse Files
- jquery.immediateDescendents cannot be loaded until jQuery is loaded. · b5aaf8b0
```
STUD-1999
```
  cahrens committed Aug 14, 2014
  b5aaf8b0 Browse Files