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

8499 Commits

Author SHA1 Message Date
usama sadiq
db19e06047 MathJax Output Format update in Studio 
Changed the MathJax output format
from SVG to HTML in Studio side.
 2019-05-27 15:55:27 +05:00
Jeremy Bowman
f9929f32b5 Update quality threshold counts (#20681) 2019-05-24 08:27:54 -04:00
Cory Lee
b9c7c10ca7 Merge pull request #20654 from open-craft/jill/cms-worker-grades 
SE-1076 Campus.il Fixes issue encountered when cms worker updates grades
 2019-05-23 09:39:29 -04:00
Ned Batchelder
f00eb4f3b4 Merge pull request #20600 from edx/nedbat/fix-trademark-notice 
Correct the trademark notices
 2019-05-22 15:36:11 -04:00
Ned Batchelder
752b3072c4 Fix CSSlint issues 2019-05-22 13:03:20 -04:00
Jillian Vogel
320288c34a Fixes issue encountered when cms worker updates grades: 
Grades: SGF.update
...
Cannot grade student 2 in course course-v1:...  because of exception: 'Settings' object has no attribute 'GENERATE_PROFILE_SCORES'

(cherry picked from commit e0ae8f49a64c3148d446d7e535eca26016dd17d1)
 2019-05-21 08:49:02 +09:30
Dave St.Germain
0573b2e4d4 Grade runtime service support for Staff Graded Points 2019-05-16 10:21:46 -04:00
Ned Batchelder
09690ce667 Correct the trademark notices 
* edX should be lowercase everywhere

* Studio is not a trademark

* Our trademarks are all registered trademarks
 2019-05-16 06:16:51 -04:00
Brian Mesick
a4a009e57b Merge pull request #20222 from edx/bmedx/course_enrollment_history 
Re-adding django-simple-history for CourseEnrollment
 2019-05-09 13:02:07 -04:00
Awais Jibran
d53ba6cb1d Merge pull request #20358 from edx/zaid/prod-232 
Favicon icon fixed for studio.
 2019-05-08 18:40:39 +05:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
zaidbamber161
caf7a2c23f Fix favicon for edx studio 2019-05-07 18:36:49 +05:00
Nimisha Asthagiri
bda16a9b6b Merge pull request #20354 from edx/bom/adr-python-api 
Initial top-level ADRs
 2019-05-06 13:22:26 -04:00
AsadAzam
0e8a24c60e Merge pull request #20391 from edx/asad/educator-4013-remove-logs 
Reverted logs
 2019-05-06 12:28:12 +05:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -04:00
bmedx
17cb93dd51 Re-adding django-simple-history for CourseEnrollment 2019-05-03 16:16:41 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
asadazam93
eb2422990c Reverted logs 2019-05-03 16:10:17 +05:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
Bill DeRusha
2b11068622 Revert "Convert Account Activation Emails to edx-ACE" 2019-05-01 16:30:09 -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
Shadi Naif
07f588517b Convert Account Activation Emails to edx-ACE 2019-04-27 13:21:34 +03:00
Zainab Amir
e0296b373c Update the compiled js and jsx strings 
Right now pull_translations job does not compile the js and jsx
strings automatically, so manually added them here.

LEARNER-7045
 2019-04-24 12:18:20 +05:00
DawoudSheraz
643db20c74 extra space removed 2019-04-23 12:43:29 +05:00
DawoudSheraz
0a690c31a3 remove mathjax autocollapse feature 2019-04-23 12:33:54 +05:00
Michael Youngstrom
bfe10720c6 Remove lettuce infrastructure 2019-04-18 09:58:21 -04:00
Jeremy Bowman
cd2e58e093 DEPR-16 Stop using deprecated OpaqueKey methods (#20248) 2019-04-16 17:59:16 -04:00
albemarle
05a682f55e use new, shorter names for feature toggle annotations (#20202) 2019-04-12 15:46:09 -04:00
Zainab Amir
c6789ac4a9 Update compiled translation strings 
Currently the pull_translation job does not compile the js/jsx
strings. To update the .mo files correctly and reflect the translated
strings on prod the command paver i18n_dummy was run.

LEARNER-7045
 2019-04-11 17:51:51 +05:00
Christopher Pappas
59a1d6ab41 ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES from config as expected 
Moving rbac settings above plugins

Moving the setting above plugins in common.py for the lms and cms as well
 2019-04-05 17:27:13 -04:00
Michael Roytman
2b8ed58d2e Merge pull request #20086 from edx/mroytman/upate-proctoring-settings 
update proctoring settings link
 2019-03-29 12:21:00 -04:00
Michael Roytman
31fc4559c4 update proctoring settings link 2019-03-28 16:49:09 -04:00
Cory Lee
f6bf01661a Merge pull request #19959 from edx/coryleeio/remove_aws_py 
Remove aws.py
 2019-03-28 15:25:35 -04:00
Christopher Pappas
3fcf99f65b ENT-1556 - Adding in roles claim to jwt for use with edx rbac 
Adding logic that adds roles to jwt

Quality fixes
 2019-03-28 14:17:07 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Awais Jibran
3bfab9fd32 Adding more timing logs as course-rerun is slow for mitx-7.00x 2019-03-22 15:41:57 +05:00
Matt Tuchfarber
e6a7c58182 Merge pull request #19853 from edx/tuchfarber/add_username_replacement_api 
Adds username replacement API
 2019-03-21 12:39:23 -04:00
Ned Batchelder
8a612c4dfb Merge pull request #20027 from cclauss/Fix-F632 
Use ==/!= to compare str, bytes, and int literals
 2019-03-20 22:01:44 -04:00
Michael Roytman
20a9b7140c Merge pull request #20022 from edx/mroytman/update-studio-hiw-images 
update Studio How It Works images to reflect current state of Studio
 2019-03-20 09:25:52 -04:00
cclauss
bb31716c97 Use ==/!= to compare str, bytes, and int literals 2019-03-19 21:40:06 +01:00
Michael Roytman
c15746ccc0 update Studio How It Works images to reflect current state of Studio 2019-03-19 09:40:26 -04:00
David Ormsbee
7dcad7af55 Merge pull request #16496 from open-craft/josh/announcements-feature 
Dashboard announcements feature
 2019-03-18 16:04:38 -04:00
Nimisha Asthagiri
9c3472ab24 Merge pull request #19845 from eduNEXT/fmo/studio_sso_over_lms_flag 
Make the studio login over the lms optional using a feature flag
 2019-03-15 08:23:02 -04:00
Matt Tuchfarber
cda681e2f1 fix python tests 2019-03-13 23:04:41 -04:00
AsadAzam
fa3b294b30 Merge pull request #19953 from edx/asad/Educator-4013-add-logs 
Added logs
 2019-03-12 17:43:40 +05:00
asadazam93
a4071324e0 Added logs 2019-03-12 16:55:00 +05:00
Felipe Montoya
9195ec9f30 Addressing second feedback about redirect logic on logout behing feature flag 2019-03-11 13:09:13 -05:00
Felipe Montoya
14b4223b5e Addressing feedback 2019-03-11 12:02:38 -05:00
Felipe Montoya
80b977fff4 Make the studio login over the lms optional using a feature flag 2019-03-11 12:01:03 -05:00