Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,415 Commits 1 Branch 0 Tags
6d137790a41eeb3bef3b7a546c6e49af5ebb00a6
Commit Graph

3462 Commits

Author SHA1 Message Date
edx-pipeline-bot
bfea6765f4 Merge pull request #20359 from edx/release-mergeback-to-master 
Merge release back to master
 2019-04-29 20:54:35 +05:00
Constanza
24981f87f4 INCR-194 (#20318) 
* INCR-194

* fixed error, the import absolute_import instruction should have been at the beginning of the file

* added empty line required by PEP 8

* fixed comments order

* trailing whitespace fixed
 2019-04-29 10:51:18 -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
Michael Youngstrom
9ec16b2272 Merge pull request #20351 from edx/youngstrom/INCR-176 
INCR-176
 2019-04-26 17:31:26 -04:00
Michael Youngstrom
e868c54a18 INCR-176 2019-04-26 15:42:24 -04:00
Feanil Patel
a774618853 Readme for the user_api. 2019-04-26 13:27:56 -04:00
Matthew Piatetsky
b64664932d Revert "Merge pull request #20272 from cpennington/revmi-34-recheck-access" 
This reverts commit 5d99714aed, reversing
changes made to 5424155cd0.
 2019-04-26 13:19:13 -04:00
David Ormsbee
2359233976 Merge pull request #20338 from edx/ormsbee/heartbeat_readme 
Initial README for heartbeat app
 2019-04-26 11:30:28 -04:00
Michael Youngstrom
2cd6e4650c Merge pull request #20322 from eduNEXT/coa/incr-191 
INCR-191
 2019-04-26 11:29:10 -04:00
David Ormsbee
42f76a6483 Merge pull request #20337 from edx/ormsbee/user_authn_readme 
Update user_authn README to new format.
 2019-04-26 11:27:19 -04:00
Nimisha Asthagiri
6623553649 Merge pull request #20321 from edx/arch/account-settings-enterprise 
Account API: enforce Enterprise policy on backend
 2019-04-25 17:50:25 -04:00
Michael Youngstrom
295f0f5f8a Merge pull request #20333 from edx/youngstrom/INCR-192 
INCR-192
 2019-04-25 17:01:45 -04:00
Stu Young
48c32a4367 Merge pull request #20316 from eduNEXT/anmrdz/INCR-193 
INCR-193
 2019-04-25 16:19:36 -04:00
David Ormsbee
a148d63f95 Initial README for heartbeat app 2019-04-25 16:00:53 -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
d2acc70f9f Update user_authn README to new format. 2019-04-25 15:49:43 -04:00
David Ormsbee
e2ec126d0d Initial README for Discussion 2019-04-25 15:13:59 -04:00
Michael Youngstrom
ceaff53be6 INCR-192 2019-04-25 14:14:48 -04:00
Michael Youngstrom
adb426d56f Merge pull request #20327 from edx/youngstrom/INCR-120 
INCR-120
 2019-04-25 14:00:51 -04:00
Constanza Abarca
bf0c109b66 INCR-191 2019-04-25 13:51:23 -04:00
Nimisha Asthagiri
dd94ae7e37 Refactor per Scouts rule 2019-04-25 13:33:30 -04:00
Stu Young
492d4eee34 Merge pull request #20315 from eduNEXT/anmrdz/INCR-165 
INCR-165
 2019-04-25 12:21:34 -04:00
Douglas Hall
d54a7109a6 Merge pull request #20323 from edx/douglashall/order_history_site_check 
Add site configuration check to order history MFE toggle.
 2019-04-25 12:10:53 -04:00
Stu Young
73578845ae Merge pull request #20317 from eduNEXT/anmrdz/INCR-174 
INCR-174
 2019-04-25 12:04:13 -04:00
Douglas Hall
9880676e6a Add site configuration check to order history MFE toggle. 2019-04-25 11:10:08 -04:00
Michael Youngstrom
2935466408 INCR-120 2019-04-25 10:31:19 -04:00
Dave St.Germain
589bd9b660 Merge pull request #20121 from edx/dcs/add-edx-when 
Add edx-when
 2019-04-25 10:00:57 -04:00
Nimisha Asthagiri
5acbb10e7c Account API: enforce Enterprise policy on backend 2019-04-24 22:37:26 -04:00
Michael Youngstrom
d0601d3b49 Merge pull request #20294 from edx/youngstrom/INCR-115 
INCR-115
 2019-04-24 16:38:56 -04:00
Dave St.Germain
42ede57383 Hide edx-when feature behind waffle flag 2019-04-24 16:36:56 -04:00
Ana Maria Rodriguez
75cae7ebd2 INCR-174 
Run python-modernize on openedx/core/djangoapps/heartbeat and openedx/core/djangoapps/signals
 2019-04-24 14:07:32 -05:00
Ana Maria Rodriguez
d2f7acf29c INCR-193 
Run python-modernize on openedx/features/course_experience/views and openedx/features/course_experience/tests
 2019-04-24 13:52:53 -05:00
Ana Maria Rodriguez
926cb5bb89 INCR-165 
Run python-modernize -w openedx/core/djangoapps/plugins
 2019-04-24 13:38:12 -05:00
Dave St.Germain
b4ccd03740 This adds a new django app -- edx-when -- that will copy start and due dates to mysql and allow per-learner overrides in the instructor dashboard, using the existing IDDE interface. 
It adds a data migration for existing IDDE data.
 2019-04-24 12:26:19 -04:00
Michael Youngstrom
353d006839 INCR-115 2019-04-24 11:07:37 -04:00
Matthew Piatetsky
c324b54d58 Merge pull request #20273 from edx/REVMI-152 
allow overriding FBE group access restrictions for problems at the unit level
 2019-04-24 10:18:23 -04:00
Matthew Piatetsky
6c2c896ec3 allow overriding FBE group access restrictions for problems at the unit level 2019-04-23 11:31:41 -04:00
Matt Hughes
2dc19c4139 Merge pull request #20263 from edx/matthugs/EDUCATOR-4158-logged-out-course-page-masters-only-courses 
Remove misleading copy for Master's-only courses' course pages'
 2019-04-22 11:02:59 -04:00
Hammad Ahmad Waqas
26ef549941 Merge pull request #20232 from edx/hammad/WL-1913 
WL-1913 | sync_hubspot_contacts Jenkins job disabled due to OOM
 2019-04-22 16:56:07 +05:00
Hammad Ahmad Waqas
90a8c3fd20 using generators instead of list for sync_hubspot_contact command to 
handle OOM issues
 2019-04-22 11:46:38 +05:00
Matt Hughes
1070ba0236 WIP: Remove misleading copy for Master's-only courses' course pages' 
Logged out learners shouldn't be lead to believe they'll be able to
enroll themselves into such courses, which we're worried they may've
read into the existing copy

JIRA:EDUCATOR-4158
 2019-04-19 10:30:24 -04:00
Calen Pennington
f18fc1e7aa Expose will_recheck_access further up the LMS xblock stack 2019-04-18 14:58:15 -04:00
Michael Youngstrom
7ddb806135 Merge pull request #20223 from edx/youngstrom/deprecate-lettuce 
Remove lettuce infrastructure
 2019-04-18 11:54:57 -04:00
Michael Youngstrom
bfe10720c6 Remove lettuce infrastructure 2019-04-18 09:58:21 -04:00
Ned Batchelder
7d964b12db Context managers need to clean up properly 
An @contextmanager will raise an exception from its yield statement if
an exception happens in the with-block that uses it.  If the context
manager needs to do clean up, it should do it even if an exception is
raised, so it needs to be done in a finally clause.
 2019-04-17 13:14:48 -04:00
Michael Roytman
93ce716327 Merge pull request #20201 from edx/mroytman/EDUCATOR-4159-masters-only-logged-in 
remove enroll CTA on course homepage for logged out users visiting a …
 2019-04-17 11:12:26 -04:00
Waheed Ahmed
3bdf83dba7 Update third party auth login page message. 
LEARNER-5258
 2019-04-17 15:20:38 +05:00
Michael Roytman
f7d0753210 remove enroll CTA on course homepage for logged out users visiting a Master's only course 2019-04-16 16:05:56 -04:00
Calen Pennington
3ffe64525d Don't check the schedule upgrade_deadline before sending Access Expiry Email 2019-04-16 13:13:01 -04:00