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

352 Commits

Author SHA1 Message Date
Clinton Blackburn
d9007455c1 Removed mailing address from provider request 
Given the time crunch this is the safest option for dealing with newlines.

ECOM-2492
 2015-10-06 14:15:14 -04:00
Clinton Blackburn
775ca26c3a Limited grades to seven characters 
ECOM-2433
 2015-10-05 11:58:08 -04:00
Clinton Blackburn
0dba843608 Multiple credit fixes 
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
 2015-10-05 09:35:10 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Brian Beggs
d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master 2015-09-28 20:58:34 -04:00
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Brian Beggs
53524efbd8 Fixes for rebasing of the release on 2015-09-23 2015-09-28 11:52:33 -04:00
Will Daly
322db6de7a TNL-3316: Error on Insights performance report 
Preserve DRF v2 behavior of defaulting to None
for missing keys in the grading policy dictionary.
 2015-09-28 11:52:32 -04:00
Will Daly
d11ccad0fc Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-28 11:52:30 -04:00
Brian Beggs
144c347387 Fixes for rebasing of the release on 2015-09-23 2015-09-25 12:40:58 -04:00
Will Daly
d6c7d8d383 TNL-3316: Error on Insights performance report 
Preserve DRF v2 behavior of defaulting to None
for missing keys in the grading policy dictionary.
 2015-09-25 12:40:57 -04:00
Will Daly
8555630df7 Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-25 12:40:57 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Matt Drayer
e51c4f23d3 Merge pull request #9822 from edx/saleem-latif/SOL-565 
saleem-latif/SOL-565
 2015-09-24 10:19:43 -04:00
Brian Beggs
c26bb9188a Revert "Upgrade django-pipeline and staticfiles" 2015-09-23 15:52:24 -04:00
Brian Beggs
4c05fa4f49 Merge pull request #9803 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles
 2015-09-23 15:50:39 -04:00
Saleem Latif
05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days 2015-09-23 12:17:08 +05:00
Usman Khalid
158bdf4d09 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-09-22 20:39:44 +05:00
Clinton Blackburn
8cd297ec08 Merge pull request #9816 from edx/clintonb/admin-updates 
Additional Admin Updates
 2015-09-21 15:34:02 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
Clinton Blackburn
341d936056 Updated admin interfaces for credit models 
ECOM-2172
 2015-09-17 16:43:41 -04:00
Ned Batchelder
5d64f9a80b Minor changes, responding to pull request comments 2015-09-17 15:39:03 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
Dennis Jen
305f88f646 Merge pull request #9488 from edx/dsjen/courses-via-overview 
Optimize OpenID Course Claims for users.
 2015-09-17 13:35:49 -04:00
Clinton Blackburn
99c410dc16 Treating final grade as string 
Floating point values should be treated as strings to ensure values such as 1.0 are not converted to 1. Such conversion invalidates the signature generated for the credit request. Additionally, JSON has no concept of a floating point datatype.

ECOM-2172
 2015-09-17 11:49:54 -04:00
Dennis Jen
844edac443 Optimize OpenID Course Claims for users. 
- Course overviews will cache courses upon publish.
- Added management command to warm up cache.
- OAuth2 handler returns courses via course overviews.
 2015-09-17 11:29:28 -04:00
Peter Fogg
33f559b04a Remove membership field from teams when serializing memberships. 
TNL-3281
 2015-09-15 13:05:10 -04:00
Ned Batchelder
985c6f64ec Fix the inheritance of tests into tests for the recommender tests 2015-09-12 08:32:14 -04:00
Peter Fogg
48f72612c3 Prevent over-expansion of team memberships. 
TNL-3202
 2015-09-11 12:55:39 -04:00
chrisndodge
f5057b841c Merge pull request #9597 from edx/cdodge/adjust-log-level 
reduce logging severity from exception to error
 2015-09-09 12:29:43 -04:00
Chris Dodge
56f0043877 reduce logging severity from exception to error 2015-09-08 14:34:05 -04:00
Ahsan Ulhaq
ea40c2f1c6 Credit-Eligible Assessments Appearing in Incorrect Order 
ECOM-2118
 2015-09-08 14:00:13 +05:00
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07:00
chrisndodge
f8e44f7832 Merge pull request #9536 from edx/muhhshoaib/PHX-122-remove-the-record-in-the-creditRequirementStatus-table 
PHX-122
 2015-09-01 16:05:43 -04:00
Muhammad Shoaib
4d0efa2893 PHX-122 
Fixed the issue when deleting a proctored exam attempt does not remove the record in the CreditRequirementStatus table
 2015-09-01 15:08:11 -04:00
Ned Batchelder
af609f103f Merge pull request #9494 from edx/ned/move-recommender-tests 
Move recommender XBlock tests to openedx/tests/external
 2015-09-01 10:20:24 -04:00
Ned Batchelder
a16c951c09 Fix imports and test skips to work properly from openedx 2015-08-31 17:14:47 -04:00
Ned Batchelder
f925a4af9c Move recommender XBlock tests to openedx/tests/xblock_integration 
I want to make clear that these tests rely on XBlocks in other repos,
and that ideally in time we would move these tests into the XBlock repo.
 2015-08-31 17:14:47 -04:00
Clinton Blackburn
c6c897e218 Added test for CreditCourse endpoint CSRF validation 
This test gives peace-of-mind and ensures that CSRF validation is enforced for session authentication.

XCOM-524
 2015-08-31 13:51:22 -04:00
Clinton Blackburn
a1ba77d6b3 Diabled CSRF protection for Credit Course API endpoints 
CSRF protection needs to be disabled so that requests made using OAuth and other non-session-based authentication mechanisms can be properly processed. If session authentication is used, DRF will enforce CSRF protection.

XCOM-524
 2015-08-29 03:02:05 -04:00
utkjad
387303d364 Injecting call stack manager in CSM/CSMH,introducting @trackit,@wrapt, and refining implementation[PLAT-758] 2015-08-26 22:29:43 +00:00
Bill DeRusha
cd751ab5fe Merge pull request #9460 from edx/bderusha/edx-search-for-teams-TNL-3013-patch 
Remove pylint: disable invalid-name for paginator error and fix syntax
 2015-08-25 11:01:11 -04:00
Bill DeRusha
81ced1c964 Remove disable pylint for paginator error and fix syntax 2015-08-25 10:08:16 -04:00
David Ormsbee
a1a9a2a576 Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase 2015-08-25 09:47:59 -04:00
Bill DeRusha
973314de7b Add basic elasticsearch search for teams 
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
 2015-08-24 09:22:06 -04:00
Chris Dodge
ea1e875dfe add ability to return the course name (optionally) when querying about credit requirement fulfillments 2015-08-22 17:24:23 -04:00
Ahsan Ulhaq
e3674e92e3 Credit eligibility email should use the correct staticfiles library 
ECOM-2026
 2015-08-21 20:17:55 +05:00