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

43164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sofiya Semenova
6fd66fdc89 Educator-986 large space in show answer view for instructors 2017-08-01 18:19:19 +00:00
cahrens
5077ab5897 Django-wiki upgrades. 
EDUCATOR-784, EDUCATOR-1065
 2017-08-01 14:10:58 -04:00
Calen Pennington
fb905e547b Merge pull request #15709 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-01 13:45:08 -04:00
sanfordstudent
903bb6ab3f Merge pull request #15682 from edx/sstudent/cms_cert_date 
add cert available date to CMS settings
 2017-08-01 13:23:32 -04:00
Sanford Student
bf7b3eab1a add cert available date to CMS settings 2017-08-01 10:44:42 -04:00
Calen Pennington
68df7b80e3 Add course_end to the list of experiment fields put in the DOM 2017-08-01 10:14:35 -04:00
Calen Pennington
1edd367008 Add course_start to the fields, and put all fields on the track selection page 2017-08-01 10:14:35 -04:00
Calen Pennington
384f22ff96 Add per-user metadata to course pages to make experimentation easier 2017-08-01 10:14:35 -04:00
Muzaffar yousaf
02c28a3803 Merge pull request #15698 from edx/bump-val-version 
Bump edxval version
 2017-08-01 13:58:58 +05:00
muzaffaryousaf
2cdb9de5fb Bump edxval version 
This add CourseVideo table to Django Admin.

EDUCATOR-1036
 2017-08-01 12:03:41 +05:00
Douglas Hall
06ea32c5cb Merge pull request #15703 from edx/douglashall/upgrade_enterprise_0_39_3 
Upgrading edx-enteprise package to 0.39.3.
 2017-07-31 19:31:17 -04:00
Tyler Hallada
c51c47f524 Fix tests 2017-07-31 18:41:32 -04:00
Tyler Hallada
5276070e08 Bad copy and paste 2017-07-31 17:51:26 -04:00
Tyler Hallada
b63fc6251a The kwargs are still wrong... 2017-07-31 17:48:46 -04:00
Tyler Hallada
08e04dbd63 Fix circular import of signals from services 2017-07-31 17:25:41 -04:00
Douglas Hall
f1f22f4794 Upgrading edx-enteprise package to 0.39.3. 2017-07-31 17:20:00 -04:00
Tyler Hallada
10ed05ee93 Merge remote-tracking branch 'origin/master' into EDUCATOR-926 2017-07-31 17:03:05 -04:00
Michael Youngstrom
2f0e4ece2b Merge pull request #15704 from edx/youngstrom/jasmine_requirement 
Pin Jasmine version to fix js failures
 2017-07-31 16:53:52 -04:00
Tyler Hallada
750f30b273 Pass event transaction id & type to recalculate 2017-07-31 16:52:42 -04:00
Tyler Hallada
735824e2cd Fix recalculate async kwargs 2017-07-31 16:21:13 -04:00
Michael Youngstrom
f66521545a Pin Jasmine version to avoid failing js tests 2017-07-31 16:04:39 -04:00
John Eskew
79c0849b0e Merge pull request #15297 from edx/jeskew/paver_matching_edxapp_devstack_prereqs 
Mirror the devstack prereqs in CircleCI and paver install_prereqs.
 2017-07-31 14:13:12 -04:00
Alex Dusenbery
cc6f8be8fb EDUCATOR-1029 | More defensive version of ZeroSubsectionGrade.problem_scores 2017-07-31 13:44:15 -04:00
Tyler Hallada
dc484b8099 Fix the expected_timestamp recalculate arg 2017-07-31 12:27:26 -04:00
Tyler Hallada
e8cb7b7738 Custom one-to-one field for ref to custom id field 2017-07-31 11:57:20 -04:00
Tyler Hallada
6b97c1bdcb Add a rel_db_type to UnsignedBigIntAutoField 2017-07-31 11:23:28 -04:00
Tyler Hallada
26fcbefee1 Add migration for new overrides table 2017-07-28 16:57:25 -04:00
Tyler Hallada
f41cf12134 Only attempt to delete grade override if exists 2017-07-28 15:51:49 -04:00
John Eskew
19a5aa7d44 Merge pull request #15684 from edx/jeskew/enable_django_debug_toolbar 
Only display debug toolbar on non-ajax requests.
 2017-07-28 15:47:09 -04:00
