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

30596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia Pearce
c482fce9d6 Update UI text for Saudi e-commerce features on the Instructor Dashboard 2015-06-03 16:35:22 -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
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
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
Christine Lytwynec
9f6e628158 Merge pull request #8342 from edx/clytwynec/axs_testing 
add script for jenkins to run accessibility tests
 2015-06-03 14:19:08 -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
Shrhawk
ef500514c1 Merge pull request #7970 from edx/shr/bug/TNL-2038-Remove-table-of-contents-transcript-languages 
Remove "table of contents" from transcript upload languages
 2015-06-03 22:39:39 +05: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
Adam
cf18892035 Merge pull request #6798 from edx/adam/tolerance-fix 
fix tolerance rounding error (TNL-904)
 2015-06-03 13:29:35 -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 Ormsbee
0d2c09faf0 Merge pull request #8335 from edx/clee/add_myself_to_authors_list 
Added Christopher Lee to authors list
 2015-06-03 12:38:00 -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
Christine Lytwynec
beaacd5dcd add script for jenkins to run accessibility tests 2015-06-03 12:28:56 -04:00
christopher lee
7b6a7ccbe7 Added Christopher Lee to authors list 2015-06-03 12:04:00 -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
zubair-arbi
416dd82da9 Merge pull request #8315 from edx/zub/story/credit-requirement-model-add-location-id-field 
use 'name' field in 'CreditRequirement' model to save the locatio…
 2015-06-03 20:39:32 +05: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
Adam Palay
1da047bd18 fix tolerance rounding error (TNL-904) 2015-06-03 11:10:06 -04:00
Christina Roberts
0db8bac7c4 Merge pull request #8331 from edx/diana/teams-tab 
Add teams tab
 2015-06-03 10:01:06 -04:00
zubair-arbi
38b859fd40 use 'name' field in 'CreditRequirement' model to save the location of xblocks 2015-06-03 18:54:33 +05:00
chrisndodge
348878becd Merge pull request #6906 from edx/cdodge/set-is-entrance-exam-default 
set default on is_entrance_exam
 2015-06-03 09:16:37 -04:00
cahrens
f70891b5c0 Add support for edX namespaced define. 2015-06-03 09:10:45 -04:00
cahrens
0ddf264714 2.0.14 version of requiresjs/text 2015-06-03 09:10:44 -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
Aamir
110a7b1af4 Merge pull request #8232 from edx/aamir-khan/ECOM-1592-ICRV-credit-requirement-new 
ECOM-1592: Adding incourse reverification as a credit requirement in …
 2015-06-03 11:58:23 +05:00
Chris Dodge
1e371bbbae set default on is_entrance_exam 2015-06-02 21:41:40 -04:00
Sarina Canelake
f118505d4f Merge pull request #8327 from UQ-UQx/master 
Updated AUTHORS
 2015-06-02 21:12:58 -04:00
simultech
69ad5e8774 Updated AUTHORS 2015-06-03 09:22:53 +10:00
Braden MacDonald
ce83f5cf35 Merge pull request #8077 from open-craft/keyed-config-model-2 
Keyed ConfigurationModel + Admin functionality
 2015-06-02 16:12:41 -07:00
Calen Pennington
8f6be8ab96 Allow for keyed ConfigurationModels + New Admin UI 2015-06-02 14:50:45 -07: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
Will Daly
1153edf820 Merge pull request #8318 from edx/will/credit-requirement-status-changes 
Add additional "reason" field to CreditRequirementStatus
 2015-06-02 16:18:47 -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