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

50529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hammad Ahmad Waqas
22b650741b reverting changes in MKTG_URL_LINK_MAP 2019-07-24 18:14:09 +05:00
Aarif
8526a989c3 Merge pull request #21115 from edx/INCR-446 
INCR-446 Python 3 compatibility
 2019-07-24 16:21:05 +05:00
Aarif
f2864f8e5c Merge pull request #21075 from edx/INCR-410 
INCR-410 Python 3 compatibility
 2019-07-24 16:04:26 +05:00
Muhammad Ammar
9525dafde0 Merge pull request #21186 from edx/ammar/upgrade-edx-enterprise-and-edx-rbac 
unpin edx-rbac
 2019-07-24 16:02:49 +05:00
edX Transifex Bot
7731b0e172 fix(i18n): update translations 2019-07-24 06:08:36 -04:00
aarif
86b810a23a ran python-modernize and isort on files mentioned in INCR-410 
Updated the file as suggested

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality
 2019-07-24 09:50:13 +00:00
muhammad-ammar
3b1a35ee39 upgrade edx-enterprise and edx-rbac 2019-07-24 13:35:04 +05:00
edX Transifex Bot
0544c6d826 fix(i18n): update translations 2019-07-24 03:08:58 -04:00
Ayub
78f9a0d19c Merge pull request #21079 from edx/INCR-418 
INCR-418 python3 compatibility
 2019-07-24 09:48:27 +05:00
Ayub
a5f9cb5227 Merge pull request #21078 from edx/INCR-417 
INCR-417 python3 compatibility
 2019-07-24 09:47:23 +05:00
Ayub
6b034760e0 Merge pull request #21077 from edx/INCR-416 
INCR-416 python3 compatibility
 2019-07-24 09:46:03 +05:00
Ayub
bf47019e4c Merge pull request #21076 from edx/INCR-414 
INCR-414 python3 compatibility
 2019-07-24 09:44:48 +05:00
