Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
31,160 Commits 1 Branch 0 Tags
033d36c8f5a28e0cf00db2d1ce11c6dd0ceba2ad
Commit Graph

31160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
033d36c8f5 Merge pull request #8627 from Stanford-Online/nick/fix-tab-templates 
Fix hint-problem tab bug TNL-2542
 2015-06-26 13:11:46 -04:00
Nick Parlante
98730f3141 Fix hint-problem tab bug TNL-2542 
Revert the removal of hint templates.
Move the 'tab' attribute in the new-problem yaml
files out one level, out of the 'metadata' section.
 2015-06-26 09:22:04 -07:00
Calen Pennington
e61b750524 Merge pull request #8678 from cpennington/improve-structure-cache-metrics 
Improve structure cache metrics
 2015-06-26 12:16:52 -04:00
Calen Pennington
ba971db1ba Merge pull request #8594 from cpennington/pass-xblock-parents 
Pass xblock parents
 2015-06-26 12:15:41 -04:00
Calen Pennington
67783f8d3e Sample more frequently, and always record unexpected cache misses 2015-06-26 11:17:53 -04:00
Calen Pennington
ec2e90f539 Improve the structure cache metrics with a course context, more standardized from_cache tag, and compression sizes 2015-06-26 11:17:53 -04:00
Calen Pennington
a25f91da69 Fix XBlock inheritance ordering. XBlockMixin and derivatives should always come after XBlock and derivatives 2015-06-26 11:05:38 -04:00
Will Daly
754eb9af18 Merge pull request #8655 from edx/will/more-login-cookie-info 
User info cookie
 2015-06-26 07:34:07 -07:00
Will Daly
7f451c8835 Merge pull request #8681 from edx/will/credit-provider-integration-fixups 
Credit provider integration fixups
 2015-06-25 18:02:54 -07:00
chrisndodge
0bc2c42e0b Merge pull request #8682 from edx/muhhshoaib/PHX-40-sorting-of-popular-coupon-codes 
PHX-40 added the sorting of the most popular coupon codes used.
 2015-06-25 20:27:06 -04:00
Braden MacDonald
22a3f8620a Merge pull request #8658 from open-craft/library-create-unrestricted 
Remove restrictions on library creation in Studio (SOL-808)
 2015-06-25 14:20:03 -07:00
Alison Hodges
05972a608e Merge pull request #8677 from edx/ahodges/video_help 
Fixes DOC-1715, video doc is now in the correct RTD project
 2015-06-25 16:25:34 -04:00
Will Daly
ab915d1992 Merge pull request #8676 from edx/will/fix-credit-provider-config-unicode-error 
Gracefully handle credit provider keys with unicode type
 2015-06-25 13:24:57 -07:00
Will Daly
da982341e7 Accept string-encoded timestamps 2015-06-25 13:18:30 -07:00
Will Daly
62742952a2 Make credit provider callback CSRF exempt 2015-06-25 13:04:45 -07:00
Braden MacDonald
24af22ca88 Remove restrictions on library creation in Studio 2015-06-25 12:57:56 -07:00
Muhammad Shoaib
0442e70072 PHX-40 added the sorting of the most popular coupon codes used. 2015-06-26 00:35:24 +05:00
Kyle McCormick
4d6cefcc3f Merge pull request #8665 from edx/mekkz/course-overviews-fix 
MA-879 Fix bug in course_start_datetime_text
 2015-06-25 15:04:31 -04:00
Kyle McCormick
8c505e6b36 MA-879 Fix bug in course_start_datetime_text 2015-06-25 14:16:56 -04:00
Alison Hodges
9ed127ec8a Fixes DOC-1715, video doc is now in the correct RTD project 2015-06-25 14:14:07 -04:00
Nimisha Asthagiri
c63ac86842 Merge pull request #8675 from edx/release-merge-test 
Release merge 06-24-2015
 2015-06-25 14:06:20 -04:00
Calen Pennington
fdf81042f5 Pass XBlock parents down to their children when constructing them, for caching 2015-06-25 13:59:46 -04:00
Calen Pennington
324d4785c1 Include stack traces when counting calls in unit tests 2015-06-25 13:58:00 -04:00
Will Daly
8548d55700 Gracefully handle credit provider keys with unicode type 2015-06-25 10:53:36 -07:00
Matt Drayer
ee479a0bbc Merge pull request #8673 from edx/mattdrayer/SOL-449 
mattdrayer/SOL-449: Add flaky decorator to bok choy test
 2015-06-25 13:22:32 -04:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -04:00
