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

39495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Albert (AJ) St. Aubin
fa705d8366 Merge pull request #14042 from edx/aj/TNL-5774-flaky-test 
Aj/tnl 5774 flaky test
 2016-11-23 09:01:40 -05:00
Andy Armstrong
746e310088 Clean up npm-installed packages 2016-11-22 17:51:09 -05:00
Cliff Dyer
ca5c741f30 Merge pull request #14027 from edx/cdyer/mark-attempted-problems 
Use first_attempted value from database and attempted values from individual problems.
 2016-11-22 17:07:02 -05:00
Ned Batchelder
624f31f31d Merge pull request #14043 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-11-22 16:17:28 -05:00
J. Cliff Dyer
5350e31667 fixup: extract some common code. 2016-11-22 15:53:30 -05:00
Matthew Piatetsky
f1e75d031f Merge pull request #14008 from edx/ECOM-5537 
ECOM-5537 Add Media Kit and move sitemap in footer
 2016-11-22 15:40:28 -05:00
Matthew Piatetsky
ae7020cbf9 Add Media Kit and move sitemap in footer 2016-11-22 13:20:29 -05:00
J. Cliff Dyer
0e2534f3ec Wrap update_or_create in transaction to allow validation after save 2016-11-22 12:12:15 -05:00
J. Cliff Dyer
86c12e67cc fixup: Error instead of correcting on invalid inputs. 2016-11-22 11:48:33 -05:00
Ned Batchelder
bb8db567a3 Update translations (autogenerated message) 2016-11-22 16:26:49 +00:00
Albert St. Aubin
6752b90dae Removed flaky annotations and updated tests to correct flakiness 
TNL-5774
 2016-11-22 11:18:28 -05:00
Calen Pennington
ac2b5bccf2 Merge pull request #13717 from open-craft/smarnach/anonymous-id 
Allow to store multiple anonymous ids per (user, course)
 2016-11-22 10:11:40 -05:00
Renzo Lucioni
84c42ae1b8 Clean up construction of program detail page links 
We used to link program cards on the LMS program listing page to the marketing site. Those cards now link to detail pages also hosted by the LMS, rendering that functionality obsolete.

ECOM-5063
 2016-11-22 09:47:23 -05:00
Adam
f77c351244 Merge pull request #14035 from edx/adam/neo4j-add-detached-field 
specify if an item is detached
 2016-11-22 08:09:14 -05:00
J. Cliff Dyer
b6305a1553 Use first_attempted value from database 
TNL-5930
 2016-11-21 15:12:42 -05:00
Douglas Hall
5b432edee3 Merge pull request #14031 from edx/douglashall/WL-833 
WL-833 Allow for LinkedIn add to profile cert name override
 2016-11-21 14:49:53 -05:00