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

8756 Commits

Author SHA1 Message Date
Braden MacDonald
dbbbe8f2cb Fix: inadvertent scroll when loading the instructor's extensions tab 
(The div with id "view-extensions" conflicts with the tab JS which sets location.hash to "view-x" in order to track the current tab)
 2014-08-19 23:18:31 -07:00
jhelbert
92fa79dbd0 Merge pull request #4871 from edx/jhelbert/api-upgrade-check 
This confirms the data api upgrade
 2014-08-19 16:36:29 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
Will Daly
43368b29b0 Merge pull request #4886 from edx/will/ecom-122 
Fix messaging for professional ed under auto-registration
 2014-08-19 14:58:18 -04:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support 
Microsites alongside Theme
 2014-08-19 12:39:21 -04:00
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
Will Daly
f26e88bdd9 Fix messaging for professional ed under auto-registration 2014-08-19 07:53:26 -04:00
Don Mitchell
8d070e6422 Rewrite course url matcher to not be greedy 
LMS-11181
 2014-08-18 16:18:22 -04:00
Renzo Lucioni
326deb37c2 Mark calls to track() on pageload as noninteraction events 2014-08-18 14:51:16 -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
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
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
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
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
Will Daly
88ebac4faf Use English for the marketing site buttons in an edx-controlled domain 2014-08-14 16:00:44 -04:00
Sarina Canelake
19ca6c845c Minor i18n fixes prompted by translators 2014-08-14 14:58:26 -04:00
Christine Lytwynec
bdc4fd4d86 set root logging level for acceptance tests to ERROR 2014-08-14 14:18:51 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02: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
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
Julia Hansbrough
2204eb7390 Fixed merge conflict between release and master. 2014-08-13 18:11:30 +00:00
Will Daly
680d5031d7 Merge pull request #4802 from edx/will/unit-test-staticfiles 
Unit tests don't need assets
 2014-08-12 16:42:19 -04:00
Will Daly
a827df27fe Remove update assets from unit test suite 
Update settings so unit tests pass
 2014-08-12 15:08:39 -04:00
Brian Talbot
5caaec7b82 LMS: adding rendering/styling support for initial professional ed course types on student dashboard 2014-08-12 18:45:10 +00:00
Will Daly
905ce6319c Add integration tests for professional ed flow 2014-08-12 18:44:58 +00:00
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode. 
ECOM-41
 2014-08-12 18:44:46 +00:00
Julia Hansbrough
805c325653 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-12 18:44:40 +00:00
Renzo Lucioni
2ad9557403 Factor out Optimizely project ID 2014-08-12 14:20:30 -04:00
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Jason Bau
b55362b925 make unit tests respect mongo port/host settings (with default) 
settings are read in from environment variable
 2014-08-11 14:17:29 -07:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Sarina Canelake
9885b106af Remove banner from instructor dashboard 2014-08-10 00:46:10 -04:00
Julia Hansbrough
b9a285f1e7 Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button 
Redirect to show_reqs for prof ed
 2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-08 21:02:16 +00:00
Renzo Lucioni
37598e605e Merge pull request #4763 from edx/lms/add-optimizely 
Lms/add optimizely
 2014-08-08 16:28:55 -04:00
Renzo Lucioni
2380235fd7 Add Optimizely widget 2014-08-08 14:58:18 -04:00
Nimisha Asthagiri
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes 
Split/add and fixes
 2014-08-08 14:12:02 -04:00
Adam
26b08a0205 Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror 
Catch InvalidKeyError in course_id_from_url().
 2014-08-08 13:27:25 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00