Matt Drayer
f7262a211e mattdrayer/SOL-449: Add flaky decorator to bok choy test 2015-06-25 11:50:57 -04:00
Utkarsh
091dc4c3aa Merge pull request #8650 from edx/utkjad/platform-eusc 
Moving xblock_user_state to edx-user-state-client, and add dependency to edx-platform
 2015-06-25 11:05:17 -04:00
Andy Armstrong
4ff1c8b38a Merge pull request #8529 from edx/andya/bokchoy-asset-pipeline 
Update Bok Choy to run against optimized static files
 2015-06-25 10:50:50 -04:00
Ahsan Ulhaq
950917945a Merge pull request #8671 from edx/ahsan/ECOM-1739-reverification-ask-for-webcam-permission-twice 
Reverification flow asks for permission to use the webcam twice
 2015-06-25 19:42:05 +05:00
cahrens
923edee15f Fix flaky test_import_timestamp test. 
TNL-2386
 2015-06-25 09:58:28 -04:00
Andy Armstrong
aa76d9482a Update Bok Choy to use optimized static assets 
TNL-2465
 2015-06-25 09:58:27 -04:00
Peter Fogg
5ca6bfeb70 Merge pull request #8668 from edx/peter-fogg/update-team-tab-urls 
Update URL when switching between Team tabs.
 2015-06-25 09:19:11 -04:00
Ahsan Ulhaq
84f03a16a6 Reverification flow asks for permission to use the webcam twice 
In-course Reverification checkpoint ask for the camera access twice on
Chrome.

ECOM-1739
 2015-06-25 15:39:51 +05:00
Utkarsh
dac018f459 Adding dependency for edx-user-state-client 2015-06-25 03:10:50 +00:00
Will Daly
4662246bf3 Merge pull request #8648 from edx/will/eligibility-provider-refactor 
Update credit eligibility
 2015-06-24 17:59:37 -07:00
Will Daly
34863c76c1 Make the user info cookie secure 2015-06-24 16:02:23 -07:00
Will Daly
75d194e279 Update credit eligibility 
* Update credit eligibility when a user satisfies an eligibility requirement.
* Refactor set_credit_requirement_status arguments.
* Use django-simple-history to track requirement status changes.
* Refactor progress page by moving credit into a helper function and adding comments.
 2015-06-24 15:19:27 -07:00
Peter Fogg
e6c7a571d1 Update URL when switching between Team tabs. 2015-06-24 18:00:16 -04:00
Christina Roberts
16807d7f6b Merge pull request #8663 from edx/christina/move-forgot-password-modal 
Move forgot_password_modal to login.html.
 2015-06-24 17:19:54 -04:00
Christina Roberts
5b91a97e4e Merge pull request #8654 from edx/christina/delete-dead-lms-code 
Delete LMS JS files that have no references to them.
 2015-06-24 16:04:45 -04:00
Christina Roberts
2013c96376 Merge pull request #8662 from edx/christina/remove-flaky-test 
Fix flaky teams test
 2015-06-24 16:03:57 -04:00
Nimisha Asthagiri
4b64316425 Merge branch 'rc/2015-06-24' into release 2015-06-24 15:12:05 -04:00
Christine Lytwynec
30c049c896 Merge pull request #8664 from edx/clytwynec/TE-937 
split common/lib and js unit tests into separate shards
 2015-06-24 14:53:41 -04:00
Mark Hoeber
9e7852352a Merge pull request #8601 from IONISx/tusbar/fix-enrollment-post-doc 
Fix misleading enrollment API documentation & fix pylint errors
 2015-06-24 13:34:58 -04:00
cahrens
a5fc4e6d6c Fix flaky test. 
TNL-2494
 2015-06-24 13:25:02 -04:00
Will Daly
5e86a64729 User info cookie 
* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.
 2015-06-24 09:44:50 -07:00
Ahsan Ulhaq
40808638b7 Merge pull request #8635 from edx/ahsan/ECOM-1594-Credit-eligibility-cms-accessibility-issues 
Credit Eligibility display on the CMS accessibility issues
 2015-06-24 21:42:41 +05:00
Bertrand Marron
f19b338170 Shorten long lines to resolve pylint issues 2015-06-24 17:55:24 +02:00
Bertrand Marron
e0ed2d8a3a Fix misleading enrollment API documentation 
The user parameter corresponds to the username, not the user ID.
 2015-06-24 17:55:24 +02:00