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

49419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stu Young
6a8bb99ad0 Merge pull request #20365 from edx/estute/remove-flaky-test 
delete flaky problem type bok choy test
 2019-04-30 13:15:42 -04:00
Jeremy Bowman
097807dc49 Fix time zone bug in send_verification_expiry_email (#20350) 2019-04-30 13:00:55 -04:00
Stuart Young
92192debca delete flaky problem type bok choy test 2019-04-30 09:28:14 -04:00
Syed Muhammad Dawoud Sheraz Ali
77255210dc Merge pull request #20324 from edx/dsheraz/prod-229 
avoid video url rewrite for third party videos
 2019-04-30 13:07:00 +05:00
DawoudSheraz
6d137790a4 avoid video url rewrite for third party videos 2019-04-30 10:53:53 +05:00
Bill Gardynski
0cbf4845cf INCR-197 (#20156) 2019-04-29 13:00:59 -04:00
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
Michael Youngstrom
0c509689ea Merge pull request #20353 from edx/youngstrom/incr-lms-pages 
INCR-216
 2019-04-29 11:45:13 -04: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
Michael Youngstrom
872cddedbf INCR 2019-04-29 09:37:44 -04:00
Zainab Amir
a4bfe788d8 Merge pull request #20325 from edx/zamir/LEARNER_7210_LMS_course_search 
LEARNER-7210 : Fix search to show courses one time
 2019-04-29 13:46:25 +05:00
Zainab Amir
14fdc28daa Fix search to show courses one time 
The course_listing.js view injects courses for search in
ul element containing class courses-listing. Removing this
class from journal and journal bundles will solve the problem

LEARNER-7210
 2019-04-29 12:07:56 +05: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
David Ormsbee
02fc547069 Merge pull request #20347 from edx/ormsbee/edxnotes_readme 
Initial commit of README for edxnotes.
 2019-04-26 17:00:27 -04:00
Feanil Patel
a9a407de9c Merge pull request #20345 from edx/feanil/user_api_readme 
Readme for the user_api.
 2019-04-26 15:44:28 -04:00
Michael Youngstrom
e868c54a18 INCR-176 2019-04-26 15:42:24 -04:00
Feanil Patel
839c778e14 Merge pull request #20346 from edx/feanil/mobile_api_readme 
Add a readme for the mobile_api.
 2019-04-26 15:41:13 -04:00
David Ormsbee
d80f8095bc Initial commit of README for edxnotes. 2019-04-26 13:57:37 -04:00
Feanil Patel
ccee040261 Add a readme for the mobile_api. 2019-04-26 13:51:13 -04:00
Feanil Patel
49a42787a5 Merge pull request #20331 from edx/feanil/add_codeowners 
An initial breakdown of our areas of the monolith.
 2019-04-26 13:49:54 -04:00
Feanil Patel
a774618853 Readme for the user_api. 2019-04-26 13:27:56 -04:00
David Ormsbee
adb14e13e2 Merge pull request #20334 from edx/ormsbee/xmodule_readme 
Initial README for XModule
 2019-04-26 13:25:03 -04:00
David Ormsbee
5b4ff6c3af Merge pull request #20332 from edx/ormsbee/track_readme 
Initial README for Track app
 2019-04-26 13:24:44 -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
Matt Drayer
6a09385ea5 Merge pull request #20342 from edx/mattdrayer/edx-enterprise-1.4.8 
Bump to edx-enterprise 1.4.8
 2019-04-26 12:27:58 -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
Matt Drayer
bd05fda8cc Bump to edx-enterprise 1.4.8 2019-04-26 11:30:14 -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
Feanil Patel
3c8b7f4988 Map areas to the core team. 
Have a platform-core team that can be responsible for everything that is
not already being owned by a more specific group.
 2019-04-25 15:55:19 -04:00
David Ormsbee
d2acc70f9f Update user_authn README to new format. 2019-04-25 15:49:43 -04:00
Feanil Patel
bd3625570d Add in some more teams. 2019-04-25 15:47:47 -04:00
Feanil Patel
6b89f9b257 Assign teams to code areas. 2019-04-25 15:40:55 -04:00
David Ormsbee
d11ec72030 Merge pull request #20330 from edx/ormsbee/student_app_readme 
Initial README for Student app
 2019-04-25 15:14:58 -04:00
Feanil Patel
0316ec760c Merge pull request #20329 from edx/feanil/courseware_readme 
Initial README for the courseware djangoapp.
 2019-04-25 15:14:20 -04:00
David Ormsbee
e2ec126d0d Initial README for Discussion 2019-04-25 15:13:59 -04:00
David Ormsbee
f42f8aedc4 Initial README for XModule 2019-04-25 14:40:18 -04:00
Feanil Patel
22cc45bb61 Cleanup based on review. 2019-04-25 14:40:11 -04:00
Michael Youngstrom
ceaff53be6 INCR-192 2019-04-25 14:14:48 -04:00
Michael Roytman
66dc07a49f Merge pull request #20295 from edx/mroytman/EDUCATOR-4229-lms-redirection-idp 
add LMS endpoint to redirect to identity provider
 2019-04-25 14:13:06 -04:00
Michael Youngstrom
adb426d56f Merge pull request #20327 from edx/youngstrom/INCR-120 
INCR-120
 2019-04-25 14:00:51 -04:00
David Ormsbee
cf42c67e52 Initial README for Track app 2019-04-25 13:53:55 -04:00
Constanza Abarca
bf0c109b66 INCR-191 2019-04-25 13:51:23 -04:00