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

39511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
d294a91fb1 Clarify instructor vs staff accessible features on dashboard 
Using the guideline "Course staff should have access to features related to
individual learners, but not course-wide modifications", most tools on the
student admin sub-tab of the instructor dashboard should be available to
staff as well as instructors.

TNL-5907
 2016-11-30 15:36:37 -05:00
Gregory Martin
41e852fed5 Merge pull request #14059 from edx/yro_fix-montevideo-tz 
Yro fix montevideo tz
 2016-11-30 15:25:31 -05:00
Eric Fischer
264d1940bf Merge pull request #13989 from proversity-org/proversity/fix-removed-in-django-19-warning-studio 
Remove warning RemovedInDjango19Warnings in Studio
 2016-11-30 15:06:30 -05:00
Eric Fischer
bf64d17f0a Merge pull request #14071 from edx/efischer/reversify_migration 
Allow grades app to be zero-migrated
 2016-11-30 15:01:51 -05:00
Cliff Dyer
876cb596f0 Merge pull request #14065 from edx/cdyer/flakies-2016-11-29 
Mark flaky tests flaky
 2016-11-30 13:39:33 -05:00
Eric Fischer
33273eed4e rectify old require.js hackery 2016-11-30 12:48:21 -05:00
Ben Patterson
73c3066976 Merge pull request #14056 from edx/benp/fix-flaky-paver-test-pep8 
Fix flaky paver test pep8
 2016-11-30 12:33:45 -05:00
Kevin Falcone
1956e2cf4d Merge pull request #14077 from edx/jibsheet/upgrade-new-relic 
7 Months of bugfixes and features
 2016-11-30 12:06:09 -05:00
Gregory Martin
83cfeb9d88 update pytz, update ora-2 2016-11-30 11:44:48 -05:00
sanfordstudent
c740111b9c Merge pull request #14066 from edx/sstudent/TNL-5993 
Separating problem raw score changed and problem weighted score changed
 2016-11-30 11:19:08 -05:00
Kevin Falcone
2b88cf8300 7 Months of bugfixes and features 
https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes
 2016-11-30 10:50:03 -05:00
Eric Fischer
47afbcf832 Allow grades app to be zero-migrated 2016-11-30 10:30:32 -05:00
Sanford Student
4eb5311ece Separating problem raw score changed and problem weighted score changed signals 
For TNL-5993
 2016-11-30 10:15:07 -05:00
jagonzalr
e9b121b8cd prevent RemovedInDjango19Warnings 2016-11-30 10:06:13 -05:00
Toby Lawrence
205ded9918 Merge pull request #14068 from edx/release 
Merge release back into master
 2016-11-30 08:06:26 -05:00
noraiz-anwar
989d01b5ad Merge pull request #14049 from edx/PLAT-1102 
Fix command opts for paver command
 2016-11-30 14:37:35 +05:00
Gregory Martin
0c40dfc147 Merge pull request #14048 from edx/yro_fix-sectionformat-bug 
add section format to fix display in accordion
 2016-11-29 16:04:36 -05:00
Brian Jacobel
f47ab54905 Merge pull request #14017 from edx/bjacobel/susy-reup 
Susy performance fixes in Platform, take 2
 2016-11-29 15:57:06 -05:00
Toby Lawrence
68714c58a2 Merge pull request #14046 from edx/release-candidate 
Release Candidate rc/2016-11-29
 2016-11-29 14:45:04 -05:00
Simon Chen
3567c4e407 Merge pull request #14058 from edx/schen/ECOM-6396 
Remove JWT authentication validator to fix program editor on studio bug
 2016-11-29 14:24:36 -05:00
Brian Jacobel
0144d91ab8 Fix certificates issues in metadata layout 2016-11-29 13:53:56 -05:00
Brian Jacobel
ae5953a231 Fix for new program page not rendering full-width 2016-11-29 13:10:21 -05:00
J. Cliff Dyer
cdbb48b71b Mark flaky tests flaky 2016-11-29 11:10:06 -05:00
Eric Fischer
a42a6455fa Merge pull request #14061 from edx/efischer/celery_logging 
Add logging around problematically queued task
 2016-11-29 11:03:56 -05:00
