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

38490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Jacobel
a5376cd4d0 Merge pull request #13425 from edx/bjacobel/topic-list-corners 
Fix extremely minor box corner issue in Discussions
 2016-09-12 12:00:04 -04:00
Matjaz Gregoric
cfe855f121 Merge pull request #12832 from open-craft/mtyaka/ccx-discussions 
Enable discussion forums on CCX courses.
 2016-09-12 11:51:05 +02:00
Matjaz Gregoric
8dc84bec3a Enable discussions on CCX courses. 
Discussion is restricted to the CCX course (there is no sharing of
discussions with the parent course or other CCX instances).
 2016-09-12 09:51:05 +02:00
Nimisha Asthagiri
2251097c56 Merge pull request #13437 from edx/cdyer/keep-course-run 
Ensure usage keys have course run in locators.
 2016-09-09 19:02:31 -04:00
J. Cliff Dyer
ddd58dafd8 Ensure usage keys have course run in locators. 
TNL-5475
 2016-09-09 17:42:51 -04:00
Nimisha Asthagiri
0853e485fd Merge pull request #13429 from edx/tnl/progress-sql-queries 
Optimize Subsection Grades update
 2016-09-09 15:09:54 -04:00
Nimisha Asthagiri
f0f7a5389b Optimize Subsection computation 2016-09-09 13:57:51 -04:00
Robert Raposa
2d9e38ca4c Merge pull request #13436 from edx/robrap/TNL-5457 
TNL-5457: Performance enhancements for Discussions API.
 2016-09-09 13:50:44 -04:00
Robert Raposa
bced90d2ee Performance enhancements for Discussions API. 
- Default to with_responses=False, except when required.
- Clean up search call unused params.
 2016-09-09 11:42:51 -04:00
Brian Jacobel
500bac6fcb Merge pull request #13427 from edx/bjacobel/load-more-button 
Fix width of 'Load More' button in Discussions
 2016-09-09 11:38:10 -04:00
Tim Krones
df4a5df595 Merge pull request #13414 from open-craft/itsjeyd/update-xblock-poll 
Update xblock-poll dependency to v1.2.
 2016-09-09 16:15:58 +02:00
Brian Jacobel
2e0b6c1282 Merge pull request #13418 from edx/bjacobel/new-post-bug 
Fix bug where new posts were not assigned a topic ID and would fail to post
 2016-09-09 09:32:23 -04:00
Brian Jacobel
c54a5ee20c Fix width of 'Load More' button in Discussions 2016-09-08 16:53:23 -04:00
Cliff Dyer
6aaf442d2f Merge pull request #13324 from edx/efischer/grades_r_broke 
Persistent Grade being saved for individual problems
 2016-09-08 16:20:08 -04:00
Eric Fischer
31953c5e0c Update correct persistent score 
* First take at forcing a subsection's grade to update when a signal is
  sent that a problem's score has changed
* Refactor signal handler connection.
* Expand bokchoy tests to cover progress page
* Add some grading unit tests

TNL-5394
TNL-5364
 2016-09-08 15:09:05 -04:00
Brian Jacobel
dfeab6347d Fix extremely minor box corner issue in Discussions 2016-09-08 14:05:21 -04:00
PaulWattenberger
b0885bd4a5 Merge pull request #13409 from edx/pwattenberger/sailthru_campaign_id 
Pass Sailthru campaign id cookie to ecommerce
 2016-09-08 13:32:05 -04:00
Jesse Shapiro
05c8fa82cb Merge pull request #13360 from open-craft/haikuginger/sso-visible-field 
[ENT-13] Make SSO providers optionally hidden
 2016-09-08 13:11:51 -04:00
Brian Jacobel
545ef583e7 Fix bug where new posts were not assigned a topic ID and would fail to post 
TNL-5442
 2016-09-08 12:52:04 -04:00
Jesse Shapiro
ce2ab5b15c Adding 'visible' field for SSO providers 2016-09-08 11:27:09 -04:00
Robert Raposa
6f0e097115 Merge pull request #13421 from edx/TNL-5404 
TNL-5404: Default to not requesting responses when grabbing a single thread.
 2016-09-08 11:01:58 -04:00
PaulWattenberger
7ec898298e Pass Sailthru campaign id cookie to ecommerce 2016-09-08 10:50:13 -04:00
Renzo Lucioni
948c1bd8ae Merge pull request #13408 from edx/renzo/display-catalog-micromasters 
Retrieve marketable MicroMasters from the catalog service
 2016-09-08 09:47:20 -04:00
Mushtaq Ali
3c16225496 Merge pull request #13411 from edx/mushtaq/a11y-discussions-duplicate-id 
Remove duplicate-id rule for a11y discussions
 2016-09-08 18:33:13 +05:00
Peter Desjardins
99a61f1546 Merge pull request #13410 from edx/pdesjardins/DOC-2748 
Complete the LMS help link - add it to edx.org theme, adjust Sass styling for the theme and for pattern library pages
 2016-09-08 09:03:17 -04:00
