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

17785 Commits

Author SHA1 Message Date
Alex Dusenbery
7e51f02884 Get edx-platform working with external completion lib, add integration tests. 2018-02-14 15:54:27 -05:00
ayub-khan
eae37a2b45 updated-translations 2018-02-14 13:21:04 +05:00
Sofiya Semenova
de8e256172 Merge pull request #17359 from edx/schen/EDUCATOR-2095 
Surface vertical units in the course outline
 2018-02-13 14:15:17 -05:00
Dennis Jen
20349e88bd Merge pull request #17160 from open-craft/tomaszgy/fix_layout_of_enrollment_in_ccx_dashboard 
Simplify layout of the Enrollment tab of CCX dashboard
 2018-02-13 09:39:58 -05:00
Tomasz Gargas
605f080b9a Simplify the content enrollment tab in the CCX Dashboard. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-02-12 21:47:49 +01:00
Tomasz Gargas
841ddacc37 Make missing parts of Enrollment tab in CCX dashboard translatable. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-02-12 21:46:55 +01:00
Sanford Student
8956739a34 Add the visual indicator to the sequence horizontal nav bar to mark verticals completed 
EDUCATOR-2189
 2018-02-12 15:26:40 -05:00
Simon Chen
db81dfa424 Surface vertical units in the course outline 2018-02-12 14:27:52 -05:00
Farhanah Sheets
e73b95f1c8 Update lti iframe in platform & xblock github version 2018-02-12 09:36:06 -05:00
Tasawer Nawaz
ee2c983bf5 Merge pull request #17439 from edx/tasawer/learner-3342/fix-for-if-goal-key-is-none 
update CourseGoalViewSet to return status=400 if no goal key is provided
 2018-02-12 16:31:56 +05:00
Tasawer Nawaz
898db2e376 update CourseGoalViewSet to return status=400 if no goal key is provided LEARNER-3342 2018-02-12 15:07:32 +05:00
Ibrahim
046871e072 fix typo in program marketing page 2018-02-12 12:39:09 +05:00
Matthew Piatetsky
bb8f9ae915 Merge pull request #17431 from edx/bundling_test_handle_exceptions 
handle exceptions and create the necessary html in optimizely
 2018-02-09 08:59:40 -05:00
Ahsan Ulhaq
25130ae3c8 Making honor code not eligible for Certificate 
LEARNER-4117
 2018-02-09 13:53:50 +05:00
Matthew Piatetsky
826ef28b4d handle exceptions and create the necessary html in optimizely 2018-02-08 10:25:52 -05:00
Jeremy Bowman
4cdff4518f Merge pull request #17425 from edx/jmbowman/PLAT-1949 
PLAT-1949 Less cluttered management command output
 2018-02-07 16:26:39 -05:00
Jae Bradley
a19bc8c30d Merge pull request #17408 from edx/LEARNER-3926-portfolio-project-test-upsell 
LEARNER-3926 Portfolio Project Test Upsell Modal
 2018-02-07 14:57:08 -05:00
Jeremy Bowman
88cb9f8c77 PLAT-1949 Less cluttered management command output 2018-02-07 13:44:08 -05:00
Jeremy Bowman
1a67819ce4 PLAT-1945 Better management command ergonomics 2018-02-07 13:24:04 -05:00
jaebradley
47b36c6acd implement portfolio project test upsell modal 
update styles

html updates

add waffle flags

fix waffle flags
 2018-02-07 07:41:33 -05:00
Nimisha Asthagiri
51dcb5a536 Merge pull request #17392 from mitodl/hack18_bookmarks_django_plugin 
Changed 'bookmarks' django app to follow plugin pattern
 2018-02-06 14:21:38 -05:00
Jeremy Bowman
378287fbc0 Merge pull request #17404 from edx/jmbowman/PLAT-1942 
PLAT-1942 Handle xmodule_django field deprecations
 2018-02-06 13:23:04 -05:00
Jeremy Bowman
8a57cbf4bb Merge pull request #17409 from edx/jmbowman/PLAT-1943 
PLAT-1943 Fix more naive datetime warnings
 2018-02-06 11:18:52 -05:00
