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

11484 Commits

Author SHA1 Message Date
Matt Drayer
700eb8b702 mattdrayer/fix-progress/template: Improved web certificates support 2015-06-26 10:43:26 -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
Muhammad Shoaib
0442e70072 PHX-40 added the sorting of the most popular coupon codes used. 2015-06-26 00:35:24 +05:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -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
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
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
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
cahrens
df3d9112e1 Move forgot_password_modal to login.html. 
That is the only place using it.
 2015-06-24 11:06:16 -04:00
Aamir
f07e4b9b38 Merge pull request #8387 from edx/aamir-khan/ECOM-1524-dashboard-credit-display-new 
Aamir khan/ecom 1524 dashboard credit display new
 2015-06-24 19:02:57 +05:00
Marco Morales
2dfca626a7 Merge pull request #8151 from edx/marco/capa-styling 
Updated styling for basic capa problems (multiple choice, dropdown, checkboxes, numerical input and text input) including support for mobile app experience.
 2015-06-24 09:05:34 -04:00
aamir-khan
987889fc37 ECOM-1524: Display credit availability on the dashboard 2015-06-24 16:50:38 +05:00
David Ormsbee
39ab0f31dc Cache SplitMongo course structures in memcached. 
This is primarily to reduce load on MongoDB, where we've lately
had performance problems that we suspect are caused by very
large course structures being evicted from MongoDB's cache. This
may potentially give us a path to better performance as well,
but that's not the goal of this commit.

Surprisingly, LZ4 seemed to actually run more slowly than zlib
for this. Possibly because of some overhead in the Python
bindings? GZip was also surprisingly slow given that it uses
zlib underneath (something like 5x slower).

Use separate cache backend for caching structures.

Abstract out course structure cache.

add datadog metrics for compressed course structure sizes

Since we're using a different cache background, we don't need to have a cache prefix

Use dummy cache backend for tests.

Fallback to default cache if course_structure_cache doesn't exist.
 2015-06-23 23:24:05 -04:00
Christopher Lee
13dbfb8679 Merge pull request #8589 from edx/gprice/discussion-api-abuse-flagged 
Add abuse flagging to discussion API
 2015-06-23 18:08:58 -04:00
Greg Price
52a3306e2a Add abuse flagging to discussion API 
Flagging/unflagging is done by issuing a PATCH request on a thread or
comment endpoint with the "abuse_flagged" field set.
 2015-06-23 17:22:54 -04:00
Christine Lytwynec
9d42971440 Merge pull request #8646 from edx/clytwynec/fix-TestEmailMessageWithCustomICRVBlock 
don't use hardcoded date in verification email test
 2015-06-23 17:01:51 -04:00
cahrens
ead3cefa5f Remove unused setting. 2015-06-23 16:36:25 -04:00
cahrens
51a72c63fa Delete files that have no references to them. 2015-06-23 16:12:36 -04:00
Christopher Lee
9d6d922e68 Merge pull request #8544 from edx/gprice/discussion-api-thread-list-following 
Add followed thread retrieval to discussion API
 2015-06-23 16:08:51 -04:00
Christine Lytwynec
f81e373bd4 don't use hardcoded date in verification email test 2015-06-23 14:33:25 -04:00
Nickersoft
e184c78c0a XCOM-416: Embargo restrictions are now enforced during logistration 2015-06-23 14:17:43 -04:00
Greg Price
54756317f1 Add followed thread retrieval to discussion API 
This implements the "following" value for the "view" query parameter on
the thread list endpoint.
 2015-06-23 13:38:34 -04:00
Diana Huang
ecd237396e Merge pull request #8617 from edx/diana/course-tab-cleanup 
Switch tabs to use ugettext_noop for titles.
 2015-06-23 12:33:06 -04:00
frances botsford
bfd250ed61 Merge pull request #8596 from edx/frances/fix/course-content-margin 
adjust margin-bottom on courseware with license
 2015-06-23 11:53:15 -04:00
Diana Huang
e6cbff47b7 Switch tabs to use ugettext_noop for titles. 2015-06-23 11:08:41 -04:00
Kyle McCormick
aa5e2f49bd Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc. 2015-06-23 10:27:22 -04:00
Kyle McCormick
d84c3bd7a9 MA-776 change UserCourseEnrollmentsList endpoint to use course_overviews 2015-06-22 18:33:12 -04:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
Will Daly
3dafdd2fc5 Merge pull request #8625 from edx/will/js-test-fixup 
Fix JS tests that broke due to a conflict between merges
 2015-06-22 14:37:20 -07:00
Renzo Lucioni
f78d45080d Correct logistration GET parameter preservation test case 2015-06-22 16:25:52 -04:00
Will Daly
356cdeecb4 Fix JS tests that broke due to a conflict between merges 2015-06-22 13:22:17 -07:00
Sarina Canelake
e7cbcfff20 Merge pull request #8618 from edx/sarina/revert-8402 
Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
 2015-06-22 16:05:49 -04:00
Matt Drayer
f0f3766443 mattdrayer/ECOM-1773: Fixed invalid URL reversal 2015-06-22 14:04:43 -04:00
Sarina Canelake
1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware" 
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
 2015-06-22 13:55:53 -04:00
Nimisha Asthagiri
d9cdb5d691 Merge pull request #8615 from edx/nimisha/fix-unit-test 
ECOM-1772 Due date issue test case fixed.
 2015-06-22 13:50:55 -04:00
Christopher Lee
44e13af6be Merge pull request #8576 from edx/gprice/discussion-api-max-depth 
Enforce MAX_COMMENT_DEPTH in discussion_api
 2015-06-22 13:30:37 -04:00
Awais
1b0246e2af ECOM-1772 Due date issue test case fixed. 2015-06-22 13:04:21 -04:00
Will Daly
8c52c92bcb Reverification iOS support and refactor 
* Delete reverification templates
* Delete photocapture.js
* Delete unused "name change" end-points
* Rebuild the reverification views using Backbone sub-views
* Stop passing template names to the JavaScript code
* Avoid hard-coding the parent view ID in the webcam view (for getting the capture click sound URL)
 2015-06-22 08:45:12 -07:00
Ahsan Ulhaq
698f6fb2d3 Merge pull request #8550 from edx/ahsan/ECOM-1523-Credit-Eligibility-Progress-page-display-updated 
Credit eligibility requirements display on student progress page
 2015-06-22 19:54:38 +05:00
Marco Morales
8acc72975e Iniital refactor of capa styling for basic checkbox and multiple choice problem types, including additional comments to sass styles 2015-06-22 10:50:58 -04:00
Chris Dodge
42af5b8e35 fix problems with multi-seat purchases when accessibility review was completed 2015-06-22 10:43:54 -04:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page 
ECOM-1523
 2015-06-22 18:36:54 +05:00