Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bmedx
961c196219 Change django-oauth-plus to use Github repo for Django 1.11 compat 2017-10-02 13:53:26 -04:00
Matt Tuchfarber
9de5cbea12 Bump enterprise to 0.48.2 2017-10-02 13:40:31 -04:00
Brian Mesick
72c5d952db Merge pull request #16132 from edx/bmedx/upgrade_djpyfs_PLAT-1743 
Upgrade django-pyfs to 1.0.7
 2017-10-02 13:23:04 -04:00
Gabe Mulley
d509ae1da1 change verified cert image 2017-10-02 12:21:18 -04:00
Matthew Piatetsky
d394c05236 Take users from track selection to course home instead of dashboard 
LEARNER-2546
 2017-10-02 12:15:12 -04:00
Tyler Hallada
d30ba9ff5e Document how to run @ddt.data methods with pytest 2017-10-02 11:50:30 -04:00
Michael Frey
28575fb3cb Merge pull request #16137 from edx/mjfrey/enrollment-rate-limit 
increase staff user rate limit
 2017-10-02 09:56:56 -04:00
Brian Mesick
6fbea7f191 Merge pull request #16106 from edx/bmedx/raw_sql_dates_PLAT-1531 
Update raw sql that uses datetimes to be Django 1.9 compatible
 2017-10-02 09:29:50 -04:00
Michael Frey
3e24572664 increase staff user rate limit 2017-10-02 09:03:46 -04:00
John Eskew
9987c42022 Merge pull request #16039 from edx/jeskew/paver_calls_tox_to_run_pytest 
Paver changes to run tox testing for system & lib tests.
 2017-10-02 08:39:23 -04:00
Uzair Rasheed
0241081842 Merge pull request #16123 from edx/LEARNER-2620/remove-fb-sdk 
Remove fb-sdk from base.txt requirements
 2017-09-30 13:35:51 +05:00
McKenzie Welter
18d8cd965c Merge pull request #16088 from edx/McKenzieW/learner-1997 
Add 'Hours of Effort' to Spanish certificates template context
 2017-09-29 15:53:35 -04:00
bmedx
8ceb7ffdaf Add zh_HANS language mapping to locale config 2017-09-29 15:00:11 -04:00
Nimisha Asthagiri
8721dad500 Merge pull request #16083 from edx/naa/grades-remove-read-only 
Grades: remove read_only param and create method
 2017-09-29 14:50:43 -04:00
Adam Palay
8dc58e548e address coursegraph issue where components had the same block id but different locations 2017-09-29 14:46:33 -04:00
John Eskew
de887b0dd1 fixup! Remove cache dirs from commonlib testing. 2017-09-29 14:36:58 -04:00
McKenzie Welter
1fe76d7c01 calculated hours of effort for rendering cert template context 2017-09-29 14:26:16 -04:00
bmedx
0f411e9880 Upgrade django-pyfs to 1.0.7 2017-09-29 11:46:58 -04:00
bmedx
cfd77f61f6 Update raw sql that uses datetimes to be Django 1.9 compatible 2017-09-29 11:33:28 -04:00
John Eskew
5d1363b428 fixup! Enable tox testing of system and commonlib via paver. Add support for django_version option to support Django 1.8/1.11. 2017-09-29 10:39:51 -04:00
John Eskew
0ee412831f Include paver in tox env - a few tests use it. 2017-09-29 10:39:51 -04:00
John Eskew
bbae00a480 Enable tox testing of system and commonlib via paver. 
Add support for django_version option to support Django 1.8/1.11.
 2017-09-29 10:39:51 -04:00
John Eskew
dc7bd3dbbf Remove cache dirs from commonlib testing. 2017-09-29 10:39:51 -04:00
John Eskew
ade766a5e2 Add tox to testing requirements. 2017-09-29 10:39:51 -04:00
Noraiz Anwar
bfe2b67eae Merge pull request #16115 from edx/noraiz/update-edx-proctoring 
update edx-proctoring to 1.2.2
 2017-09-29 13:04:54 +05:00
Rabia Iftikhar
a375531c97 Merge pull request #16120 from edx/ri/EDUCATOR-139-add-log 
EDUCATOR-139 add log to identify the cause of error
 2017-09-29 11:12:43 +05:00
Simon Chen
7b2f721443 Merge pull request #16125 from edx/schen/update_translation 
Update Translations
 2017-09-28 13:44:33 -04:00