Peter Desjardins
c50e028507 Adjusted Sass for the doc-link so that it will work in pattern library pages and also in the edx.org theme. Added the documentation link to the edx.org theme header. 2016-09-07 23:46:09 -04:00
Toby Lawrence
26891bc0fd Default to not requesting responses when grabbing a single thread. 
We're often grabbing the metadata of a specific thread to then be able
to perform other operations, but we never need the actual responses or
comments of a thread unless we're displaying it in the normal forum
view.

This change sets a default of with_responses=False, which instructs the
comment service to not send back the responses/comments for the given
thread.  We only ask for responses in the case of rendering a single
thread or inline discussion.
 2016-09-07 23:17:11 -04:00
Renzo Lucioni
37523939f2 Retrieve marketable MicroMasters from the catalog service 
Catalog-based MicroMasters need to be displayed in the LMS. However, the LMS currently retrieves all program data from the soon-to-be-retired programs service. Consuming program data exclusively from the catalog service is out of the question right now; it's too complex to confidently pull off in a week. This is a functional middle ground introduced by ECOM-5460. Cleaning up this debt is tracked by ECOM-4418.
 2016-09-07 17:44:54 -04:00
David Baumgold
f2fc3a14df Merge pull request #13367 from singingwolfboy/update-pa11ycrawler 
Pa11ycrawler 1.5.0
 2016-09-07 16:01:42 -04:00
Brian Jacobel
de15511f0f Merge pull request #13355 from edx/bjacobel/discussion-alerts 
Pattern library alerts on discussion pages
 2016-09-07 15:05:42 -04:00
David
32e7836bd9 Add pa11y_ignore_rules_url to paver pa11ycrawler 2016-09-07 14:46:30 -04:00
Brian Jacobel
49f99146ec Merge pull request #13417 from edx/bjacobel/flaky-5453 
Mark DiscussionResponseEditTest.test_vote_report_endorse_after_edit as flaky
 2016-09-07 14:04:46 -04:00
David
afd31d4edf pa11ycrawler 1.5.0 2016-09-07 13:05:36 -04:00
Ben Patterson
4b580e11cc Update node packages to match pa11ycrawler's node install. 2016-09-07 13:05:36 -04:00
Ben Patterson
01239ab86c Upgrade path.py 2016-09-07 13:05:36 -04:00
Chris
cb6f92a595 Merge pull request #13379 from edx/clrux/ac-577-login-page 
AC-577 login form contrast and invalid aria cleanup
 2016-09-07 12:51:58 -04:00
Brian Jacobel
86f7e3ba51 Implement Pattern Library alerts in Discussions 
TNL-5164
 2016-09-07 12:29:19 -04:00
Brian Jacobel
6d8c075969 Merge pull request #13370 from edx/bjacobel/discussion-title-placeholder 
Remove placeholders in discussion new post form
 2016-09-07 12:24:56 -04:00
Chris Rodriguez
165302e00b AC-577 login page a11y fixes 2016-09-07 12:06:05 -04:00
Matt Drayer
e53721433f Merge pull request #13413 from edx/release 
Merge release back to master
 2016-09-07 11:30:24 -04:00
Brian Jacobel
d148868b57 Mark DiscussionResponseEditTest.test_vote_report_endorse_after_edit as flaky 2016-09-07 11:24:47 -04:00
Tim Krones
20ab9dfbdc Update xblock-poll dependency to v1.2. 2016-09-07 14:33:02 +02:00
Matt Drayer
5227d86154 Merge pull request #13396 from edx/rc/2016-09-06 
Release Candidate rc/2016-09-06
 2016-09-07 08:08:33 -04:00
M. Rehan
985449758a Merge pull request #13313 from edx/mrehan/tnl-4945-inherit-lib-problem-setting 
TNL-4945 – Prioritize Library defaults over the fields coming from parent blocks.
 2016-09-07 14:57:13 +05:00
Mushtaq Ali
e1247ba1e1 Remove duplicate-id rule for a11y discussions 
TNL-4647
 2016-09-07 13:20:13 +05:00
Braden MacDonald
3499b257c7 Merge pull request #13298 from open-craft/braden/sso-saml-debugging 
Detailed logging and record keeping for SAML SSO [ENT-4]
 2016-09-06 17:32:46 -07:00
Braden MacDonald
8bf9b188a5 Add optional "debug mode" w/ detailed logging for SAML IdPs 2016-09-06 15:27:45 -07:00
Brian Jacobel
44e70dc2ca Merge pull request #13406 from edx/bjacobel/toolbarmageddon 
Toolbarmageddon! (TNL-5105)
 2016-09-06 17:34:56 -04:00
Cliff Dyer
12b8f9d978 Merge pull request #13372 from edx/cdyer/bs-app 
Register block_structure djangoapp.
 2016-09-06 14:26:15 -04:00
Brian Jacobel
2dcb8f81c1 Fix issue where duplicate toolbars would be displayed above discussion forum comments while posting 
TNL-5105
 2016-09-06 13:54:55 -04:00