Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,952 Commits 1 Branch 0 Tags
040dfd698fd7dcc97626baf0a7b1d33ea3e09e16
Commit Graph

41952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mrey
040dfd698f Improve cookie consent message 2017-07-20 10:43:29 -07:00
Ned Batchelder
8ce7d86471 Merge pull request #15620 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-07-20 12:45:05 -04:00
George Song
141c0af0eb Merge pull request #15586 from jspayd/hide-passwords-upstream 
Hide passwords in crash reports
 2017-07-20 08:59:12 -07:00
Christina Roberts
42fffdfa9a Merge pull request #15614 from edx/christina/ed-945 
Upgrade xblock-lti-consumer.
 2017-07-20 10:20:49 -04:00
Harry Rein
ce87896fb6 Merge pull request #15609 from edx/HarryRein/LEARNER-1879-updates-image-styling 
Update Image Styling on Welcome Message and Updates
 2017-07-20 09:34:35 -04:00
cahrens
4f00b85d10 Upgrade xblock-lti-consumer. 
EDUCATOR-945
 2017-07-20 09:11:53 -04:00
Ned Batchelder
8702988000 Update translations (autogenerated message) 2017-07-20 11:52:03 +00:00
Christina Roberts
1922faf191 Merge pull request #15612 from edx/christina/fix-violations 
Fix safe lint violation.
 2017-07-19 20:43:03 -04:00
Douglas Hall
0b945270a3 Merge pull request #15601 from edx/asadiqbal08/ENT-508 
Updated the enterprise version
 2017-07-19 16:43:31 -04:00
cahrens
299fd0982f Fix safe lint violation. 2017-07-19 16:31:04 -04:00
asadiqbal
e604e66033 update version 2017-07-19 15:55:29 -04:00
Jeff LaJoie
aa5b8bed11 Merge pull request #15289 from edx/jlajoie/EDUCATOR-434 
EDUCATOR-434: Unit Group Access
 2017-07-19 15:32:02 -04:00
Harry Rein
3d610fd78d Merge pull request #15554 from edx/HarryRein/LEARNER-1652-course-tool-eventing 
Adding eventing to the course tools.
 2017-07-19 14:46:10 -04:00
Harry Rein
2658646e1e Fixing styling on updates. 
LEARNER-1879

Issues with images overflowing over their container divs and images being too large for the containing div. Also did a bit of cleanup to improve scss quality.
 2017-07-19 14:33:47 -04:00
Jeff LaJoie
1c90220462 EDUCATOR-434: Extends Course Outline Unit settings to allow Group Access configuration 2017-07-19 14:17:38 -04:00
Christina Roberts
e9e72aec89 Merge pull request #15596 from edx/christina/update-organizations 
Remove flaky wiki editing test
 2017-07-19 14:02:45 -04:00
Harry Rein
f2ef2b034a Adding eventing to the course tools. 
LEARNER-1652

We now send log events when the user clicks on the events in the course
toolbar, representing a change to the new page.
 2017-07-19 13:51:23 -04:00
Clinton Blackburn
2eea7606a3 Exposed ExperimentKeyValue model in Django admin 
The model data can now be viewed/managed via Django admin. Additionally, the verbose name of the model has been corrected.
 2017-07-19 12:27:51 -04:00
Christina Roberts
eadc099512 Merge pull request #15597 from edx/christina/revert-ed-60 
Restore more specific error messages.
 2017-07-19 11:03:38 -04:00
cahrens
67e61e878a Remove flaky editing test. 
EDUCATOR-511
 2017-07-19 10:52:33 -04:00
Marko Jevtić
9cf2d7ea5a Merge pull request #15600 from edx/mjevtic/LEARNER-442 
[LEARNER-1104] Allow staff members to view enrollment for any user
 2017-07-19 15:50:33 +02:00
Awais Jibran
d384c6dfd2 Merge pull request #15588 from edx/aj/masquerade_user_change_language 
Switching course view to specific student retains the profile language setting
 2017-07-19 18:47:00 +05:00
