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

30985 Commits

This Branch
This Branch
All Branches
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
Christine Lytwynec
11e10499d8 Merge pull request #8557 from edx/clytwynec/quiet_sass_compile_warnings 
compile sass in quiet mode unless debug=True
 2015-06-17 15:55:37 -04:00
Jesse Zoldak
176a70de6a Merge pull request #8556 from edx/revert-8533-zoldak/update-bok-choy 
Revert "Update bok-choy version and move to base.txt"
 2015-06-17 15:31:26 -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
Christine Lytwynec
a1af17e4b1 compile sass in quiet mode unless debug=True 2015-06-17 15:13:47 -04:00
Jesse Zoldak
d382b69954 Revert "Update bok-choy version and move to base.txt" 2015-06-17 14:50:27 -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
Jesse Zoldak
a57c780a08 Merge pull request #8534 from edx/zoldak/lower-pylint-threshold 
Lower pylint threshold to 7100
 2015-06-17 13:32:00 -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
Jesse Zoldak
483f2e45dd Lower pylint threshold to 7100 2015-06-17 11:32:32 -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
e68b784528 add Richard Moch to AUTHORS 2015-06-17 16:21:50 +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
Sarina Canelake
c16cbb1826 Merge pull request #8516 from edx/markhoeber-doc2017 
Update studio templates to remove fieldset and legend tags
 2015-06-17 10:10:09 -04:00
Chris
d6aa1578c4 Merge pull request #7351 from Stanford-Online/kluo/remove-redundant-modal 
Remove extra lean modal trigger
 2015-06-17 08:55:34 -04:00
Chris
5ebe91e18b Merge pull request #7395 from Stanford-Online/kluo/fix-modal-display-issue 
Fix modal css to be hidden immediately
 2015-06-17 08:54:06 -04:00
Dino Cikatic
af7521b240 SOL-994 fix js loading if search features disabled 2015-06-17 14:53:45 +02:00
Muzaffar yousaf
7dd7e6525b Merge pull request #8532 from edx/muzaffar/tnl2304-ora1-message-studio 
Display error message on ORA 1 components in units Studio.
 2015-06-17 17:47:50 +05:00
Jesse Zoldak
8f769d2345 Merge pull request #8533 from edx/zoldak/update-bok-choy 
Update bok-choy version and move to base.txt
 2015-06-17 08:25:51 -04:00
muzaffaryousaf
4fecf03874 Display error message on ORA 1 components in units in Studio. 
TNL-2304
 2015-06-17 17:05:09 +05: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
zubair-arbi
773c346974 Merge pull request #8545 from edx/zub/bugfix/ecom-1738-update-reverification-block-version 
update reverification block version to fix error for 'skip_reverifica…
 2015-06-17 14:05:17 +05:00
zubair-arbi
6ed4ac08d0 update reverification block version to fix error for 'skip_reverification' service method 
ECOM-1738
 2015-06-17 12:49:58 +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
Mark Hoeber
238c8152b3 Update studio templates to remove fieldset and legend tags 2015-06-16 20:42:12 -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
Kevin Luo
8d56fe3bc1 Fix modal css to be hidden immediately 
Before the leanModal content css was applied after the js class
was added to the body element. This causes leanModals to
display for a split second before being hidden. This fix removes
the need for the explicit css rule for static pages preview.
 2015-06-16 15:56:49 -07:00
Andy Armstrong
585eaf1c9e Merge pull request #8538 from edx/release 
Merge hotfix-2015-06-16 back to master
 2015-06-16 18:05:34 -04:00
Kevin Luo
e9aed96f31 Remove extra lean modal trigger 2015-06-16 14:19:42 -07:00
Andy Armstrong
18f69f3b35 Merge pull request #8536 from edx/diana/handle-hidden-tabs 
Ensure that is_hidden does not affect equality checks.
 2015-06-16 17:04:04 -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
Diana Huang
72a0d19531 Ensure that is_hidden does not affect equality checks. 2015-06-16 15:46:23 -04: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