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

11214 Commits

Author SHA1 Message Date
Greg Price
298ba727bd Merge pull request #8311 from edx/gprice/discussion-api-edit-thread 
Add thread editing to discussion API
 2015-06-04 13:51:08 -04:00
Peter Fogg
a9187e81c5 Merge pull request #8339 from edx/peter-fogg/teams-header 
Implement teams header component
 2015-06-04 12:45:09 -04:00
Xiaolu Xiong
4f45839211 Merge pull request #8325 from beardeer/master 
Merge pull request #8325 from beardeer/edx-platform
 2015-06-04 11:45:15 -04:00
Daniel Friedman
8dfb774565 Merge pull request #8336 from edx/dan-f/expose-edxnotes-interface-setting 
Add support for public/internal edx-notes-api endpoints
 2015-06-04 11:32:33 -04:00
Adam
5952906e72 Merge pull request #8349 from edx/adam/fix-capa-devstack 
disable contracts that were breaking capa problems on devstack (TNL-2…
 2015-06-04 11:22:17 -04:00
Peter Fogg
ebafdb1d03 TNL-1900 Implement teams header component 2015-06-04 11:01:18 -04:00
Greg Price
73d891313a Add thread editing to discussion API 
This is done via PATCH on a thread instance endpoint.
 2015-06-04 10:56:43 -04:00
David Baumgold
37064cf191 Learners don't need to be lean 2015-06-04 09:42:27 -04:00
Kevin Falcone
8f016414f9 Merge pull request #8348 from edx/release-2015-06-02-conflict 
Release 2015 06 02 conflict
 2015-06-04 09:20:12 -04:00
Xiaolu Xiong
aa1bca6b41 Change the misleading doc string (str doesn't has attr 'name' ) 2015-06-04 08:30:38 -04:00
frances botsford
446e2aa7f3 Merge pull request #7859 from edx/frances/teams-ux 
UX templates for Teams
 2015-06-04 08:07:05 -04:00
Mushtaq Ali
c575c89853 Bug - Unicode character in tab number shouldn't return 500 #TNL-2055 
Adding user to AUTHORS file
 2015-06-04 12:33:06 +05:00
Clinton Blackburn
dbfd77e661 Disabled CSRF Validation for checkout cancel page 
CyberSource will POST to this view if the user cancels payment. CSRF validation cannot be enabled when this happens.

ECOM-1689
 2015-06-03 17:14:21 -04:00
chrisndodge
bfe7527686 Merge pull request #8292 from edx/muhhshoaib/SOL-916-invalidate-revalidate-registration-codes 
SOL 916 invalidate revalidate registration codes
 2015-06-03 16:24:38 -04:00
Adam Palay
6012a34765 disable contracts that were breaking capa problems on devstack (TNL-2343) 2015-06-03 16:17:30 -04:00
Kevin Falcone
fecd3d55a7 Merge branch 'release' 2015-06-03 16:12:32 -04:00
Sarina Canelake
f78be26a5e Merge pull request #8341 from mcgachey/mcgachey-lti-consumer-bugfix 
[LTI Provider] Bugfix in LtiConsumer handling code
 2015-06-03 15:36:40 -04:00
Ben McMorran
f01b2f4311 Merge pull request #8243 from edx/benmcmorran/team-api-a 
TNL-1897: Implement Course Team API, Part A
 2015-06-03 14:59:36 -04:00
Frances Botsford
cf89f3a62f base teams space (template) and create team form 2015-06-03 14:51:28 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -04:00
Phil McGachey
71ee9d3bb8 [LTI Provider] Bugfix in LtiConsumer handling code 
The line below was left in during the refactoring shuffle from PR #8205, and causes
an issue in a corner case where an LTI launch provides an instance GUID where there
wasn't one already set for the consumer. This change fixes the bug, and adds a test
to prevent it from recurring.
 2015-06-03 14:34:36 -04:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Chris
162ba962fb Merge pull request #8273 from edx/clrux/UX-2092-logistration-button-text-centered 
Centering text in sign in button vertically
 2015-06-03 13:57:10 -04:00
David Baumgold
fe66625bbf Merge pull request #8323 from edx/db/unify-mako-template-imports 
Group imports together in Mako templates
 2015-06-03 13:32:27 -04:00
Chris Rodriguez
ffad558fb1 Centering text in sign in button vertically 2015-06-03 13:07:49 -04:00
Chris
801b77d100 Merge pull request #8269 from edx/clrux/UX-2260-social-login-button-hoverz 
Removing background-image from button hovers
 2015-06-03 12:47:07 -04:00
Chris
30c7f00a80 Merge pull request #8303 from edx/clrux/UX-2077-lms-footer-styles 
Replacing top border on footer
 2015-06-03 12:38:51 -04:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
Christopher Lee
103ae47759 Merge pull request #8199 from edx/clee/get_topic_threads 
MA-642 Add topic_id query to discussion/thread api
 2015-06-03 12:29:05 -04:00
Daniel Friedman
58c3c0c2d7 Expose EDXNOTES_PUBLIC_API/EDXNOTES_INTERNAL_API 2015-06-03 12:09:45 -04:00
Ali Mohammad
94e98e9cae Merge pull request #8257 from edx/alawibaba/plat589 
Make clean_history.py use the StudentHistoryModule django model.
 2015-06-03 11:45:33 -04:00
christopher lee
f552eca7d6 MA-642 Add topic_id query to discussion/thread api 
Also added thread_list_url field.
 2015-06-03 11:29:48 -04:00
Diana Huang
6534503c93 Add teams tab 
TNL-1939
 2015-06-03 09:10:44 -04:00
dino-cikatic
099be9e7e3 Merge pull request #8229 from edx/dcikatic/SOL-536 
Dcikatic/sol 536 [WIP]
 2015-06-03 13:55:42 +02:00
Davorin Sego
d3aa9dfd87 SOL-536 Experiment-Aware content search 2015-06-03 12:47:45 +02:00
David Ormsbee
f03a80c2aa Merge pull request #8205 from mcgachey/mcgachey-lti-grade-passback 
[LTI Provider] Use the LTI Outcome Service to pass back scores
 2015-06-02 17:41:41 -04:00
Diana Huang
15291aa43b Merge pull request #8015 from edx/andya/add-tab-extensions 
Add extensible course view types for edX platform
 2015-06-02 17:08:45 -04:00
Phil McGachey
0fe413744f [LTI Provider] Use LTI Outcome Service to pass back scores 
This change allows the LTI provider to pass grades back to the campus LMS platform using the
LTI outcome service. For full details of the outcome service, see:
    http://www.imsglobal.org/LTI/v1p1/ltiIMGv1p1.html

In brief, the LTI 1.1 spec defines an outcome service that can be offered by an LTI consumer.
The consumer determines whether a score should be returned (in Canvas, this means that the LTI
tool is used in an assignment, and the launch was performed by a student). If so, it sends
two additional parameters along with the LTI launch:

lis_outcome_service_url: the endpoint for the outcome service on the consumer;
lis_result_sourcedid: a unique identifier for the row in the gradebook (i.e. the tool/student/assignment combination).

The LTI Provider launch view detects the presence of these optional fields, and creates database
records for the specific Outcome Service and for the graded LTI launch. Later, when a score on
edX changes (identified using the signal mechanism from previous LTI Provider pull requests),
a Celery task is launched to pass the score back to the LTI consumer.
 2015-06-02 16:55:50 -04:00
chrisndodge
11fef20101 Merge pull request #8165 from edx/muhhshoaib/SOL-236/make-manual-enrollments 
SOL-236 Manual Enrollments
 2015-06-02 16:31:32 -04:00
Kelketek
cda26bb94d Merge pull request #8173 from edx/badges 
OpenBadges MVP (SOL-768)
 2015-06-02 14:30:59 -05:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Jonathan Piacenti
d499b22498 Analytics events for badges. 2015-06-02 18:32:50 +00:00
Jonathan Piacenti
f7862c1d9b Allow sharing of badges through the certificate web view. 2015-06-02 18:32:50 +00:00
Jonathan Piacenti
81877300cd Implement OpenBadge Generation upon Certificate generation through Badgr API 2015-06-02 18:32:50 +00:00
Muhammad Shoaib
65c4f1df89 SOL-236 Manual Enrollments 2015-06-02 13:19:32 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Sarina Canelake
9008548c25 Merge pull request #8207 from amir-qayyum-khan/add_ccx_enable_to_settings 
Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms
 2015-06-02 11:52:17 -04:00
Christina Roberts
46cb847eb9 Merge pull request #8306 from edx/christina/delete-unused-methods 
Delete change_email_request and lang_pref_set_language
 2015-06-02 11:30:35 -04:00
amir-qayyum-arbisoft
6a41cd7bfa Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms 2015-06-02 19:43:42 +05:00
cahrens
410beb8485 Delete unused methods. 
This functionality is provided to the user_api accounts and preferences api.
TNL-1701
 2015-06-02 10:03:19 -04:00