Douglas Hall
fbc2c3899e Upgrade edx-enterprise to 1.8.2. (#21195) 2019-07-23 16:27:14 -04:00
David Ormsbee
a84e3b2252 Merge pull request #20819 from open-craft/kshitij/allow-specifying-mongo-auth-source 
[BB-1289] Add support for MongoDB authentication database
 2019-07-23 16:15:33 -04:00
Kshitij Sobti
61bb9bc6e2 Add support for using an authentication database for MongoDB. 
A popular convention is to have user accounts stored in a separate authentication
database. This change add support for configuring edx-platform to work with
such a setup.
 2019-07-24 01:16:33 +05:30
Dave St.Germain
e95e87dda8 Merge pull request #21193 from edx/dcs/upgrade 
Make upgrade
 2019-07-23 15:30:04 -04:00
Dave St.Germain
85b24624ce Make upgrade 2019-07-23 14:28:19 -04:00
Ned Batchelder
87c7cbde4d Merge pull request #21191 from edx/nedbat/more-docs 
Move existing docs down a level to make room for more
 2019-07-23 12:07:46 -04:00
Ned Batchelder
83f66af978 Merge pull request #21138 from edx/nedbat/master-wtw 
Who-tests-what, rebased onto master, with make upgrade
 2019-07-23 11:48:47 -04:00
Hasnain Naveed
3faf987fc1 Merge pull request #21189 from edx/hasnain-naveed/WL-1948 
WL-1948 | Added cornerstone in CMS.
 2019-07-23 18:26:52 +05:00
adeelehsan
43604eb6f7 Merge pull request #21188 from edx/aehsan/prod-410/translation_strings_are_passed_to_zendesk 
Translation moved to field level for questions in financial form
 2019-07-23 18:17:44 +05:00
hasnain-naveed
c42d7de780 WL-1948 | Added cornerstone in CMS. 2019-07-23 17:39:16 +05:00
Ned Batchelder
3b69fe0b47 Move existing docs down a level to make room for more 2019-07-23 08:31:15 -04:00
adeelehsan
9fb1b53aa7 Translation removed from constants in financial form 
PROD-410
 2019-07-23 17:31:10 +05:00
adeel khan
561aa62da7 Merge pull request #21187 from edx/adeel/fix_wiki_template 
Fix wiki template missing endfilter expression
 2019-07-23 17:26:26 +05:00
noraiz-anwar
570cd673ef change task_input field's type from CharField to TextField 2019-07-23 17:21:03 +05:00
Ayub
f2be56c3fb Merge pull request #21074 from edx/INCR-412 
INCR-412 python3 compatibility
 2019-07-23 14:25:17 +05:00
Aarif
dc6e72652a Merge pull request #21045 from edx/INCR-391 
INCR-391 Python 3 compatibility
 2019-07-23 13:28:49 +05:00
Aarif
f31a5eaeef Merge pull request #21043 from edx/INCR-390 
INCR-390 Python 3 compatibility
 2019-07-23 13:28:14 +05:00
Adeel Khan
0b9019c618 Fix wiki template missing endfilter expression 2019-07-23 13:13:55 +05:00
Ayub
e8fa5a4fc9 Merge pull request #21164 from edx/INCR-347-2 
INCR-347 python3 compatibility
 2019-07-23 13:00:08 +05:00
Ayub khan
0698c10d29 INCR-412 python3 compatibility 2019-07-23 12:57:16 +05:00
Ayub
6db7a08268 Merge pull request #21072 from edx/INCR-408 
INCR-408 python3 compatibility
 2019-07-23 12:33:40 +05:00
Ayub
d98133a96a Merge pull request #21071 from edx/INCR-407 
INCR-407 python3 compatibility
 2019-07-23 12:30:41 +05:00
Ayub
829855f6c5 Merge pull request #21070 from edx/INCR-406 
INCR-406 python3 compatibility
 2019-07-23 12:30:14 +05:00
Aarif
00717a5f77 Merge pull request #21117 from edx/INCR-448 
INCR-448 Python 3 compatibility
 2019-07-23 12:26:25 +05:00
Aarif
89f5282089 Merge pull request #21137 from edx/INCR-343 
INCR-343 Python 3 compatibility
 2019-07-23 12:25:59 +05:00
Ned Batchelder
2234aeb1ab Coverage et al that support who-tests-what 2019-07-22 16:24:55 -04:00
Matt Hughes
7dbf400393 Bump super-csv version 
JIRA:EDUCATOR-4435
 2019-07-22 14:54:45 -04:00
Alex Dusenbery
8dbc1c2fcc EDUCATOR-4498 | Allow generate_jwt_signing_key to not include key prefixes. 2019-07-22 13:57:11 -04:00
Kyle McCormick
13681eb499 Add --update option to create_dot_access (#21172) 2019-07-22 13:15:23 -04:00
David Ormsbee
7c9f4a2533 Merge pull request #21178 from edx/ormsbee/remove_dashbaord_cookie_reset 
Remove user cookie reset on Student Dashboard.
 2019-07-22 10:40:42 -04:00
Ayub
16c7227c07 Merge pull request #21068 from edx/INCR-403 
INCR-403 python3 compatibility
 2019-07-22 14:52:04 +05:00
Ayub
560da82837 Merge pull request #21067 from edx/INCR-402 
INCR-402 python3 compatibility
 2019-07-22 14:47:18 +05:00
Aarif
04bcfa5c3e Merge pull request #21083 from edx/INCR-422 
INCR-422 Python 3 compatibility
 2019-07-22 14:33:48 +05:00
Aarif
5ec20b98b1 Merge pull request #21112 from edx/INCR-435 
INCR-435 Python 3 compatibility
 2019-07-22 14:28:26 +05:00
Ayub
044dc5f10a Merge pull request #21038 from edx/INCR-384 
INCR-384 python 3 compatibility
 2019-07-22 14:24:00 +05:00
Ayub
6e1cd04ddd Merge pull request #21036 from edx/INCR-386 
INCR-386 python3 compatibility
 2019-07-22 14:23:06 +05:00
Aarif
d77b2fe9cc Merge pull request #21082 from edx/INCR-415 
INCR-415 Python 3 compatibility
 2019-07-22 13:53:15 +05:00
aarif
bb705970b0 ran python-modernize and isort on files mentioned in INCR-391 
changes made to comply with quality

ran python-modernize and isort on files mentioned in INCR-391
 2019-07-22 13:48:52 +05:00