Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,459 Commits 1 Branch 0 Tags
945debb00fef627f42772cd535e6213bf4db0bb5
Commit Graph

48459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zachary Hancock
945debb00f Merge pull request #19739 from edx/zhancock/progress-override 
Grading Overrides on Progress Page
 2019-02-05 11:32:12 -05:00
Zach Hancock
8a55435b1e progress page to represent gradebook overrides 2019-02-04 17:06:53 -05:00
Jeremy Bowman
33d16d8e24 Merge pull request #19745 from edx/jmbowman/TE-2852 
TE-2852 Preserve screenshots in bok-choy pipeline jobs
 2019-02-04 15:53:19 -05:00
Dave St.Germain
bf692acea6 Merge pull request #19690 from edx/dcs/retire-perm 
Refactored the retirement permission to use Django rules
 2019-02-04 15:17:38 -05:00
Calen Pennington
703d510057 Merge pull request #19730 from edx/unicode3 
fix unicode strings in cms/
 2019-02-04 15:14:41 -05:00
Calen Pennington
c2d19b5930 Merge pull request #19728 from edx/unicode1 
Revert "Revert "change banner date localization to use dateutilfactory""
 2019-02-04 15:13:34 -05:00
Jeremy Bowman
727ef94326 TE-2852 Preserve screenshots in bok-choy pipeline jobs 2019-02-04 15:09:00 -05:00
Matthew Piatetsky
7df30938c4 fix unicode strings in cms/ 2019-02-04 13:01:51 -05:00
Matthew Piatetsky
b37bc75bb4 Revert "Revert "change banner date localization to use dateutilfactory"" 
This reverts commit 08cb56664b.
 2019-02-04 12:42:27 -05:00
Gabe Mulley
802cb0e491 Merge pull request #19732 from edx/REVMI-91/fix-fbe-banner-style 
REVMI-91: Fix FBE banner styling
 2019-02-04 12:07:54 -05:00
Jeremy Bowman
0b6fa0190d Merge pull request #19735 from edx/jmbowman/DEPR-9 
DEPR-9 Remove dependency on dogapi
 2019-02-04 12:05:44 -05:00
Matthew Piatetsky
150618cf9a Merge pull request #19729 from edx/unicode2 
update to newer version of edx-lint that includes updated unicode-format-string rule
 2019-02-04 10:59:20 -05:00
Gabe Mulley
25890a440f REVMI-91: Fix FBE banner styling 2019-02-04 09:58:02 -05:00
Alex Dusenbery
068b4a8c44 Distinguish zeros from null when considering grade overrides in subsection grades. 2019-02-02 16:08:01 -05:00
Jeremy Bowman
b162414e8c DEPR-9 Remove dependency on dogapi 2019-02-01 17:25:42 -05:00
Jeremy Bowman
2c9b04db21 Merge pull request #19717 from edx/jmbowman/py3_tox_fixes 
More fixes for Python 3 via tox
 2019-02-01 16:51:33 -05:00
Jeremy Bowman
c7fe747c7f More fixes for Python 3 via tox 2019-02-01 15:01:15 -05:00
Michael Youngstrom
dd1fdb3fa1 Merge pull request #19721 from edx/youngstrom/pycountry 
INCR-12: Upgrade pycountry for python3 support
 2019-02-01 13:46:46 -05:00
Christopher Pappas
e2df5760b6 Adding in py2 to py3 conversion script from hackathon 2019-02-01 13:29:12 -05:00
Matthew Piatetsky
883d250bde update to newer version of edx-lint that includes updated unicode-format-string rule 2019-02-01 12:39:36 -05:00
Calen Pennington
3296d5b2e0 Merge pull request #19225 from edx/fsheets/fix-unicode 
WIP: Cleanup from LEARNER-6668
 2019-02-01 12:02:23 -05:00
Christie Rice
545b93f1a6 Merge pull request #19724 from edx/crice/upgrade 
Run make upgrade
 2019-02-01 11:54:15 -05:00
