Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,599 Commits 1 Branch 0 Tags
999fa418e58ef11b7783d60ba6e31eea9ee87f9c
Commit Graph

42599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uman Shahzad
999fa418e5 Merge pull request #15979 from open-craft/uman/ent-0.43.5 
[ENT-587] Bump edx-enterprise to 0.43.5
 2017-09-11 21:01:47 +05:00
sanfordstudent
c441244f66 Merge pull request #15993 from edx/sstudent/delete_test 
temporarily delete test failing on master
 2017-09-11 11:40:00 -04:00
Sanford Student
7e037b5a66 temporarily delete test failing on master 2017-09-11 11:23:44 -04:00
Noraiz Anwar
5cada093f1 Merge pull request #15870 from edx/noraiz/EDUCATOR-1089 
Do not overwrite external YouTube with value from VAL
 2017-09-11 19:18:02 +05:00
Nimisha Asthagiri
7de96486e7 Merge pull request #15961 from edx/ret/update-schedules-on-course-start-changes 
Update Schedules when start date changes on non-live courses
 2017-09-11 09:31:46 -04:00
noraiz-anwar
1203eb5835 Do not override Default Video URL with value from VAL 2017-09-11 17:27:53 +05:00
Clinton Blackburn
56eee715c1 Added support for deleting assets to delete_course management command 
The command now has an option to delete assets. This is relevant for
users of the split Mongo module store, which does not delete assets by
default.

Additionally, tests and docstrings have been updated.

LEARNER-2460
 2017-09-11 08:25:19 -04:00
Nimisha Asthagiri
5193649956 Update Schedules when start date changes on non-live courses 2017-09-10 08:41:26 -04:00
Marco Morales
0543748380 Merge pull request #15978 from edx/marcotuts/openedx-course-index/org-label-styling 
Org label styling on openedx course about pages
 2017-09-08 18:09:29 -04:00
Gabe Mulley
ccf8d13725 Merge pull request #15941 from edx/ret/update-nudge-templates 
update recurring nudge templates
 2017-09-08 13:02:13 -04:00
Gabe Mulley
8a8c9747a7 update template 2017-09-08 12:09:13 -04:00
sanfordstudent
28fd39f7b1 Merge pull request #15975 from edx/sstudent/EDUCATOR-1317 
common function for cert display date
 2017-09-08 11:21:33 -04:00
Uman Shahzad
feaee089d5 Bump edx-enterprise to 0.43.5 2017-09-08 20:03:16 +05:00
Marco Morales
6c3924b40b Org label styling on openedx course about pages 
Modify organization label on openedx course index pages to not look like a button. 

Current: 


With Changes:
 2017-09-08 11:03:02 -04:00
Sanford Student
4f977fb228 common function for cert display date 2017-09-08 10:05:30 -04:00
Noraiz Anwar
e6f807b0d7 Merge pull request #15977 from edx/revert-15924-ai/EDUCATOR-1267-add-logs 
Revert "EDUCATOR-1267 Add logs in importing the course."
 2017-09-08 15:09:41 +05:00
Noraiz Anwar
2d026d587e Revert "EDUCATOR-1267 Add logs in importing the course." 2017-09-08 11:08:41 +05:00
Sofiya Semenova
91ac97518b Merge pull request #15974 from edx/ssemenova/ed-1260 
Educator-1260 - Course teams unable to save changes to dates
 2017-09-07 16:41:22 -04:00
Gregory Martin
14364dc7eb Merge pull request #15955 from edx/yro/update_mobile_api_certs 
Update 'downloadable' status for mobile/other API
 2017-09-07 15:53:52 -04:00
Sofiya Semenova
9f2e96d4a0 ed-1260 Course teams unable to save changes to dates 2017-09-07 15:18:13 -04:00
Andy Armstrong
6062e45e2f Merge pull request #15976 from edx/andya/open-edx-theme 
Provide a first class Open edX theme
 2017-09-07 15:05:50 -04:00
Gregory Martin
c1dcb54a66 Update 'downloadable' status for mobile/other API 2017-09-07 14:25:01 -04:00
Andy Armstrong
94add3a49f Provide a first class Open edX theme 
LEARNER-2513
 2017-09-07 13:44:02 -04:00
