Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,241 Commits 1 Branch 0 Tags
7ffccff0f3da38aea86cd243ffe4bfef9e217bec
Commit Graph

19612 Commits

Author SHA1 Message Date
Zainab Amir
92c7a43011 Add system_wide_roles app and roles classes (#20935) 
* New system_wide_roles app added in openedx/core/djangoapps
* Added SystemWideRole and SystemWideRoleAssignment classes to govern
  non-enterprise system wide roles

PROD-424
 2019-07-10 11:33:33 +05:00
Cory Lee
1b4d66fe69 Removing another FK needed for CSM id exhaustion migrations (#20971) 
* Removing FK because it is needed to deal with CSM key exhaution migration
 2019-07-09 12:36:01 -04:00
usama sadiq
92d3a9672c Python3 Update 
Added Absolute_import for compatibility
 2019-07-09 16:55:11 +05:00
Usama Sadiq
88a574b14c Merge pull request #20965 from edx/usama/INCR-468 
INCR-468
 2019-07-09 11:42:41 +05:00
atesker
b553501c5d updated sorting 2019-07-08 14:45:54 -04:00
Amit
2c8c3b8a74 INCR-469: Updates on Python 3.x, disable: import-error and fix line over length (#20962) 2019-07-08 13:57:26 -04:00
Jillian Vogel
44562a1592 SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742) 
Inlines all 36 discussion underscore templates

imported by lms/templates/discussion/_underscore_templates.html
to reduce file system load when displaying inline discussion blocks.

Ignored error where fix required changing the translated text string,
due to differences between underscore and HtmlUtils format strings.
 2019-07-08 11:26:43 -04:00
usama sadiq
eef3b65535 Python3 Update 
Added future absolute_import
Changed unicode() with six.text_type()
 2019-07-08 19:41:58 +05:00
atesker
b1e8dbe2d4 EDUCATOR-4353 updated history override backend 
unit test fixes

code review comments
 2019-07-08 08:35:16 -04:00
Cory Lee
09bc3c0714 Add CSM drop FK migration 2019-07-05 11:02:09 -04:00
Cory Lee
6ee9b0bcab Drop CSM FK on history 2019-07-05 11:02:09 -04:00
Calen Pennington
566cd9775d Merge pull request #20936 from cpennington/discount-holdback 
Discount holdback
 2019-07-05 10:06:40 -04:00
Adeel Khan
a44d3e7a75 Fix templates for xss. 
PROD-465
 2019-07-05 12:39:58 +05:00
Calen Pennington
8b4b5a4547 Move stable_bucketing into its own library to minimize circular dependencies 2019-07-03 15:03:31 -04:00
Adeel Khan
ef0d56aac6 Fix lms templates to prevent xss attacks. 
This patch is part of multiple PR's.

LEARNER-4632
 2019-07-03 19:57:59 +05:00
Zainab Amir
f6603cb8cf Update verification expiry email criteria (#20725) 
If already DEFAULT Number of emails are sent, then verify that user
is enrolled in at least one verified course run for which the course
has not ended else stop sending emails

LEARNER-7313
 2019-07-03 14:19:22 +05:00
Amit
7dfb73c7a6 INCR-483: Make compatible with Python 3.x without breaking Python 2.7 support (#20795) 
* reword INCR-483: Make compatible with Python 3.x without breaking Python 2.7 support

pick INCR-483: Re-run isort for lms/envs/test.py

INCR-483: change import order

INCR-483: PyLint fixes

* INCR-483: Fixes useless suppression

* INCR-483: Remove unused get_swagger_view
 2019-07-02 12:54:34 -04:00
Feanil Patel
b686368f1d Merge pull request #20914 from amitvadhel/INCR-467 
INCR-467: Updates on Python 3.x
 2019-07-02 09:59:37 -04:00
Feanil Patel
0ccbd23d02 Merge pull request #20918 from amitvadhel/INCR-465 
INCR-465: Updates on Python 3.x and disable: import-error
 2019-07-01 10:37:01 -04:00
jansenk
4c93bcbf8f Add put endpoint for program enrollments, rework program enrollment view 2019-07-01 09:33:30 -04:00
amitvadhel
80715c80f6 INCR-465: Updates on Python 3.x and disable: import-error 2019-06-28 22:08:53 +03:00
adeelehsan
2d369490dd Flag added to load limited courses on Dashboard 
Dashboard is set to load 250 courses instead of
all the courses. A flag is also added to change
the number the courses to load.

PROD-204
 2019-06-28 22:51:41 +05:00
Michael Youngstrom
139cdb8ba2 Switch testing from ecs to ec2 (#20846) 2019-06-27 22:04:02 -04:00
Feanil Patel
c5b86eb5c7 Merge pull request #20384 from open-craft/symbolist/video-xblock 
VideoModule to VideoBlock [SE-602]
 2019-06-27 16:23:00 -04:00
Uzair Rasheed
c3af0ed3f1 Merge pull request #20848 from edx/LEARNER-7155/update-entitlement-support-view 
Update enrollment support view
 2019-06-28 00:11:10 +05:00
amitvadhel
06582d5972 INCR-467: Updates on Python 3.x 2019-06-27 21:46:03 +03:00
adeelehsan
72c5cb09e3 Merge pull request #20889 from edx/aehsan/INCR-471 
Python3 update
 2019-06-27 19:17:53 +05:00
Usama Sadiq
7920d2cb91 Merge pull request #20888 from edx/usama/INCR-470 
INCR-470
 2019-06-27 18:53:26 +05:00
uzairr
789a48e27b Update enrollment support view 
Currently, entitlement view is not displaying any message if there
are no records against a query.To improve user experience, changes
have been made so that a proper message would be displayed.

LEARNER-7155
 2019-06-27 14:48:05 +05:00
uzairr
575589f8a5 Python-modernize on edx-platform (369 of 380) 2019-06-27 13:21:50 +05:00
usama sadiq
7a5f0b7d24 Pylint Warning Supression Removed 2019-06-27 12:15:06 +05:00
usama sadiq
23b2039c87 Python3 Update 
Added future absolute_import
changed unicode() with six.text_type()
 2019-06-27 12:15:06 +05:00
Adeel Khan
9e53071ef0 Fixes template for incorrect trans escaping. 2019-06-27 11:40:43 +05:00
Feanil Patel
729495e1aa Merge pull request #20871 from amitvadhel/INCR-475 
Incr 475
 2019-06-26 14:51:15 -04:00
Feanil Patel
615b9c7dae Merge pull request #20868 from amitvadhel/INCR-474 
Incr 474
 2019-06-26 14:17:09 -04:00
atesker
c99e4ebb80 backend - send simple history via api 
EDUCATOR-4353 code review comments
 2019-06-26 10:01:12 -04:00
Uzair Rasheed
88835c3cc4 Merge pull request #20865 from edx/INCR-478/python-modernize-375-of-380 
Python-modernize on edx-platform (375 of 380)
 2019-06-26 18:57:12 +05:00
Christie Rice
3415824451 REVMI-280 Add course name and announcement to message (#20895) 2019-06-26 09:23:33 -04:00
usama sadiq
d2c78b7734 Update to Python3 
Added the import statements
 2019-06-26 11:18:51 +05:00
Usama Sadiq
0105e7bdce Merge pull request #20866 from edx/usama/INCR-481 
INCR-481
 2019-06-26 11:12:29 +05:00
Simon Chen
d48ba26d50 Update LMS API to send correct response status code 2019-06-25 19:40:42 -04:00
Calen Pennington
39efc54a27 Merge pull request #20884 from cpennington/discount-no-previous-purchase 
REVEM-289: Discount no previous purchase
 2019-06-25 17:12:19 -04:00
Calen Pennington
f07f2121ba Make has_non_audit_enrollments exclude entitlements 2019-06-25 16:44:36 -04:00
Calen Pennington
388fac3b9c Make has_non_audit_enrollments exclude honor courses correctly 2019-06-25 16:44:36 -04:00
Douglas Hall
0f045ab5db Add analytics tracking to Discover New header link. (#20896) 2019-06-25 16:36:59 -04:00
Feanil Patel
52a5c81589 Merge pull request #20883 from amitvadhel/INCR-459 
INCR-459: Run python-modernize and isort
 2019-06-25 15:20:18 -04:00
Simon Chen
a86e8d4f19 EDUCATOR-4361 Add PUT api endpoint to the edx-plaform program course enrollment view 2019-06-25 15:12:22 -04:00
Ned Batchelder
aa13a634a6 Merge pull request #20821 from edx/nedbat/drf-yasg 
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
 2019-06-25 13:49:13 -04:00
Feanil Patel
0af26561b2 Merge pull request #20876 from amitvadhel/INCR-473 
INCR-473: Make compatible with Python 3.x
 2019-06-25 12:57:02 -04:00
Nadeem Shahzad
441d2e44b9 Merge pull request #20818 from edx/nadeem/OPS-4041 
Defaults to common.py lms (OPS-4041)
 2019-06-25 18:47:12 +05:00