Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,176 Commits 1 Branch 0 Tags
7437bcfe12e1d5ebff627909b41b88bc377aa1b8
Commit Graph

5479 Commits

Author SHA1 Message Date
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Braden MacDonald
caca3e1bdf SAML2 third_party_auth provider(s) - PR 8018 2015-06-26 13:23:59 -07:00
Sarina Canelake
9f46d9f0c5 Regression test: dark lang stays set through multiple pages 2015-06-26 13:15:44 -04:00
Sarina Canelake
cf80c96f0b Add i18n roundtrip regression tests for language pref and dark lang 
Tests would have caught issues raised in LOC-87
 2015-06-26 13:15:44 -04:00
Sarina Canelake
5fcdafd0cf Add i18n regression tests (LOC-72, LOC-85) 2015-06-26 13:15:42 -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
Muhammad Shoaib
0442e70072 PHX-40 added the sorting of the most popular coupon codes used. 2015-06-26 00:35:24 +05: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
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
aa76d9482a Update Bok Choy to use optimized static assets 
TNL-2465
 2015-06-25 09:58:27 -04: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
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
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
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
Calen Pennington
de142b2b51 Set a minimum number of Xblock constructions in field override tests 2015-06-23 13:32:50 -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
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
Renzo Lucioni
f78d45080d Correct logistration GET parameter preservation test case 2015-06-22 16:25:52 -04: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
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
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
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page 
ECOM-1523
 2015-06-22 18:36:54 +05:00
Awais
d5b7d285d6 ECOM-1772 Due date issue test case fixed. 2015-06-22 14:55:12 +05:00
utkjad
59e0d22fc3 Adding call stack manager 2015-06-19 20:43:26 +00:00
Diana Huang
5fb2a1fd8e Merge pull request #8583 from edx/diana/course-tab-cleanup 
Make course tab refreshing safer.
 2015-06-19 15:38:30 -04:00
Diana Huang
d779466f09 Make course tab refreshing safer. 2015-06-19 14:53:49 -04:00
Nimisha Asthagiri
e72eaf81ac Merge pull request #8582 from edx/cdodge/fix-none-totals 
fix price per seat
 2015-06-19 13:57:15 -04:00
Greg Price
a77923dc12 Merge pull request #8564 from edx/gprice/discussion-api-whitespace-content 
Handle whitespace-only content in discussion API
 2015-06-19 13:04:47 -04:00
Greg Price
6cd8889f9f Merge pull request #8562 from edx/gprice/discussion-api-editable-fields 
Add editable_fields to discussion API responses
 2015-06-19 12:57:31 -04:00
Greg Price
7fcf4e3d8d fixup! Enforce MAX_COMMENT_DEPTH in discussion_api 
Add more extensive testing
 2015-06-19 12:48:11 -04:00
Greg Price
6a9b435955 Merge pull request #8563 from edx/gprice/discussion-api-missing-pinned 
Fix discussion_api to handle old threads
 2015-06-19 12:03:07 -04:00
Greg Price
16d7a81b96 Add editable_fields to discussion API responses 
This will allow clients to determine what actions (e.g. following,
endorsing, and editing content) a user can take on a piece of content.
 2015-06-19 12:02:21 -04:00
Greg Price
174b4d943a Handle whitespace-only content in discussion API 
The comments service rejects whitespace-only content for certain
strings, so the discussion API should also reject such content.
 2015-06-19 12:01:34 -04:00
Chris Dodge
61aa3505a3 fix price per seat 2015-06-19 10:27:53 -04:00