Simon Chen
664920b930 Update the Javascript to remove JWT token auth 
ECOM-6396
 2016-11-29 10:25:22 -05:00
Brian Jacobel
5492fb9b8b Merge pull request #14057 from edx/bjacobel/discussion-test-fixture-cleanup 
Get rid of this 4000-char long line
 2016-11-29 09:59:06 -05:00
Eric Fischer
f69b2c41cb Additional Logging for task queue operation 2016-11-29 09:43:56 -05:00
noraiz-anwar
d632fa8672 removed bug related to theme assets 2016-11-29 14:25:59 +05:00
M. Rehan
a0f99e6d4a Merge pull request #14050 from edx/mrehan/ecom-6154-integrity-error 
ECOM-6154 – remove transaction.atomic decorator
 2016-11-29 12:55:50 +05:00
Ben Patterson
0faa445990 Use proper pattern on entire class. 2016-11-28 17:17:20 -05:00
Toby Lawrence
6cdb417019 Merge pull request #13879 from open-craft/haikuginger/disable-ccx-studio 
Remove access to CCX courses from Studio
 2016-11-28 15:44:29 -05:00
Gregory Martin
fcf3f0b32f add section['format'] 2016-11-28 14:57:10 -05:00
Christina Roberts
af504fc61d Merge pull request #13805 from edx/christina/ac-583 
Christina/ac 583
 2016-11-28 12:22:55 -05:00
Brian Jacobel
7806b8a482 Out-of-band cleanup on this test fixture because it horrified me so much 2016-11-28 12:00:03 -05:00
Ben Patterson
3cd107cc0a Fix flaky condition in pep8 noisy report test. 2016-11-28 11:37:57 -05:00
Nimisha Asthagiri
dacc1f3c28 Merge pull request #14055 from edx/naa/fix-capa-max-score 
Fix CAPA's max_score computation
 2016-11-28 10:58:59 -05:00
cahrens
e095da59ec Restore grading type label. 
TNL-6002
 2016-11-28 10:55:46 -05:00
Chris Rodriguez
29dcbfefe4 Progress graph a11y updates. 
TNL-5891
 2016-11-28 10:55:39 -05:00
Eric Fischer
a9960e93f5 Merge pull request #14019 from edx/efischer/verify_times 
Localize times in verify_student
 2016-11-28 09:19:04 -05:00
Albert (AJ) St. Aubin
be7f6ecb6c Merge pull request #14036 from edx/aj/AC588_TNL-5894 
Aj/ac588 tnl 5894
 2016-11-28 08:25:24 -05:00
Attiya Ishaque
69cd73857a Merge pull request #14054 from edx/TNL-6004-fixing-500-error 
TNL-6004 Fixing 500 in video transcripts.
 2016-11-28 18:13:33 +05:00
Nimisha Asthagiri
562aeee0ba Fix CAPA's max_score computation 2016-11-28 07:51:03 -05:00
Albert St. Aubin
282ded7442 Addressed test failures and PR comments 
TNL-5894
 2016-11-28 07:12:23 -05:00
Lucky Jindal
cb22b909b6 AC-588: Fixed header levels,removed unneccessary element 2016-11-28 07:12:23 -05:00
attiyaishaque
f3a30e6f08 TNL-6004 Fixing 500 in video transcripts. 2016-11-28 15:28:39 +05:00
Qubad786
05ad083ae0 remove transaction.atomic decorator 2016-11-28 01:43:42 +05:00
Marko Jevtić
ab44b12a72 Merge pull request #14052 from edx/mjevtic/TNL-6009 
[TNL-6009] Mark test as flaky
 2016-11-25 10:22:23 +01:00
Marko Jevtic
682e030ad0 [TNL-6009] Mark test as flaky 2016-11-25 08:12:40 +00:00
Andy Armstrong
3fb7134efc Merge pull request #14020 from edx/andya/update-gemnasium-libraries 
Clean up npm-installed packages
 2016-11-23 14:02:29 -05:00
Eric Fischer
1aff229007 Localize Times in verify_student 
Now using the DateUtils javascript to handle this more correctly in webpages.

TNL-5959
 2016-11-23 11:55:23 -05:00