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

50957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hasnain Naveed
58802c34a2 Merge pull request #21431 from edx/hasnain-naveed/ENT-2158-version-bump 
ENT-2158 | edx-enterprise version bump to 1.9.6.
 2019-08-23 19:18:38 +05:00
Aarif
ee72bbe0e8 Merge pull request #21411 from edx/BOM-75 
BOM-75 ran make upgrade
 2019-08-23 17:58:18 +05:00
hasnain-naveed
1d286530a7 ENT-2158 | edx-enterprise version bump to 1.9.6. 2019-08-23 16:32:10 +05:00
Ayub
81a99e4d32 Merge pull request #21371 from edx/BOM-90 
BOM-90
 2019-08-23 13:34:27 +05:00
Awais Qureshi
0c2f4b793d Merge pull request #21395 from edx/awais/BOM-97 
BOM-97
 2019-08-22 21:01:49 +05:00
Awais Qureshi
766d9fb649 Merge pull request #21408 from edx/awais786/BOM-388 
BOM-388
 2019-08-22 20:42:03 +05:00
Awais Qureshi
b42c3d565b Merge pull request #21406 from edx/awais786/BOM-396 
BOM-396
 2019-08-22 20:36:31 +05:00
Awais Qureshi
0e13f52490 Merge pull request #21407 from edx/awais786/BOM-392 
BOM-392
 2019-08-22 20:35:26 +05:00
aarif
1873f9b821 updated (make-upgrade) the requirements to use latest version of edx-submissions and edx-ora2 2019-08-22 20:27:07 +05:00
edX Transifex Bot
e3c5defa41 fix(i18n): update translations 2019-08-22 08:20:09 -04:00
arbisoft
84cfb8d1ec BOM-392 
Fixing encode/decode issues for python3.
 2019-08-22 16:45:25 +05:00
arbisoft
04536e5c5f BOM-388 
Fixing list len issue.
 2019-08-22 16:22:58 +05:00
arbisoft
e140d4aa93 BOM-396 
Fixing encode/decode issues for python3.
 2019-08-22 15:43:23 +05:00
Ayub khan
67224f401a BOM-90 
Made all tests py3 compatible.
 2019-08-22 13:04:05 +05:00
noraiz-anwar
1c4f9da92d improved quality of multiple files 2019-08-22 12:47:08 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
arbisoft
a680f01aa2 Fixing encode/decode issues for python3. 2019-08-22 11:11:36 +05:00
Chris Pappas
b351c5e6c0 Bumping enteprise via make upgrade to 1.9.5 (#21404) 2019-08-21 16:25:22 -04:00
Jeremy Bowman
76035c37bc Downgrade transifex-client to upgrade other packages (#21403) 2019-08-21 16:16:15 -04:00
Christopher Pappas
20b4cf2488 Bumping enteprise via make upgrade to 1.9.5 2019-08-21 15:48:40 -04:00
edX cache uploader bot
f6b56edbb5 Updating Bokchoy testing database cache (#21401) 2019-08-21 13:09:06 -04:00
Andytr1
cd7aab3dc6 Merge pull request #21400 from edx/andytr1/update-version-bulk-grades2 
updated bulk grades version
 2019-08-21 12:36:29 -04:00
Emma Green
ef71b51137 Merge pull request #21399 from edx/emma-green/REV-901/remove-user-join-from-holdback 
remove user.joined_date from holdback as this condition will create a…
 2019-08-21 12:22:53 -04:00
atesker
ed3e3a7bbc updated bulk grades version 2019-08-21 12:06:29 -04:00
Emma Green
fc003c428d remove user.joined_date from holdback as this condition will create a difference in the two a/b groups 2019-08-21 11:56:37 -04:00
Dave St.Germain
ab414c83c7 Merge pull request #21391 from edx/dcs/report-for-zoom 
Include Zoom as a potential partner, for retirement requests
 2019-08-21 11:34:07 -04:00
Uzair Rasheed
93a2259ec2 Merge pull request #21321 from edx/PROD-491/beta-tester-access-earn-cert 
Beta tester doesn't allow to earn cert
 2019-08-21 18:50:05 +05:00
Uzair Rasheed
4600051bf0 Merge pull request #21383 from edx/PROD-319/empty-cert-signatories 
Remove empty signatories from certificate.
 2019-08-21 18:49:43 +05:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm 
Bom/python 3 swarm
 2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Feanil Patel
3c33f6c30f Fix another quality issue. 2019-08-21 07:44:06 -04:00
uzairr
38cd616f06 Beta tester doesn't allow to earn cert 
If beta tester wants to earn a cert then they must
create a separate user account by using email and
username different from the account with beta tester
role.

PROD-491
 2019-08-21 16:24:00 +05:00
uzairr
97a468fa86 Remove empty signatories from certificate. 
Empty signatories are shown as broken images on the certs which is
affecting user experience.To improve it, empty signatories are
filtered before rendering the cert.

PROD-319
 2019-08-21 15:45:51 +05:00
Aarif
acf3cb684d Merge pull request #21362 from edx/BOM-89 
BOM-89 Fixed tests for python 3
 2019-08-21 14:00:22 +05:00
Syed Muhammad Dawoud Sheraz Ali
b710a046a3 Merge pull request #21393 from edx/revert-21209-msingh/discussion_topic_validation2 
Revert "PROD-145: Added validation to discussion topic input in studio, testing 2"
 2019-08-21 12:47:38 +05:00
aarif
3ff6d1b942 changes made to fix failing tests for python 3 
changes made to fix failing tests for python 3

minor changes

minor changes

changes made to fix failing tests for python 3

changes made to fix failing tests for python 3

minor changes

minor changes
 2019-08-21 12:14:53 +05:00
edX Transifex Bot
d8a9e9305d fix(i18n): update translations 2019-08-21 02:59:09 -04:00
Bill DeRusha
aebdf77f8e Revert "PROD-145: Added validation to discussion topic input in studio, testing 2" 2019-08-20 20:31:15 -04:00
Feanil Patel
fde27196f9 Fix quality issues. 2019-08-20 18:02:30 -04:00
Matt Hughes
0ad8753cd6 Add waffle for hiding bulk management in masters courses 2019-08-20 16:32:13 -04:00
Dave St.Germain
37827b5df5 Include Zoom as a potential partner, for retirement requests 2019-08-20 16:28:41 -04:00
Chris Pappas
c3da1374bf Running make upgrade to bump edx-enterprise (#21390) 2019-08-20 16:02:19 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Andytr1
a911813153 Merge pull request #21387 from edx/andytr1/update_bulk_grades 
updated bulk grades version
 2019-08-20 14:31:37 -04:00
atesker
ff5f49b89f updated bulk grades version 2019-08-20 13:56:00 -04:00
Diana Huang
4a1949661d Merge pull request #21380 from edx/diana/microsite-removal 
Remove the microsites djangoapp.
 2019-08-20 13:52:31 -04:00
Christie Rice
abe12c89b8 ENT-1321 Upgrade requirements (#21386) 2019-08-20 12:49:45 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
Awais Qureshi
3f3caba0da Merge pull request #21360 from edx/awais786/BOM-88 
BOM-88
 2019-08-20 20:51:32 +05:00
edX cache uploader bot
be000cb8cd Updating Bokchoy testing database cache (#21379) 2019-08-20 11:29:33 -04:00