Simon Chen
aa68fca46c Update Translations 2017-09-28 12:45:10 -04:00
Clinton Blackburn
0334df1eb3 Fixed bug with Studio API course run team update endpoint 
We now iterate over the given team members and create them individually, rather than in bulk. This avoids uniqueness errors that arise when we attempt a bulk create operation with an existing row.

LEARNER-2468
 2017-09-28 12:24:23 -04:00
uzairr
09e17022af Remove fb-sdk from base.txt requirements 
Facebook wants from edX to upgrade all graphAPI calls to v2.9,
after investigation it can be seen that edX-platform is accessing
graphAPI through python-social-auth package that is already accessing
v2.9.'base.txt' of the requirements has fb-sdk package that is also used
to access graphAPI,but currently, there is no area in our code that is
using this library that's why there is no need of it in requirements.

LEARNER-2620
 2017-09-28 19:36:06 +05:00
rabia23
ec105008b6 EDUCATOR-139 add log to identify the cause of error 2017-09-28 13:12:21 +00:00
Nimisha Asthagiri
1febdbfac9 Grades cleanup: remove read_only param and create method 
EDUCATOR-171
 2017-09-28 07:48:25 -04:00
Saleem Latif
55df657000 Merge pull request #16086 from edx/saleem-latif/ENT-656 
ENT-656: Create API View for ApiAccessRequest model
 2017-09-28 13:31:53 +05:00
Zubair Afzal
24df31402e Merge pull request #16067 from edx/zub/ENT-624-update-enterprise-api-support 
Ent 624 update enterprise api support
 2017-09-28 13:29:41 +05:00
Saleem Latif
cb7d8dcb86 Create API View for ApiAccessRequest model 2017-09-28 12:27:13 +05:00
Robert Raposa
643d7d2151 Merge pull request #16103 from edx/HarryRein/bok-choy-removal-flaky 
Remove Flaky StudentAdminTest test.
 2017-09-27 21:38:16 -04:00
Robert Raposa
8c3dd293e9 Merge pull request #16105 from edx/robrap/refactor-course-goal-enum 
Refactor Goal Enum to Choices (a.k.a. No Commit Left Behind)
 2017-09-27 21:28:09 -04:00
John Eskew
649f3ccd41 Merge pull request #16118 from edx/jeskew/lxml_upgrade_in_another_place 
Upgrade lxml in its other versioned requirement location.
 2017-09-27 12:16:53 -04:00
John Eskew
b7fc838d6f Upgrade lxml in its other versioned requirement location. 2017-09-27 12:09:24 -04:00
Clinton Blackburn
7d51c194a3 Updated Studio course run API endpoint to allow null enrollment dates 
LEARNER-2469
 2017-09-27 09:43:07 -04:00
zubair-arbi
4040c45f06 update enterprise api support for request users and enterprise service user 
ENT-624
 2017-09-27 18:04:44 +05:00
noraiz-anwar
f644593655 update edx-proctoring to 1.2.2 2017-09-27 18:03:54 +05:00
Michael LoTurco
dd949fad4d Merge pull request #16026 from edx/MLoTurco/learner-1995 
Include language specific templates in template lookup logic learner-1995
 2017-09-27 08:54:14 -04:00
McKenzie Welter
190b2c36fe Changed lookup logic to consider language learner-1995 2017-09-27 07:53:39 -04:00
Robert Raposa
23fbde8ef1 Refactor Goal Enum to Choices. 2017-09-26 15:59:07 -04:00
Uman Shahzad
f94558f464 Merge pull request #16094 from open-craft/uman/ent-0.48.1 
[WL-1240] [ENT-640] [ENT-628] [ENT-629] [ENT-630] [ENT-631] [ENT-634] [ENT-644] Bump to edx-enterprise to 0.48.1
 2017-09-27 00:16:34 +05:00
Harry Rein
08ab462c4a Remove old messaging wells. 
LEARNER-2236
 2017-09-26 14:32:06 -04:00
Harry Rein
6ba34f463a Remove Flaky StudentAdminTest test. 
EDUCATOR-552
 2017-09-26 13:42:29 -04:00
Ned Batchelder
ed9b93ff1a Merge pull request #16100 from edx/nedbat/lazy_format 
Have to format lazily for translated constant messages
 2017-09-26 13:05:16 -04:00
Ned Batchelder
f8f911ae5c Have to format lazily for translated constant messages 2017-09-26 11:39:36 -04:00