Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Amit
65f4a63ecf INCR-248: Make compatible with Python 3.x without breaking Python 2.7… (#20529) 
* INCR-248: Make compatible with Python 3.x without breaking Python 2.7 support --> common/djangoapps/xblock_django

* INCR-248: Grouped absolute_import and unicode_literals imports

* INCR-248: Grouped absolute_import and unicode_literals imports for migrations
 2019-05-13 12:35:39 -04:00
Waheed Ahmed
98c286a009 Revert "Making honor code not eligible for Certificate" 
This reverts commit 25130ae3c8.
 2019-05-13 15:39:35 +05:00
Chris Pappas
d937708432 Merge pull request #20438 from edx/cpappas/ENT-1887 
ENT-1887 | Adding logic for new business marketing footer url constru…
 2019-05-10 16:28:27 -04:00
Amit
40068aecb5 INCR-232: Run python-modernize and isort on common/djangoapps/track (#20513) 2019-05-10 12:05:31 -04:00
Amit
a10fbd682c INCR-231: Run python-modernize and isort at common/djangoapps/entitlements (#20515) 2019-05-10 11:14:18 -04:00
Amit
9e6d71c49b INCR-144: Run python-modernize on common/djangoapps/microsite_configuration/tests (#20517) 2019-05-10 10:16:31 -04:00
Amit
0bd61d5d9f INCR-133: Run python-modernize on common/djangoapps/xblock_django [migrations, management, tests] (#20520) 2019-05-10 09:47:20 -04:00
Stu Young
c3571a5fb9 Merge pull request #20521 from amitvadhel/INCR-139 
INCR-139
 2019-05-10 09:44:26 -04:00
Amit
07b75ae690 INCR-164: Run python-modernize on common/djangoapps/microsite_configuration [backends, management, migrations] (#20507) 2019-05-10 08:37:27 -04:00
amitvadhel
8ef8dd27b2 INCR-139: Run python-modernize on common/djangoapps/third_party_auth/tests [tests, data] 2019-05-10 12:54:01 +03:00
Christopher Pappas
4c5ca6d086 ENT-1887 | Adding logic for new business marketing footer url construction, while maintaining backwards compatibility 
Fixing quality test

Testsing out a default value for the sake of jenkins tests. will revert

Fix footer test from being flaky

Moving an import statement

ran isort. adding a test. fixing 1 quality issue

Quality cleanups

Attempting more quality fixes

adding back in config variable name for default value

Adding ENTERPRISE_MARKETING_FOOTER_QUERY_PARAMS to common settings

Changing marketing_url logic to only concatenate enterprise url to root if the enterprise url is relative (starts with a /)

quality fixes
 2019-05-09 17:15:47 -04:00
Brian Mesick
a4a009e57b Merge pull request #20222 from edx/bmedx/course_enrollment_history 
Re-adding django-simple-history for CourseEnrollment
 2019-05-09 13:02:07 -04:00
Amit
328bcbe047 INCR-135: Run python-modernize on common/djangoapps/edxmako (#20483) 2019-05-09 10:08:57 -04:00
Amit
f8ef9878d2 INCR-136: Run python-modernize at common/djangoapps/pipeline_mako (#20482) 2019-05-09 10:00:16 -04:00
Amit
9e2397a60a INCR-137: Run python-modernize at common/djangoapps/static_replace (#20481) 2019-05-09 09:36:45 -04:00
Kyle Mulka
b2e6ed0488 incr-205 ran modernize on common/djangoapps/course_modes (#20465) 2019-05-08 13:35:40 -04:00
Jeremy Bowman
47292e5f92 Update StringIO usage for Python 3 (#20462) 2019-05-08 12:13:22 -04:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
Cameron Cairns
6363090144 Addresses INCR-195 - runs modernise /student/tests (#20419) 2019-05-07 15:44:49 -04:00
Anthony Wee
3dcdf96faf INCR-123: Run python-modernize on common/djangoapps/track/backends (#20444) 
* anthonywee/INCR-123

* isort
 2019-05-07 15:16:42 -04:00
Anthony Wee
a0bb7e572d INCR-125: Run python-modernize on common/djangoapps/track/views and migrations (#20425) 
* INCR-125: Run python-modernize on common/djangoapps/track/views and migrations

* isort
 2019-05-07 14:26:57 -04:00
Anthony Wee
b095ce15c8 INCR-124: Run python-modernize on common/djangoapps/track/tests (#20445) 
* INCR-124: Run python-modernize on common/djangoapps/track/tests

* isort
 2019-05-07 14:05:38 -04:00
Anthony Wee
2ab8794c78 INCR-131: Run python-modernize on common/djangoapps/entitlements/api (#20448) 
* INCR-131: Run python-modernize on common/djangoapps/entitlements/api

* isort
 2019-05-07 13:05:21 -04:00
Anthony Wee
aa1d142ddd INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations (#20447) 
* INCR-130: Run python-modernize on common/djangoapps/entitlements/migrations

* isort
 2019-05-07 13:01:04 -04:00
Anthony Wee
2d8dfa895f INCR-129: Run python-modernize on common/djangoapps/entitlements/management and tests (#20446) 
* INCR-129: Run python-modernize on common/djangoapps/entitlements/management

* isort

* INCR-129: Run python-modernize on common/djangoapps/entitlements/tests

* isort
 2019-05-07 12:52:09 -04:00
Evans Dianga
391b91b99a Modernize common/djangoapps/util- INCR-203 (#20437) 2019-05-07 09:53:17 -04:00
Evans Dianga
0063c6f3e7 INCR-122 Modernize track/management. (#20433) 
* Modernize track/management incr122. Change Author to myself

* Ran isort on common/djangoapps/track/management
 2019-05-07 09:33:20 -04:00
bmedx
e11e062292 Mock CourseEnrollment history for test performance 2019-05-06 18:03:41 -04:00
Jeremy Bowman
47516dbead Run python-modernize on student/*.py (#20411) 2019-05-06 14:50:42 -04:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -04:00
bmedx
17cb93dd51 Re-adding django-simple-history for CourseEnrollment 2019-05-03 16:16:41 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
16edae0822 Move comment_client into django_comment_common 2019-05-03 12:07:20 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
Nimisha Asthagiri
db89a64d06 Move django_comment_client to discussion/ 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
2839851bde Move comment_client into django_comment_common 2019-05-01 19:13:09 -04:00
Bill DeRusha
2b11068622 Revert "Convert Account Activation Emails to edx-ACE" 2019-05-01 16:30:09 -04:00
Bill Gardynski
0cbf4845cf INCR-197 (#20156) 2019-04-29 13:00:59 -04:00
Ned Batchelder
67008cec68 Merge pull request #18928 from shadinaif/activation-email-to-ace 
Convert Account Activation Emails to edx-ACE
 2019-04-27 15:06:18 -04:00
Shadi Naif
07f588517b Convert Account Activation Emails to edx-ACE 2019-04-27 13:21:34 +03:00
David Ormsbee
5b4ff6c3af Merge pull request #20332 from edx/ormsbee/track_readme 
Initial README for Track app
 2019-04-26 13:24:44 -04:00
David Ormsbee
b667376d4b Merge pull request #20335 from edx/ormsbee/discussion_readme 
Initial README for Discussion
 2019-04-25 15:56:09 -04:00
David Ormsbee
d11ec72030 Merge pull request #20330 from edx/ormsbee/student_app_readme 
Initial README for Student app
 2019-04-25 15:14:58 -04:00
David Ormsbee
e2ec126d0d Initial README for Discussion 2019-04-25 15:13:59 -04:00
Michael Roytman
66dc07a49f Merge pull request #20295 from edx/mroytman/EDUCATOR-4229-lms-redirection-idp 
add LMS endpoint to redirect to identity provider
 2019-04-25 14:13:06 -04:00
David Ormsbee
cf42c67e52 Initial README for Track app 2019-04-25 13:53:55 -04:00
David Ormsbee
67cbc02411 Initial README for Student app 2019-04-25 13:39:12 -04:00
Dave St.Germain
2193b21cf6 Merge pull request #20303 from edx/dcs/masters-access 
Automatically add master's to the group access of verified content
 2019-04-25 11:00:16 -04:00