Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
26,516 Commits 1 Branch 0 Tags
dfd00a02762f6c53e3aaa4ea5670e4fdd1cc0fa4
Commit Graph

26516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes 
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
 2014-08-15 10:26:27 -04:00
Will Daly
1a9f793802 Merge pull request #4842 from edx/will/ecom-90 
Use English for the marketing site buttons in an edx-controlled domain
 2014-08-15 10:23:35 -04:00
Calen Pennington
d54b347c86 Merge pull request #4755 from FiloSottile/mentoring_studio 
Update the reference to gsehub/xblock-mentoring#4
 2014-08-15 08:50:11 -04:00
Sarina Canelake
c9395662e0 Merge pull request #4746 from Stanford-Online/njdupoux/instructor-email-history-fixes 
Email content history fix and additions
 2014-08-14 20:38:06 -04:00
njdup
55521590d1 Email content history fix and additions 
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.
 2014-08-14 15:12:31 -07:00
Sarina Canelake
f3a0327541 Merge pull request #4841 from edx/sarina/minor-i18n-fixes 
Minor i18n fixes prompted by translators
 2014-08-14 18:03:54 -04:00
Adam
c830537ea3 Merge pull request #4844 from edx/release 
Release
 2014-08-14 17:06:39 -04:00
David Baumgold
79f3526c6f Update i18n-tools 2014-08-14 17:05:10 -04:00
Adam
09d86c2281 Merge pull request #4832 from edx/hotfix/2014-08-14 
Hotfix/2014 08 14
 2014-08-14 16:34:23 -04:00
Will Daly
88ebac4faf Use English for the marketing site buttons in an edx-controlled domain 2014-08-14 16:00:44 -04:00
Feanil Patel
5c64c5b21f Merge pull request #3784 from mtyaka/patch-1 
Update django-splash.
 2014-08-14 15:03:20 -04:00
Sarina Canelake
19ca6c845c Minor i18n fixes prompted by translators 2014-08-14 14:58:26 -04:00
jhelbert
963f77e40e Merge pull request #4818 from edx/jhelbert/contributing-generalization 
Generalizing CONTRIBUTING.rst to all repos
 2014-08-14 14:55:51 -04:00
Justin Helbert
260aa88c52 Generalizing CONTRIBUTING.rst to all repos 2014-08-14 14:54:53 -04:00
Christine Lytwynec
bdc4fd4d86 set root logging level for acceptance tests to ERROR 2014-08-14 14:18:51 -04:00
cahrens
b5aaf8b01f jquery.immediateDescendents cannot be loaded until jQuery is loaded. 
STUD-1999
 2014-08-14 13:49:47 -04:00
Jesse Zoldak
eee0d35bfe Ignore errors on rmtree cleanup 2014-08-14 13:47:53 -04:00
cahrens
323a23f53a Verify loading indicator has been hidden. 
STUD-2090
 2014-08-14 13:47:30 -04:00
Matjaz Gregoric
16a2940977 Update django-splash. 
The new release supports wildcards in path exclusion rules.
 2014-08-14 19:03:41 +02:00
Adam
0edac1540d Merge pull request #4833 from edx/waheed/hotfix/2014-08-12 
Check REQUEST_CONTEXT.context exists before accessing it.
 2014-08-14 12:53:09 -04:00
Waheed Ahmed
d9ccaa650a Check REQUEST_CONTEXT.context exists before accessing it. 
LMS-11226
 2014-08-14 12:21:54 -04:00
Oleg Marshev
2ca86a8d87 Merge pull request #4735 from edx/oleg/validate-content-experiments 
BLD-1125: Validate content experiments after managing a group.
 2014-08-14 19:14:20 +03:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
Renzo Lucioni
1caa8cc41a Merge pull request #4827 from edx/ecom/include-optimizely 
Include Optimizely on the platform
 2014-08-14 10:15:12 -04:00
Sarina Canelake
9d4a28e962 Merge pull request #4826 from edx/sarina/jsme-hotfix 
Release edx-jsme 1.0
 2014-08-14 10:11:47 -04:00
Renzo Lucioni
3eaac3b839 Factor out Optimizely project ID 2014-08-14 10:08:52 -04:00
Chris Rossi
db13868f3e Release edx-jsme 1.0 2014-08-14 10:03:38 -04:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Sarina Canelake
c285bda69f Merge pull request #4625 from fmyzjs/ipv6 
Support ipv6 in geoinfo and Embargo
 2014-08-14 09:26:57 -04:00
Sarina Canelake
3c6a3bacd5 Merge pull request #4825 from edx/sarina/annotations-fixes 
Sarina/annotations fixes
 2014-08-14 09:17:50 -04:00
lduarte1991
c5f85eff87 Annotation Tools: Adding try-catch in case Annotator is missing from LMS 2014-08-14 09:14:29 -04:00
lduarte1991
c88bd15922 Annotation Tools: Adding comments and adding CSS groups 2014-08-14 09:14:24 -04:00
lduarte1991
e19878548a Annotation Tools: Adding Annotator to CMS 2014-08-14 09:14:18 -04:00
Sarina Canelake
244554f71f Merge pull request #4823 from lduarte1991/lduarte-harvardx-pr19 
Annotation Tools: Adding Annotator to CMS
 2014-08-14 09:13:14 -04:00
lduarte1991
f2b34d80ed - replaced tabs with 4 spaces 
- fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
 2014-08-14 08:51:52 -04:00
lduarte1991
a00a2de85b Annotation Tools: Explicit typecasting === changes and reorganizing plugins 2014-08-14 08:51:45 -04:00
Tim Babych
c12ed3ae9a Merge pull request #4808 from edx/tim/open-STUD-1264 
Documentation: create_sinon.js - update referenced JIRA issue.
 2014-08-14 12:18:13 +03:00
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00
lduarte1991
76b8891b69 Annotation Tools: Adding try-catch in case Annotator is missing from LMS 2014-08-13 22:05:42 -04:00
lduarte1991
8cfdb8f14c Annotation Tools: Adding comments and adding CSS groups 2014-08-13 21:35:37 -04:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Sarina Canelake
76516f52b8 Merge pull request #4796 from lduarte1991/lduarte-harvardx-pr18 
Annotation Tools: Fixing implicit typecasting and reordering plugins
 2014-08-13 20:38:09 -04:00
Christina Roberts
c389a445ae Merge pull request #4814 from edx/christina/bug-2090 
Verify loading indicator has been hidden.
 2014-08-13 15:41:42 -04:00
Julia Hansbrough
f02093f010 Merge pull request #4819 from edx/minimaster 
Resolving merge conflict between master and release
 2014-08-13 14:48:21 -04:00
Julia Hansbrough
2204eb7390 Fixed merge conflict between release and master. 2014-08-13 18:11:30 +00:00
cahrens
a35cbf1c63 Verify loading indicator has been hidden. 
STUD-2090
 2014-08-13 13:51:36 -04:00
Christina Roberts
7e975f78d0 Merge pull request #4815 from edx/christina/bug-1999 
jquery.immediateDescendents cannot be loaded until jQuery is loaded.
 2014-08-13 13:19:29 -04:00
Julia Hansbrough
9b53c80993 Merge pull request #4801 from edx/prof-ed-cherry-picked-changes 
hotfix-2014-08-12
 2014-08-13 13:04:41 -04:00