Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,985 Commits 1 Branch 0 Tags
350f98ebdec44ca54513afc010e50eb6b3ebda37
Commit Graph

11402 Commits

Author SHA1 Message Date
Braden MacDonald
350f98ebde Changes for compatibility with latest python-social-auth (0.2.7) 2015-06-18 19:31:47 -07:00
Ben McMorran
390e2c1865 Merge pull request #8528 from edx/benmcmorran/discussion-caching 
TNL-2291 Discussion forums permission caching
 2015-06-18 09:22:09 -04:00
dino-cikatic
89f13e15bb Merge pull request #8548 from edx/dcikatic/SOL-994 
SOL-994 fix js loading if search features disabled
 2015-06-18 09:22:13 +02:00
Greg Price
7c53400134 Merge pull request #8541 from edx/gprice/discussion-api-rendered-body 
Add rendered_body to discussion API endpoints
 2015-06-17 22:51:38 -04:00
Greg Price
c28b295806 Add rendered_body to discussion API endpoints 
The rendering in this commit does not prevent MathJax content from being
rendered as the discussion JavaScript code does.
 2015-06-17 20:23:30 -04:00
Greg Price
82b117f66e Merge pull request #8543 from edx/gprice/discussion-api-comment-vote 
Add comment voting to discussion API
 2015-06-17 19:41:08 -04:00
David Ormsbee
b92ad0ad13 TNL-2291 Add caching to discussion forum permissions 
Caches all permissions per user per course. Adds caching functionality to has_permission and replaces all instances of cached_has_permission with has_permission.
 2015-06-17 21:08:28 +00:00
Calen Pennington
e3d820a7a4 Merge pull request #8519 from jazkarta/check-ccx-enabled 
WIP: Limit application of CCX overrides to enabled courses and providers
 2015-06-17 16:15:01 -04:00
Calen Pennington
b8e63cbb4d Disable lineage traversal when no providers are specified in OverrideFieldData 2015-06-17 15:26:10 -04:00
Calen Pennington
6bb25982de Add enable_ccx to the suite of override performance checking tests 2015-06-17 15:26:10 -04:00
Carlos de la Guardia
d56303dd0f Only enable the OverrideFieldData when there are active overrides on a course. 2015-06-17 15:26:10 -04:00
Chris
b211e9fd36 Merge pull request #7474 from openfun/rmoch/fix_forum_action_button_issue 
Fix forum response display issue with long labels on action buttons
 2015-06-17 14:18:48 -04:00
Greg Price
de68c30486 Merge pull request #8530 from edx/gprice/discussion-api-text-search 
Add text_search parameter to discussion API
 2015-06-17 11:35:12 -04:00
Richard Moch
e455c3b7b7 Add background to focused labels for cleaner display 2015-06-17 16:21:51 +02:00
Richard Moch
d851c6ded3 Improve support for right to left languages 2015-06-17 16:21:51 +02:00
Richard Moch
4277757961 set .response-header-actions block to absolute position to allow overlap with title 2015-06-17 16:21:50 +02:00
Greg Price
fecbdcd052 Add text_search parameter to discussion API 
The thread list endpoint now accepts the text_search parameter and also
includes a text_search_rewrite field in its responses.
 2015-06-17 10:20:13 -04:00
Awais Qureshi
fa4dcdebbe Merge pull request #8531 from edx/awais786/ECOM-1494-del-migrations 
ECOM-1494 deleting models from database through new migrations.
 2015-06-17 19:19:02 +05:00
Dino Cikatic
af7521b240 SOL-994 fix js loading if search features disabled 2015-06-17 14:53:45 +02:00
chrisndodge
50851934ce Merge pull request #8542 from edx/cdodge/fix-typo 
Fix typo in Instructor dashboard UI text
 2015-06-17 07:29:21 -04:00
Awais Qureshi
52e8d71fb9 Merge pull request #8489 from edx/awais786/ECOM-1683-remove-cert-regen-code 
ECOM-1683 removing regen-cert code.
 2015-06-17 14:51:19 +05:00
Greg Price
0998df8c4b Add comment voting to discussion API 2015-06-16 23:32:48 -04:00
Chris Dodge
3c4ae2cbd0 Fix typo in Instructor dashboard UI text 2015-06-16 23:18:04 -04:00
frances botsford
f66261c9f2 Merge pull request #8309 from edx/frances/responsive-lms-cleanup 
Responsive LMS cleanup
 2015-06-16 23:10:49 -04:00
