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

19314 Commits

Author SHA1 Message Date
David Ormsbee
d2af1d4c5b Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-05-08 12:42:44 -04:00
Christie Rice
41bec63cc7 Merge pull request #20451 from edx/crice/REVEM-329_date 
REVEM-239 Add audit access expiration deadline to user-metadata
 2019-05-08 09:49:10 -04:00
Christie Rice
6db32a36bc REVEM-239 Add audit access expiration deadline to user-metadata 2019-05-08 08:53:21 -04:00
DawoudSheraz
ca0800a4b1 added logs for more information 2019-05-08 16:29:33 +05:00
uzairr
3d7b60dde4 Make copyright year dynamic 
Currently, course email templates have hard-coded copyright year.
Marketing team needs to ping engineering to update it every year.
In this PR, steps are taken to make it dynamic.

PROD-106
 2019-05-08 13:08:28 +05:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
jansenk
1caa647621 add program course enrollment PATCH 2019-05-07 15:52:03 -04:00
David Ormsbee
21cc1f4719 Merge branch 'master' into guruprasad/randomize-question-order-pr 2019-05-06 16:33:51 -04:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -04:00
Diana Huang
c8593a8615 Merge pull request #20265 from edx/diana/remove-diff-paid 
Remove Diff Paid experimental features.
 2019-05-03 16:03:48 -04:00
Diana Huang
c6a89b03b9 Remove Diff Paid experimental features. 2019-05-03 15:09:20 -04:00
Rick Reilly
350b4a2589 Add POST method for program enrollments 2019-05-03 14:14:04 -04:00
Alex Dusenbery
403fb52e93 Add a GET endpoint to list ProgramCourseEnrollment data. 2019-05-03 13:39:10 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
c606aaeb57 Discussion consolidation: quality 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
7b4b6c3539 Move notifier and notification_prefs to discussion/ 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
b949452eb2 Move discussion_api to discussion/rest_api 2019-05-03 12:07:21 -04:00
Nimisha Asthagiri
16edae0822 Move comment_client into django_comment_common 2019-05-03 12:07:20 -04:00
Matthew Piatetsky
38aeafefb0 Merge pull request #20363 from edx/REVMI-170 
[WIP] add first purchase offer banner on course home
 2019-05-03 11:56:21 -04:00
Uzair Rasheed
a72d71deea Merge pull request #20380 from edx/PROD-185/fix-text-alignment-in-table 
Fix text alignment for word-break
 2019-05-03 12:50:11 +05:00
jansenk
6052a4e4c6 add program course enrollment post endpoint 2019-05-02 17:42:18 -04:00
Matthew Piatetsky
75dc4459cd add first purchase discount banner on course home 2019-05-02 16:14:16 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Dave St.Germain
d9c7db3c44 Merge pull request #20367 from edx/dcs/ada-reason 
Added a reason field for due date extensions
 2019-05-02 14:27:07 -04:00
Nimisha Asthagiri
83f35b544d Merge pull request #20355 from edx/bom/discussions-colocation 
Discussions consolidation
 2019-05-02 08:08:03 -04:00
uzairr
64a87c9173 Fix text alignment for word-break 
Recent google chrome updates showing awkard alignments on table.To
avoid them modifications in word-break css property are carried out
so that usability of content remains coherent on all browsers.

PROD-185
 2019-05-02 16:19:08 +05:00
Zainab Amir
ceb362d05d Remove extra quotation mark from template 2019-05-02 11:48:14 +05:00
Nimisha Asthagiri
31e9219c89 Discussion consolidation: review comments 2019-05-01 21:13:57 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
Nimisha Asthagiri
c2e232a3d4 Discussion consolidation: quality 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
97862d2ed7 Move notifier and notification_prefs to discussion/ 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
db89a64d06 Move django_comment_client to discussion/ 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
3d1bb23809 Move discussion_api to discussion/rest_api 2019-05-01 19:13:10 -04:00
Nimisha Asthagiri
2839851bde Move comment_client into django_comment_common 2019-05-01 19:13:09 -04:00
Bill DeRusha
2b11068622 Revert "Convert Account Activation Emails to edx-ACE" 2019-05-01 16:30:09 -04:00
Nimisha Asthagiri
5db761ed5a Merge pull request #20368 from edx/arch/account-settings-toggle 
Account Settings: Toggle for Micro-frontend Redirect
 2019-05-01 13:39:19 -04:00
David Ormsbee
50a8360b1a Merge pull request #20023 from open-craft/symbolist/capa-xblock-1 
CapaModule to ProblemBlock [SE-397]
 2019-05-01 12:18:50 -04:00
Alex Dusenbery
20f0bc03d4 Add a GET API endpoint for program enrollments. 2019-05-01 11:35:38 -04:00
Nimisha Asthagiri
2a168a4e1b Account: Toggle for Microfrontend Redirect 
ARCH-636
 2019-05-01 11:31:48 -04:00
Usman Khalid
41c6236e0a Convert CapaModule to ProblemBlock. 
* Minimum possible changes were made to merge CapaModule & CapaDescriptor into
  one ProblemBlock class.
* There are no known changes in behavior.
* CapaModule and CapaDescriptor inherited from a number of classes which inherit
  from XModule or XModuleDescriptor but did not depend on them. For all these
  classes the methods were moved to mixins which did not inherit from either and
  then these mixins were added to ProblemBlock in the order which maintains MRO.
 2019-05-01 20:08:36 +05:00
Nimisha Asthagiri
c8f8e05616 Merge pull request #20339 from edx/bom/experiments_readme 
Initial README for the experiments app
 2019-05-01 09:07:42 -04:00
Nimisha Asthagiri
7fd001d465 Merge pull request #20348 from edx/bom/grades-readme 
Initial README for Grades
 2019-05-01 08:45:32 -04:00
Ned Batchelder
1113c4baec Merge pull request #20286 from edx/nedbat/sec-367 
URL patterns should be anchored. SEC-367
 2019-05-01 08:25:05 -04:00
Feanil Patel
b29e681dd5 Merge pull request #20352 from edx/feanil/learner_dashboard_readme 
Update learner dashboard README.
 2019-05-01 08:01:35 -04:00
Feanil Patel
cf95e5cb50 Update learner dashboard README. 2019-05-01 08:00:17 -04:00
Dave St.Germain
e15b86c9f3 Added a reason field for due date extensions 2019-04-30 15:22:50 -04:00
Jeremy Bowman
097807dc49 Fix time zone bug in send_verification_expiry_email (#20350) 2019-04-30 13:00:55 -04:00
DawoudSheraz
6d137790a4 avoid video url rewrite for third party videos 2019-04-30 10:53:53 +05: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