Clinton Blackburn
5db02ef673 Added support for dynamic upgrade deadlines 
The verified seat upgrade deadline for self-paced course runs is now
dependent on when the learner was first able to access the content--the
latest of enrollment date and course run start date.
 2017-07-28 15:44:35 -04:00
John Eskew
80538211cd Merge pull request #15687 from ubc/ubcpi-0.6.4 
Update UBCPI to 0.6.4
 2017-07-28 11:26:09 -04:00
Sofiya Semenova
366cc044be Merge pull request #15635 from edx/ssemenova/ed-699 
Educator-699 Modify deleted group warning on the unit/container page
 2017-07-28 07:23:11 -07:00
Andy Armstrong
d8a8d7957d Merge pull request #15686 from edx/andya/openedx-i18n 
Collect translation strings from the openedx folder
 2017-07-28 09:12:40 -04:00
Pan Luo
7e0c7177d7 Update UBCPI to 0.6.4 2017-07-28 01:47:28 -07:00
Andy Armstrong
d247fe63bb Merge pull request #15643 from edx/andya/site-theme-preview 
Implement theme admin UI to support previewing
 2017-07-27 20:33:07 -04:00
Tyler Hallada
e4a9bef8d5 Trigger recalculate subsection, undo override 2017-07-27 18:27:56 -04:00
Andy Armstrong
8a7947c803 Collect translation strings from the openedx folder 
LEARNER-2112
 2017-07-27 17:47:20 -04:00
Andy Armstrong
0f808cec78 Implement theme admin UI to support previewing 
LEARNER-2017
 2017-07-27 17:24:31 -04:00
John Eskew
f1b13595c0 Only display debug toolbar on non-ajax requests. 2017-07-27 16:59:08 -04:00
Sofiya Semenova
d888498038 EDUCATOR-699 Modify deleted group warning on the unit/container page 
EDUCATOR-1001 Fix language for visibility editor and validation to include units
 2017-07-27 20:55:07 +00:00
Sofiya Semenova
8eb4e469ff Merge pull request #15675 from edx/ssemenova/ed-9 
Educator-9 Removed comment about changing warning to exception
 2017-07-27 13:47:56 -07:00
Douglas Hall
af1fa2b6e7 Merge pull request #15679 from edx/douglashall/upgrade_enterprise_0_39_1 
Upgrade edx-enterprise package to 0.39.1.
 2017-07-27 15:22:35 -04:00
Sofiya Semenova
18bd532013 Educator-9 Remove comment 2017-07-27 18:54:51 +00:00
Jeremy Bowman
c7db5d894e Merge pull request #15674 from edx/jmbowman/PLAT-1590 
PLAT-1590 Fixes for Docker Devstack e2e tests
 2017-07-27 14:40:27 -04:00
Jeff LaJoie
8b24b29ae9 Merge pull request #15605 from edx/jlajoie/EDUCATOR-842 
EDUCATOR-842: adds in management command for verified_tracks
 2017-07-27 13:09:50 -04:00
John Eskew
4aa1c4b010 Merge pull request #15681 from mitodl/pdpinch/bump-edx-sga 
bump edx-sga XBlock to v0.6.4
 2017-07-27 12:47:58 -04:00
Sven Marnach
22cc8afb98 Respect BATCH_ENROLLMENT_NOTIFY_USERS_DEFAULT setting for subsequent batches. 2017-07-27 18:46:15 +02:00
David Ormsbee
7ce1da9c65 Merge pull request #15680 from edx/ormsbee/readd_to_bt_cache_on_miss 
Re-add to BlockStructure cache on miss.
 2017-07-27 12:20:36 -04:00
Peter Pinch
e461a6a619 bumping edx-sga xBlock to 0.6.4 2017-07-27 11:30:40 -04:00
Clinton Blackburn
835cc0871c Removed usage of LogoutViewConfiguration 
This model will soon be deleted.

LEARNER-2042
 2017-07-27 11:29:43 -04:00