Marko Jevtic
2a7b41673b [LEARNER-1104] Allow staff members to view enrollment for any user 2017-07-19 12:45:24 +00:00
Awais Jibran
125552f204 Switching course view to specific student retains the profile language setting 
https://openedx.atlassian.net/browse/EDUCATOR-891
 2017-07-19 16:48:18 +05:00
Eric Fischer
2d6b477e83 Merge pull request #15593 from edx/efischer/edu-274_logging 
Add ActiveBulkThread record logging; CMS memory leak debug
 2017-07-18 15:45:03 -04:00
Gregory Martin
7799c4adf4 Merge pull request #15592 from edx/yro-cert-pacing-signal 
Course/Certificates Pacing Signal Registration
 2017-07-18 15:36:39 -04:00
cahrens
4e3ed8b5c6 Restore more specific error messages. 
EDUCATOR-929
 2017-07-18 15:21:00 -04:00
Jeremy Bowman
dfca1fa2fa Merge pull request #15574 from edx/jmbowman/PLAT-1619 
PLAT-1619 karma and bok-choy Docker Devstack fixes
 2017-07-18 15:04:02 -04:00
Eric Fischer
f7613819a0 Add ActiveBulkThread record logging; CMS memory leak debug 2017-07-18 14:56:53 -04:00
Eric Fischer
da931349d5 Merge pull request #15595 from edx/dahlia/EDU-949 
Skip flaky proctoring tests until we can fix them
 2017-07-18 14:39:14 -04:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Andy Armstrong
0bff61533d Merge pull request #15585 from edx/andya/learner-profile-as-feature 
[WIP] Refactor learner profile into openedx/features directory
 2017-07-18 14:24:44 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Gregory Martin
16945cc310 greening tests 2017-07-18 13:31:49 -04:00
Eric Fischer
03896448ce Skip flaky tests until we can fix them 2017-07-18 12:40:37 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory 
LEARNER-1855
 2017-07-18 12:30:12 -04:00
Brittney Exline
583719cce1 Merge pull request #15579 from open-craft/bdero/bulk-enroll 
Fix the BulkEnrollSerializer courses field to internally behave with strings and lists
 2017-07-18 11:32:08 -04:00
Gregory Martin
5189f2524d remove dupe 2017-07-18 11:19:26 -04:00
Gregory Martin
8b3f285d04 fix tests 2017-07-18 11:13:01 -04:00
Brittney Exline
b4c2b56109 Merge pull request #15583 from edx/bexline/revert_ent_457 
ENT-512 Revert ENT-457 to avoid production error noise
 2017-07-18 10:05:23 -04:00
Andy Armstrong
d58f2ac2db Merge pull request #15580 from edx/andya/course-home-messaging 
Show page banner for anonymous and unenrolled users
 2017-07-17 23:58:47 -04:00
Andy Armstrong
3e786ec6c5 Show page banner for anonymous and unenrolled users 
LEARNER-1697
 2017-07-17 22:19:40 -04:00
Joshua Spayd
97d5e3d8e0 Remove password hiding test code 2017-07-17 22:52:15 +00:00
Joshua Spayd
433477abe4 Hide passwords in register/login crash reports 
Includes code for testing to be removed in the next commit.
 2017-07-17 22:45:35 +00:00
Gregory Martin
e2c8fc53e8 add persistence 2017-07-17 17:57:30 -04:00
Gregory Martin
a82b73ed0c fix 2017-07-17 17:08:17 -04:00
Gregory Martin
7df91841ee cleanup 2017-07-17 15:44:29 -04:00
Ari Rizzitano
4370142a84 Merge pull request #15581 from edx/ari/flaky-problem-type-test 
mark test_problem_type_a11y as flaky
 2017-07-17 15:01:54 -04:00
Jesse Shapiro
0e8e3ad6a5 Merge pull request #15582 from open-craft/haikuginger/bump-enterprise-0.38.3 
Update Enterprise to 0.38.3 to fix dependency issues
 2017-07-17 14:57:09 -04:00
Brittney Exline
8c362d4df6 Revert "Create EnterpriseCourseEnrollment when enrolling via Track Selection page" 
This reverts commit d940bbfd09.
 2017-07-17 14:11:24 -04:00