Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
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
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
Marko Jevtić
79421a2c94 Merge pull request #13299 from edx/mjevtic/SOL-1953 
[SOL-1953] Update Commerce Configuration
 2016-09-06 16:53:20 +02:00
Andy Armstrong
f1bad0721f Make discussion links into buttons for a11y 
TNL-4640
 2016-09-02 16:34:15 -04:00
sanfordstudent
b7ac081e49 Merge pull request #13329 from edx/sstudent/TNL-5382-part-1 
creating django admin settings for subsection grades
 2016-09-02 10:52:51 -04:00
Sanford Student
d54a784a43 creating django admin settings for subsection grades 2016-09-02 09:32:33 -04:00
Nimisha Asthagiri
c7c609041b Merge pull request #13384 from edx/ormsbee/csm_nl_fix_2 
Script to remove course_ids with \n from CSM
 2016-09-02 09:01:45 -04:00
Adam
e1cd58dcd4 Merge pull request #13385 from edx/release 
Release
 2016-09-02 08:41:17 -04:00
Marko Jevtic
ab9c858b54 [SOL-1953] Update Commerce Configuration 2016-09-02 08:28:18 +00:00
David Ormsbee
75f9a522dc Script to remove course_ids with \n from CSM 
Some StudentModule entries were written with newlines at the end of the
course_id. This script finds those entries within a given time range,
archive them, and merges records if necessary (capa problems).
 2016-09-01 22:28:06 -04:00
J. Cliff Dyer
6bda334b99 Handle scoreable blocks without defined weight 
Default weight to 1.0.

TNL-5410
 2016-09-01 15:56:17 +00:00
Adam
35c1654643 Merge pull request #13103 from edx/dump-to-neo4j-py2neo 
dump item information to neo4j
 2016-08-31 16:36:20 -04:00
Chris
0c63680421 Merge pull request #13341 from edx/clrux/word-cloud-variable-cleanup 
Removing unused variable from recent word cloud updates
 2016-08-31 14:40:25 -04:00
Chris Rodriguez
be470adb03 Removing unused variable from recent word cloud updates 2016-08-31 12:44:31 -04:00
Douglas Hall
f915befe93 Merge pull request #13359 from edx/release 
Merging rc/2016-08-31 into master
 2016-08-31 11:41:51 -04:00
Adam Palay
10bd4ef6bf dump item information to neo4j 
clear request cache to avoid memory leak

update to use https

delete courses in the same transaction as writing them

python3 compatibility
 2016-08-30 14:59:00 -04:00
Giovanni Di Milia
cc65094b03 Added Current Grade Rest API 2016-08-30 13:51:41 -04:00
Eric Fischer
d03b070184 Merge pull request #13336 from edx/efischer/grades_fix 
Deserialize BlockRecord.locator into a real BlockUsageLocator
 2016-08-30 09:46:23 -04:00
Andy Armstrong
9899a1e520 Fix discussion color contrast and remove gradients 
TNL-5163
 2016-08-29 17:28:55 -04:00
Diana Huang
c9a8b59904 Fix spelling of permission. 2016-08-29 15:50:01 -04:00
Eric Fischer
401a81eda3 Instantiate BlockUsageLocator when making BlockRecord 
We already have logic to serialize BUL objects to string on save,
but the corresponding deserialization logic was missing.
 2016-08-29 14:13:33 -04:00
Eric Fischer
13687e4753 Grades cleanup 
Small changes to the grades djangoapp
    -sets up mock_get_score context handler
    -fixes an issue with not invalidating lazy scores property
    -code quality fixes
    -query count optimization in PersistentSubscetionGrade.create
    -adds atomic blocks to avoid IntegrityErrors corrupting an entire request
 2016-08-25 11:43:49 -04:00
John Eskew
477d6dd236 Merge pull request #13309 from edx/release 
Hotfix for TNL-5365
 2016-08-25 08:54:38 -04:00
Rene Sorel
a91b5f380c merge upstream/master 2016-08-25 13:53:43 +02:00
Muddasser
22b78a25d1 lms/navigation.feature to bokchoy 2016-08-25 08:36:24 +00:00
John Eskew
87b4bcc731 Fix tests to account for savepoints caused by atomic wrapper. 2016-08-24 14:39:39 -04:00
John Eskew
211cef0814 Ignore IntegrityErrors upon set_many update save(). 2016-08-24 13:48:42 -04:00
J. Cliff Dyer
bd8a8babe2 Update django-oauth-toolkit admin 2016-08-24 13:31:11 -04:00
John Eskew
2252ce6abf Ignore IntegrityErrors upon set_many update save(). 2016-08-24 13:18:03 -04:00
Chris Rodriguez
2255b5c83b AC-552 word cloud accessibility updates 2016-08-24 11:14:25 -04:00
Matjaz Gregoric
008b708617 Merge pull request #12978 from open-craft/mtyaka/update-wiki 
Upgrade django-wiki to 0.0.9.
 2016-08-24 13:43:41 +02:00
Awais Jibran
68303997c8 Fix Discussion blackout date still has Add a Response text box 
TNL-5111
 2016-08-24 12:03:29 +05:00
Matjaz Gregoric
c5f4ba0fa7 Upgrade django-wiki to 0.0.9. 
The new version fixes a problem where wiki fails with a 500 error when
combined org/course name/course run fields are longer than 50
characters.
 2016-08-24 08:43:38 +02:00
sanfordstudent
a2b64d7504 Merge pull request #13262 from edx/sstudent/TNL-5006 
Trigger subsection grade update on SCORE_CHANGED signal
 2016-08-23 14:16:28 -04:00
Sanford Student
b9dade5512 handler for SCORE_CHANGED signal 2016-08-23 13:12:36 -04:00
Jesse Zoldak
d642b6ad67 Comment out flaky lettuce test. TNL-5315 2016-08-22 14:05:57 -04:00
Eric Fischer
22046d4067 Use PersistentSubsectionGrade in grades application 
Hooks the pre-existing grades code into our new PersistentSubsectionGrade data
model. Includes test updates, and some minor changes to the data model that
were discovered in testing.
 2016-08-22 09:47:37 -04:00
Chris Rodriguez
b5efcc15f5 AC-530 fixing link-href ignores in the platform 2016-08-19 10:04:40 -04:00
Brian Jacobel
7e12a1f7ae Merge pull request #12771 from edx/discussion-forums-ui-update 
Discussion forums UI update feature branch
 2016-08-18 12:58:54 -04:00
Cliff Dyer
747c9a4de8 Merge pull request #13143 from edx/efischer/grades 
Persistent Grades Data Model
 2016-08-18 12:17:08 -04:00
PaulWattenberger
9add24e409 Handle vars: None in Sailthru user record in unenroll list update 2016-08-17 21:44:07 -04:00
Brian Jacobel
df35415ec1 Remove forum-nav-header and wire breadcrumbs to replace it 
TNL-5186
 2016-08-17 16:21:13 -04:00
Brian Jacobel
1f2c843f23 Move search box to header. Add search results to breadcrumbs when you search 2016-08-17 16:21:12 -04:00
Brian Jacobel
4c4476a720 Fix lint issues on feature branch 2016-08-17 16:21:12 -04:00
Brian Jacobel
a60d456f28 Add breadcrumbs to discussion forums header 2016-08-17 16:21:12 -04:00
Andy Armstrong
6c54035197 Add a content header to the discussion board 2016-08-17 16:20:45 -04:00