frances botsford
1885b73fe1 Merge pull request #8343 from edx/frances/fix/dashboard-button-styles 
Modernize the dashboard button styles
 2015-06-16 20:14:57 -04:00
Brian Talbot
72fcd5b14d Merge pull request #8377 from edx/talbs/web-certs-a11y 
Web Certificates: Addressing a11y feedback
 2015-06-16 20:02:11 -04:00
Frances Botsford
03d5589e97 first wave cleanup of fixed width at page level in LMS 2015-06-16 16:09:04 -04:00
Awais
89926226fc ECOM-1494 deleting models from database through new migrations. 2015-06-17 00:49:12 +05:00
chrisndodge
302d3e6e06 Merge pull request #8206 from edx/afzaledx/sol-795-executive-summary-report 
SOL-795 Executive Summary Report
 2015-06-16 15:38:28 -04:00
Brian Talbot
07307cb471 Certificates: addressing a11y feedback 
* removing visual-based heading styles from 'sr-only' DOM elements
* revising default certificate view h1/heading copy
* revising DOM elements to use main/aside semantics
* revised edX/platform logo link alt text
* removed extra share/take home header text
* synced up add to LinkedIn profile copy
 2015-06-16 15:33:39 -04:00
Afzal Wali
0569a770ea Executive Summary Report 2015-06-16 14:48:16 -04:00
Ahsan Ulhaq
03db7a7fd1 Merge pull request #8228 from edx/ahsan/ECOM-1602-update-ICRV-requirments-status-new 
update the ICRV requirments status
 2015-06-16 23:17:14 +05:00
Ahsan Ulhaq
7d11768358 update the ICRV requirments status 
After receiving the response from software secure update the ICRV
requirement status in CreditRequirementstatus table.

ECOM-1602
 2015-06-16 22:27:54 +05:00
Greg Price
905512b6c8 Merge pull request #8505 from edx/gprice/discussion-api-course-endpoint 
Add discussion API course endpoint
 2015-06-16 13:04:16 -04:00
Chris
944382241c Merge pull request #8434 from edx/clrux/ux-2291-course-nav-gradient-a11y 
Increasing contrast in course nav accordions
 2015-06-16 13:00:26 -04:00
Chris
b621870f27 Merge pull request #8218 from edx/clrux/UX-2252-accessibility-fixes-payment-page 
Accessibility tweaks and patching RTL
 2015-06-16 12:14:20 -04:00
Greg Price
d18b24b051 Add discussion API course endpoint 
This endpoint returns course metadata relating to discussions as a
starting point for clients.
 2015-06-16 11:27:54 -04:00
Awais
4d5a4b035d ECOM-1683 removing regen-cert code. 2015-06-16 20:08:57 +05:00
Chris Rodriguez
926f2c0355 Removing element selectors 2015-06-16 10:47:23 -04:00
Chris Rodriguez
3561b5c7a0 PR feedback and receiept template updates 2015-06-16 10:46:11 -04:00
chrisndodge
fcc97a3f76 Merge pull request #8478 from edx/afzaledx/MAYN-78 
MAYN-78 Extend Coupon/Discount Reports
 2015-06-16 10:43:16 -04:00
Frances Botsford
ab985aadbd modernize the dashboard button styles 2015-06-16 10:38:29 -04:00
Afzal Wali
ac72e26256 Fixed the empty list price issue. 
Added columns to the CC purchases report. (added Qty and Total Discount. Moved the Total Amount to the last index).
Coupon code report.
 2015-06-16 17:46:05 +05:00
Chris Rodriguez
8f8f1184a5 PR feedback 2015-06-16 07:34:07 -04:00
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page 
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
 2015-06-16 16:19:33 +05:00
Greg Price
5318f21e77 Merge pull request #8485 from edx/gprice/discussion-api-endorse 
Add comment endorsement to discussion API
 2015-06-15 17:10:05 -04:00
Matt Drayer
c3b78ea90a Merge pull request #8448 from edx/ziafazal/SOL-886 
certificates event tracking SOL-886
 2015-06-15 15:09:35 -04:00
Andy Armstrong
c28003b50d Merge pull request #8416 from edx/andya/common-list-component 
Create a common paginated list view
 2015-06-15 14:55:20 -04:00
Greg Price
439f72f918 Merge pull request #8524 from edx/gprice/discussion-api-parent-id-fix 
Fix bug in discussion API comment update
 2015-06-15 14:49:53 -04:00
Andy Armstrong
1689004189 Create a common paginated list view 
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
 2015-06-15 13:51:09 -04:00