Michael Youngstrom
3bb44a540f Upgrade pycountry for python3 2019-02-01 10:24:12 -05:00
Calen Pennington
95252f1a81 Run caniusepython3.pylint_checker 2019-02-01 10:03:42 -05:00
Christie Rice
7efd006cb6 Run make upgrade 2019-02-01 09:23:40 -05:00
Calen Pennington
040b60c38c Stop swallowing UnicodeEncodeErrors in courseware rendering 2019-02-01 09:22:54 -05:00
Farhanah Sheets
fb7d597554 unicode messages developer and user messages 2019-02-01 09:22:54 -05:00
adeelehsan
fb5d2b8806 Merge pull request #19656 from edx/aehsan/LEARNER-6943/adding_logs_for_investigation 
Adding log for investigation
 2019-02-01 15:44:18 +05:00
adeelehsan
88ef4de655 Adding log for investigation 
Logs added while fetching the
certificate template to investigate
LEARNER-6943s
 2019-02-01 11:46:50 +05:00
Christie Rice
618b8303c9 Merge pull request #19700 from edx/crice/INCR-13_pygraphviz 
INCR-13 Unpin pygraphviz and run make upgrade
 2019-01-31 17:08:23 -05:00
Julia Eskew
44d3bcbc41 Merge pull request #19688 from edx/juliasq/remove_dop_from_notes 
Read client ID/secret from DOT application instead of DOP client.
 2019-01-31 15:40:12 -05:00
Christie Rice
99686e4942 INCR-13 Unpin pygraphviz and run make upgrade 2019-01-31 14:37:37 -05:00
Julia Eskew
ed239ed0fd Read client ID/secret from DOT application instead of DOP client. 2019-01-31 13:57:23 -05:00
Dillon-Dumesnil
87cfba192c Merge pull request #19712 from edx/ddumesnil/remove-review-xblock 
Removing test file for removed review xblock
 2019-01-31 12:54:29 -05:00
Dillon Dumesnil
dbd85410f8 Removing test file for removed review xblock 2019-01-31 10:19:54 -05:00
Brittney Exline
3f04a5f222 Merge pull request #19704 from edx/bexline/ent1405 
ENT-1405 Upgrade edx-enterprise to 1.2.10
 2019-01-31 07:58:15 -07:00
Michael Youngstrom
a090d4b7a3 Merge pull request #19697 from edx/youngstrom/incr 
INCR-19: Move to python3-saml
 2019-01-31 09:30:46 -05:00
Agha Awais
30359a2995 Merge pull request #19668 from edx/awais/removed_old_lettuce_tests_for_courseware_problems 
removed lettuce files
 2019-01-31 10:29:58 +05:00
Michael Youngstrom
e7898d153d Move to python3-saml 2019-01-30 16:35:16 -05:00
Christie Rice
cc39aff697 Merge pull request #19686 from edx/crice/INCR-11_mailsnake 
INCR-11 Unpin mailsnake and run make upgrade
 2019-01-30 16:17:38 -05:00
Brittney Exline
dd686f8142 ENT-1405 Upgrade edx-enterprise to 1.2.10 2019-01-30 14:10:10 -07:00
Dillon-Dumesnil
b75ff17f4b Merge pull request #19685 from edx/ddumesnil/remove-review-xblock 
Remove review xblock from edx-platform
 2019-01-30 15:56:12 -05:00
Michael Youngstrom
6a43ae2a5d Merge pull request #19672 from edx/youngstrom/balance-shards 
Bump bokchoy shards and rebalance to decrease test times
 2019-01-30 15:44:32 -05:00
Christie Rice
b9150de7d0 INCR-11 Unpin mailsnake and run make upgrade 2019-01-30 14:54:25 -05:00
Christie Rice
ccd546d494 Merge pull request #19680 from edx/crice/INCR-2 
INCR-2 Unpin glob2 and run make upgrade
 2019-01-30 14:48:43 -05:00
Michael Youngstrom
0f3d0b69d6 Rebalance bokchoy sharding 2019-01-30 14:16:58 -05:00
Dave St.Germain
99368e63bc Refactored the retirement permission to use Django rules 2019-01-30 10:56:02 -05:00
Dillon Dumesnil
226fa767bc Remove review xblock from edx-platform 2019-01-30 10:20:01 -05:00
Stu Young
13cad83c8f Merge pull request #19692 from edx/estute/fix-typo-in-jenkinsfile 
fix typo in python jenkinsfile
 2019-01-30 09:51:12 -05:00
Stuart Young
31d0ab9321 fix typo in python jenkinsfile 2019-01-30 09:49:49 -05:00