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

19638 Commits

Author SHA1 Message Date
adeelehsan
47137ddbab Updated to python3 2019-07-12 15:35:34 +05:00
Waheed Ahmed
eead45987f Merge pull request #21087 from edx/waheed/PROD-433-add-student-support-role 
Add system wide student support role.
 2019-07-12 12:30:08 +05:00
Adeel Khan
10ae9f5bf1 Fix edx-platform templates for xss. 
This is part of a multiple PR to escape
edx-platform templates to prevent xss attack.

PROD-465
 2019-07-12 00:52:35 +05:00
Troy Sankey
5b6b853ec0 Add discovery to the list of devstack logout URIs 2019-07-11 11:53:49 -04:00
Amit
8860317772 INCR-455: Updates on Python 3.x (#21057) 2019-07-11 11:17:47 -04:00
Usama Sadiq
89930a0f20 Merge pull request #21061 from edx/usama/INCR-454-python-modernize-on-edx-platform 
INCR-454 Python Modernize on Edx-Platform (351 of 380)
 2019-07-11 20:11:57 +05:00
Matt Tuchfarber
b1998e202e Merge pull request #20945 from edx/tuchfarber/remove_journals 
Remove all references to Journals
 2019-07-11 11:08:24 -04:00
Waheed Ahmed
41e8f31765 Add system wide student support role. 
Created a data migration to add system wide student support
role, also registered SystemWideRoleAssignment into Django
admin.

PROD-433
 2019-07-11 20:03:23 +05:00
Amit
a1b5f6fe73 INCR-431: Updates on Python 3.x (#21056) 2019-07-11 10:47:15 -04:00
usama sadiq
79d02a1b67 Python3 Update 
Added absolute_import
Changed unicode() with six.text_type()
 2019-07-11 19:27:15 +05:00
Amit
9ecb771aa8 INCR-452: Updates on Python 3.x (#21058) 2019-07-11 10:19:53 -04:00
usama sadiq
26d493e34d Certificate Generation Logs 
Added additional logs in the certificate generation
task being executed after id verification of a learner.
 2019-07-11 10:51:39 +05:00
Usama Sadiq
b0fee1961d Merge pull request #21033 from edx/usama/INCR-458 
INCR-458
 2019-07-11 10:48:44 +05:00
David Ormsbee
930d7f2867 Revert "SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742)" 
This reverts commit 44562a1592.
 2019-07-10 11:45:28 -04:00
jansenk
8e7b647a4f tests for extra columns 2019-07-10 11:16:25 -04:00
Uzair Rasheed
8c8de6c372 Merge pull request #21047 from edx/INCR-439/python-modernize-336-of-380 
Python-modernize on edx-platform (336 of 380)
 2019-07-10 20:05:32 +05:00
Amit
f31a894900 INCR-457: Make compatible with Python 3.x (#21011) 2019-07-10 10:22:47 -04:00
Amit
adc91f786f INCR-462: Make compatible with Python 3.x and disable: import-error (#20983) 2019-07-10 10:15:17 -04:00
Amit
15dc31ba6d INCR-456: Make compatible with Python 3.x (#21018) 2019-07-10 10:14:43 -04:00
Uzair Rasheed
a917f109ec Merge pull request #20972 from edx/INCR-463/python-modernize-360-of-380 
Python-modernize on edx-platform (360 of 380)
 2019-07-10 19:03:43 +05:00
Amit
9a1bb49910 INCR-466: Updates on Python 3.x and fix line over length limit (#20915) 2019-07-10 09:52:51 -04:00
uzairr
64fa5041f2 Python-modernize on edx-platform (336 of 380) 
After executing python-modernize and isort, few changes
occurred in import sequence as well as unicode func is
replaced by six.text_type func.

INCR-439
 2019-07-10 18:27:23 +05:00
uzairr
a0629f4f14 Python-modernize on edx-platform (360 of 380) 
After executing python-modernize and isort, few changes
occurred in import sequence as well as unicode func is
replaced by six.text_type func.

INCR-463
 2019-07-10 16:31:20 +05:00
usama sadiq
daca3ccfa1 INCR-458 
Python3 Update

Added absolute_import
Updated Meta Class declaration method
 2019-07-10 15:07:43 +05:00
Adeel Khan
30d8dfb5dd Fix edx-platform templates for xss. 
This is part 2 of a multiple PR to escape
edx-platform templates to prevent xss attack.

PROD-465
 2019-07-10 13:31:02 +05:00
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
Matt Tuchfarber
2583d317db Remove all references to Journals 2019-07-09 14:19:25 -04: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