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

31111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
da93162f0d Studio: revising and minimizing font-face calls 2015-06-25 13:47:56 -04: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
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
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
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
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
Christine Lytwynec
7f9bec933c split common/lib and js unit tests into separate shards 2015-06-24 11:40:39 -04: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
Ahsan Ulhaq
0ae22a3b08 Credit Eligibility display on the CMS accessibility issues 
There were some accessibility issues on the cms side which are addressed

ECOM-1594
 2015-06-24 19:58:01 +05: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
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
Will Daly
545f521933 Merge pull request #8652 from edx/will/logged-in-cookie-cleanup 
Remove duplicate logged-in-cookie helper methods
 2015-06-23 13:53:37 -07: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
Will Daly
b89ad57cb7 Remove duplicate logged-in-cookie helper methods 
There were two helper methods that set the marketing site
"logged in" cookie.  This commit deletes one of them
and ensures that all callers are using the other one.
 2015-06-23 12:47:15 -07:00
Christine Lytwynec
e947a92909 Merge pull request #8622 from edx/clytwynec/quiet_sass_compile_warnings 
pass debug option through to compile_sass
 2015-06-23 15:46:05 -04:00
Christine Lytwynec
16745cdec3 pass debug option through to compile_sass 2015-06-23 14:39:06 -04:00
Christine Lytwynec
f81e373bd4 don't use hardcoded date in verification email test 2015-06-23 14:33:25 -04:00
Tyler Nickerson
da16f4441e Merge pull request #8592 from edx/nickersoft/improved-embargo-restriction 
XCOM-416: Improved basket API's handling of embargo restrictions
 2015-06-23 14:18:13 -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
Jesse Zoldak
9a94c60147 Merge pull request #8644 from edx/zoldak/TE-950 
Update bok-choy version
 2015-06-23 12:57:56 -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
Will Daly
9efe3201da Merge pull request #8568 from edx/will/credit-provider-api-timestamp-update 
Update the format of the credit provider timestamp.
 2015-06-23 08:46:30 -07:00
Jesse Zoldak
79527f8191 Update bok-choy version 2015-06-23 11:22:12 -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