Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,091 Commits 1 Branch 0 Tags
3aee8a2923cbb058e359bf8da712b50ec891787b
Commit Graph

25091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
3aee8a2923 Merge pull request #4876 from edx/web-analytics/noninteraction-events 
Mark calls to track() on pageload as noninteraction events
 2014-08-19 11:24:44 -04:00
David Baumgold
b9eaf32985 Merge pull request #4875 from edx/db/edx-wiki-to-openedx 
Update comments to point to openedx.atlassian.net
 2014-08-19 10:23:27 -04:00
Jesse Zoldak
fc285ee486 Merge pull request #4864 from edx/ammar/fix-pause-state-promise-broken-issue 
Fix Video Player Pause Issue
 2014-08-19 10:20:05 -04:00
Don Mitchell
a3c2a54bbf Merge pull request #4877 from edx/dhm/course_id_pattern 
Rewrite course url matcher to not be greedy
 2014-08-18 18:01:57 -04:00
Don Mitchell
716f5dfd2d Merge pull request #4878 from edx/dhm/split_branch_agnostic 
Make it branch agnostic
 2014-08-18 17:11:10 -04:00
Don Mitchell
3c3a316f08 Make it branch agnostic 
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
 2014-08-18 16:19:46 -04:00
Don Mitchell
8d070e6422 Rewrite course url matcher to not be greedy 
LMS-11181
 2014-08-18 16:18:22 -04:00
Alison Hodges
2c366427bc Merge pull request #4865 from edx/ahodges/doc/DOC815 
Added a relaunch invitation template email
 2014-08-18 15:51:01 -04:00
Alison Hodges
bcbe2657e3 Added a relaunch invitation template email 2014-08-18 15:50:18 -04:00
David Baumgold
2e02cefc90 Update comments to point to openedx.atlassian.net 
And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
 2014-08-18 15:34:06 -04:00
Renzo Lucioni
326deb37c2 Mark calls to track() on pageload as noninteraction events 2014-08-18 14:51:16 -04:00
Sarina Canelake
cbffcd2fbb Merge pull request #4867 from louyihua/localization-cms 
Translation & secure-aware changes to studio's settings page
 2014-08-18 13:50:18 -04:00
louyihua
14cd7d7763 Translation & secure-aware changes to studio's settings page 
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.
 2014-08-19 01:13:23 +08:00
Muhammad Ammar
ebee3c406e Fix Video Player Pause Issue 2014-08-18 13:18:15 +00:00
Daniel Friedman
70d47fb54d Merge pull request #4740 from edx/dan-ben/staff-lock-outline 
Add ability to set staff lock from course outline
 2014-08-16 18:02:02 -04:00
Ben McMorran
12a5781725 Add ability to set staff lock from course outline 2014-08-16 15:58:42 -04:00
Don Mitchell
23d78fe7fc Merge pull request #4803 from edx/dhm/import_split_test 
Dhm/import split test
 2014-08-15 17:23:33 -04:00
Don Mitchell
3b43f34b20 XML export maps keys into xml expected format 2014-08-15 16:02:48 -04:00
Sarina Canelake
b6f82a949f Merge pull request #4848 from Stanford-Online/njdupoux/no-pending-instructor-tasks 
Instructor Dash: Display message when no tasks running
 2014-08-15 14:31:23 -04:00
njdup
93d088505f Instructor Dash: Display message when there are no tasks running 
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.
 2014-08-15 10:35:01 -07:00
Alexander Kryklia
ccf85a9431 Merge pull request #4777 from edx/anton/sync-groups-and-verticals 
Anton/sync groups and verticals
 2014-08-15 20:15:12 +03:00
clytwynec
310778dfa7 Merge pull request #4838 from edx/clytwynec/remove_warnings_from_lettuce_test_logs 
set root logging level for acceptance tests to ERROR
 2014-08-15 13:08:56 -04:00
Christina Roberts
33815f1cc5 Merge pull request #4853 from edx/christina/stud-2093 
Add a request-token to identify which xblock html was rendered as part o...
 2014-08-15 12:55:34 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register 
Auto enroll students even if there are multiple course modes
 2014-08-15 11:11:19 -04:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Sarina Canelake
5f14959231 Merge pull request #4846 from edx/db/update-i18n-tools 
Update i18n-tools
 2014-08-15 11:02:11 -04:00
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