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

5426 Commits

Author SHA1 Message Date
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
f47ab2bb18 Enforce MAX_COMMENT_DEPTH in discussion_api 2015-06-18 17:18:02 -04:00
Will Daly
7cb41c7783 Merge pull request #8553 from edx/will/ecom-467 
Add professional enrollments to the instructor dashboard.
 2015-06-18 11:27:26 -04:00
Ben McMorran
d544db6525 Merge pull request #8513 from edx/benmcmorran/topic-card 
TNL-1893 Add teams topic card
 2015-06-18 10:03:37 -04: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
Ben McMorran
c02d09a185 TNL-1893 Teams Topic Card 2015-06-18 13:16:28 +00: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
Will Daly
1223d88ebb Add professional enrollments to the instructor dashboard. 2015-06-17 11:54:31 -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
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
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
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
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
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
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
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
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
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
Greg Price
3c48585c8e Fix bug in discussion API comment update 
This bug caused any attempt to update a comment with a non-null
parent_id to result in a 500 error without applying the update. The bug
was introduced in commit 2c7590d197.
 2015-06-15 12:20:47 -04:00
Calen Pennington
9821323946 Merge pull request #8504 from cpennington/bdero/ccx-query-tests 
A version of #8260 that is consistent on jenkins and locally
 2015-06-15 11:51:33 -04:00
Sarina Canelake
09425c3d8f Merge pull request #8402 from edx/sarina/annotate-middleware 
Fix dark lang and django.middleware.locale behaviors LOC-72 LOC-85
 2015-06-15 11:29:15 -04:00
Calen Pennington
b06d256f99 Clear all caches before measure FieldOverride performance 2015-06-15 11:10:27 -04:00
Calen Pennington
e4bc328c3a Reduce the number of queries when walking parents in MongoModuleStore by avoiding cache misses on the data due to missing runs 2015-06-15 11:09:43 -04:00
Calen Pennington
67bde5e2e9 Measure XBlock instantiations in FieldOverride performance tests 2015-06-15 11:08:57 -04:00
Calen Pennington
5962c4eb8f Better simulate a request happening in the LMS in FieldOverride performance tests 2015-06-15 11:06:45 -04:00
Zia Fazal
6afaa3cce3 certificates event tracking 
some optimisations

refactored code and added created event

added test to make sure generate event is emitted

changes based on feedback on 6/11

added certificate web page and tests

fixed quality violations
 2015-06-15 19:53:47 +05:00
Brandon DeRosier
5c6ccc8f0b Add CCX SQL query/mongo read tests 2015-06-15 09:50:44 -04:00
Sven Marnach
52f56ddd37 Add feature flag to allow hiding the discussion tab for individual courses. 2015-06-14 20:36:45 +02:00
Sarina Canelake
ed2f73e6d2 Add i18n regression tests (LOC-72, LOC-85) 2015-06-12 18:14:26 -04:00
Calen Pennington
83fce4d61f Merge pull request #8395 from jazkarta/ccx-custom-ids 
MIT CCX: Use CCX Keys
 2015-06-12 16:19:12 -04:00
cewing
cb431ccb24 MIT CCX: Use CCX Keys: further revisions in response to code review 
only require ccx-keys once

get_current_ccx will now expect a CourseKey instance as its argument, and will raise a value error if this expectation is not met.

document reason for local import

add special methods to pass attribute setting and deletion through to the wrapped modulestore

add __setattr__ and __delattr__ per code review, update __init__ to work with new methods

style change per code review

clean up context manager usage as recommended by code review

remove unused code and imports

convert modulestore type tests to use the `get_modulestore_type` api, remove unused imports

code quality: add docstrings

increase coverage for utils tests

fix bug found in testing.

increase test coverage on modulestore wrapper

code quality fixes

code-quality: ignore import error, but mark site for future consideration
 2015-06-12 11:20:30 -07:00
Will Daly
7a3c1f04dd Merge pull request #8502 from edx/alasdair/ECOM-1724-footer-a11y-update 
ECOM-1724 a11y footer updates
 2015-06-12 13:22:11 -04:00