Brittney Exline
8d89bdaa50 Merge pull request #15971 from edx/bexline/enterprise_version_bump 
ENT-615/ENT-617 Upgrade enterprise package to latest version
 2017-09-07 12:53:31 -04:00
Brittney Exline
053639ab62 ENT-615/ENT-617 Upgrade enterprise package to latest version 2017-09-07 11:02:33 -04:00
Harry Rein
c9f75f6bc8 Merge pull request #15926 from edx/HarryRein/FEDX-375-bootstrap-beta 
Harry rein/fedx 375 bootstrap beta
 2017-09-07 10:12:05 -04:00
Nimisha Asthagiri
5ac5149bef Merge pull request #15967 from edx/ret/no-schedules-for-instructor-led 
do not create schedules for instructor led courses
 2017-09-07 09:22:22 -04:00
Fred Smith
75ca7342fe Merge pull request #15966 from edx/derf/reduce_celery_heartbeat_frequency 
reduce celery heartbeat frequency
 2017-09-07 08:17:28 -04:00
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Gregory Martin
a51b9597e2 Merge pull request #15953 from edx/yro/update_cert_display_date 
Update Cert Display Date
 2017-09-06 16:10:41 -04:00
Jeremy Bowman
f15a686775 Merge pull request #15965 from edx/jmbowman/pytest_compatibility 
pytest compatibility fixes
 2017-09-06 16:03:26 -04:00
Eric Fischer
804dc36164 Merge pull request #15964 from edx/efischer/ora_again 
edx-ora2 2.1.1
 2017-09-06 15:48:49 -04:00
Gabe Mulley
9429128776 do not create schedules for instructor led courses 2017-09-06 15:25:10 -04:00
Andy Armstrong
2d40854391 Merge pull request #15957 from edx/andya/learner-certificate-filtering 
Only show passing certificates on a learner profile
 2017-09-06 15:21:25 -04:00
Gregory Martin
4d59eff8f6 Update cert display date 
EDUCATOR-1266
 2017-09-06 15:17:27 -04:00
Fred Smith
f891c0fae8 reduce celery heartbeat frequency 2017-09-06 14:58:34 -04:00
Eric Fischer
179774e107 edx-ora2 2.1.1 2017-09-06 14:40:11 -04:00
Jeremy Bowman
ded294c420 pytest compatibility fixes 2017-09-06 14:20:34 -04:00
Jeremy Bowman
d342a56286 Merge pull request #15962 from edx/jmbowman/pytest_database 
Fixes for pytest database usage
 2017-09-06 14:14:07 -04:00
Jeremy Bowman
97f5fe035b Fixes for pytest database usage 2017-09-06 13:15:34 -04:00
Jeremy Bowman
cebf6d3ea9 Merge pull request #15960 from edx/jmbowman/fragile_test_fixes 
Fixes for test order dependence
 2017-09-06 13:06:04 -04:00
Andy Armstrong
d05b62a283 Only show passing certificates on a learner profile 
LEARNER-2486
 2017-09-06 12:32:15 -04:00
Diana Huang
50c287ad90 Merge pull request #15949 from edx/diana/update-sock-copy 
Update sock copy.
 2017-09-06 12:16:27 -04:00
Jeremy Bowman
6fb7d63c9e Fixes for test order dependence 2017-09-06 11:31:37 -04:00
Sofiya Semenova
038d5182ec Merge pull request #15922 from edx/ssemenova/ed-1101 
"View/Request Certificate" button logic on progress page and dashboard
 2017-09-06 11:20:21 -04:00
Jeremy Bowman
ae44f1840c Merge pull request #15951 from edx/jmbowman/ddt_cleanup 
ddt usage cleanup
 2017-09-06 11:19:39 -04:00
Harry Rein
d6e89e7bde Merge pull request #15956 from edx/HarryRein/LEARNER-2485-profile-issues 
LEARNER-2485: Fix styling issues on learner profile.
 2017-09-06 11:02:19 -04:00
Muzaffar yousaf
f1c574cf63 Merge pull request #15565 from jspayd/caption-centering 
Fix video caption centering
 2017-09-06 17:38:31 +05:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Alex Dusenbery
0137e38e97 EDUCATOR-1241 | make a separate file to make decisions about auto generated certs. 2017-09-05 16:15:43 -04:00