ayub-khan
36a6240472 translations-6-feb 2018-02-06 14:13:05 +05:00
Jeremy Bowman
9682e00f4c PLAT-1943 Fix more naive datetime warnings 2018-02-05 17:58:35 -05:00
Jeremy Bowman
bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations 2018-02-05 15:05:54 -05:00
Gregory Martin
ae56b5a9c9 Update query for flag. 2018-02-05 14:32:26 -05:00
Diana Huang
a8f9a5f350 Merge pull request #17398 from edx/diana/new-portfolio-page 
Create new djangoapp and a new blank tab view.
 2018-02-05 13:06:22 -05:00
Diana Huang
124e4c2ca1 Create new djangoapp and a new blank tab view. 2018-02-05 11:35:42 -05:00
Jeremy Bowman
2bd0c3d9a1 PLAT-1917 Stop using deprecated Location and AssetLocation 2018-02-03 00:31:59 -05:00
Jeremy Bowman
53a6358523 Merge pull request #17389 from edx/jmbowman/PLAT-1916 
PLAT-1916 Ignore existing usage of deprecated field_data
 2018-02-02 17:13:11 -05:00
Jeremy Bowman
11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data 2018-02-02 16:12:00 -05:00
David Ormsbee
e6e91806f4 Merge pull request #17219 from mitodl/add_aq_print 
Added print media in css
 2018-02-02 11:42:04 -05:00
Gregory Martin
7d67583bb9 Merge pull request #17310 from edx/yro/EDUCATOR-2088 
Yro/EDUCATOR 2088
 2018-02-02 08:40:44 -05:00
noraiz-anwar
d56bd58063 clean grades service 2018-02-02 11:52:12 +05:00
Gregory Martin
a79f899b4b Update resume button functionality 2018-02-01 22:26:46 -05:00
Gavin Sidebottom
7f3ffcc047 Changed 'bookmarks' django app to follow plugin pattern 2018-02-01 15:30:06 -05:00
Feanil Patel
bc790400a9 Merge pull request #17374 from edx/feanil/hackathon_logging 
Make the logging config easier to read.
 2018-02-01 11:14:16 -05:00
Jeremy Bowman
938c9670cc Merge pull request #17376 from edx/jmbowman/PLAT-1915 
PLAT-1915 Stop using deprecated BaseException.message
 2018-02-01 10:24:06 -05:00
Feanil Patel
0d8c30e58d Fix pep8 violation. 2018-02-01 10:08:40 -05:00
Feanil Patel
49cbd581e9 Remove tracking_filename override. 
The override value is the same as the default value.
 2018-02-01 10:08:40 -05:00
Feanil Patel
37ae5e5218 Move LOG_DIR setting next to LOGGING setting. 2018-02-01 10:08:40 -05:00
Feanil Patel
de80ab751a Remove the debug override. 2018-02-01 10:08:40 -05:00
Tasawer Nawaz
c00c245005 Merge pull request #17364 from edx/tasawer/learner-4041/link-new-support-form-from-lms-footer 
update link of "Contact" in lms footer to lead new support form
 2018-02-01 12:29:52 +05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Uzair Rasheed
9aff0ba9a0 Merge pull request #17344 from edx/LEARNER-3465/catch-sailthru-connection-error 
Handle Exception in getting cookies from Sailthru
 2018-01-31 20:05:04 +05:00
uzairr
4e91ce19b1 Handle Exception in getting cookies from Sailthru 
In order to send email, cookies are required from Sailthru,
ocassionally, celery task fails possibly because of request timeout
that ultimately fails login.To avoid it,generic exception handler
is added so that login will not fail in future.

LEARNER-3465
 2018-01-31 18:35:19 +05:00
Tasawer Nawaz
ab744a2516 update link of "Contact" in lms footer to lead new support form 
LEARNER-4041
 2018-01-31 17:53:52 +05:00
Albert (AJ) St. Aubin
71991887dd Merge pull request #17353 from edx/aj/LEARNER-3186 
Updates the Branch IO Mobile App banner to not show in the web app
 2018-01-31 07:00:55 -05:00
Albert St. Aubin
7f6b2d6ac5 Updates the Branch IO Mobile App banner to not show in the web app 2018-01-30 13:35:12 -05:00