Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,439 Commits 1 Branch 0 Tags
9ff0a16251bfefc7d7a657ff0720d75c616ae1fc
Commit Graph

12113 Commits

Author SHA1 Message Date
Chris Rodriguez
1c29763441 Overriding white color for messages on dashboard 2015-09-03 11:57:29 -04:00
Kevin Falcone
ff8e473787 Merge pull request #9588 from edx/release 
Merge two hotfixes to release
 2015-09-02 14:11:29 -04:00
David Ormsbee
f577a6d278 Add body hash to LTI outcome message. 
This is necessary to properly implement the LTI outcome passback
spec. It was not included previously because it was causing problems
with Canvas, but Blackboard will not accept outcomes unless they are
properly signed.

The requests_oauthlib doesn't support the body hash spec out of the
box, so BodyHashClient needed to be made. Fortunately, it's a pretty
simple spec:

https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html
 2015-09-01 15:29:00 -04:00
David Ormsbee
664544035a Add explicit name for LTI provider outcome celery task. 2015-09-01 15:29:00 -04:00
David Ormsbee
37cdb89a5e Allow LtiConsumer.instance_guid to be blank. 
The instructions say that this should be left blank until the
initial launch, but Django Admin kicks that out because blanks
are not allowed at the model level.
 2015-09-01 15:29:00 -04:00
Andy Armstrong
a8284058e6 Merge pull request #9517 from edx/andya/disable-flaky-forum-test 
Disable team discussion Jasmine tests
 2015-08-28 11:41:15 -04:00
Ned Batchelder
741f06864a Merge pull request #9502 from edx/ned/import-path-differently 
Change imports from path to use the stablest name.
 2015-08-28 11:12:10 -04:00
David Ormsbee
1f64506c31 Merge pull request #9507 from edx/ormsbee/faster_tests_comment_client 
Convert CohortedTestCase to use SharedModuleStoreTestCase.
 2015-08-28 10:59:09 -04:00
Andy Armstrong
b74a1b9825 Disable team discussion Jasmine tests 
This is a temporary solution until we can fix TNL-3007
 2015-08-28 10:46:41 -04:00
Bill DeRusha
9eafe4dfe6 Merge pull request #9489 from edx/bderusha/teams-mock-callback 
Improve teams test run times by skipping signals
 2015-08-28 10:09:17 -04:00
muzaffaryousaf
b45ffa11cc Changing the createNew teams-tab.js method to use the viewWithHeader. 
TNL-2964
 2015-08-28 15:59:21 +05:00
Muzaffar yousaf
28fddda407 Merge pull request #9376 from edx/muzaffar/tnl1914-team-edit-page 
Edit team page for Instructors only.
 2015-08-28 15:31:46 +05:00
Tim Krones
f9756eb436 Merge pull request #9483 from open-craft/OC-791-course-timeline-improved 
Instructor dashboard: Improve course timeline info
 2015-08-28 12:30:27 +02:00
muzaffaryousaf
f788caa6cc Edit team page for Instructor only. 
TNL-1914
 2015-08-28 12:47:15 +05:00
David Ormsbee
9bac3579c0 Convert CohortedTestCase to use SharedModuleStoreTestCase. 
Some low hanging fruit optimization of forums tests.
 2015-08-27 20:37:48 -04:00
Bill DeRusha
24a41dc59e Improve teams test run times by skipping signals 
TNL-3126

add **kwargs to skip_signal method
 2015-08-27 16:08:54 -04:00
Braden MacDonald
586c237543 Fix for Twitter compatibility 2015-08-27 11:19:39 -07:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -04:00
Muzaffar yousaf
3eaf29fabe Merge pull request #9343 from edx/muzaffar/tnl1930-teams-accessibility 
Muzaffar/tnl1930 teams accessibility
 2015-08-27 22:50:36 +05:00
Utkarsh
d881067f84 Merge pull request #8835 from edx/utkjad/injecting_callstackmanager 
[PLAT -758] Making Call Stack Manager work in StudentModule and StudentModuleHistory, add @trackit, @wrapt dependency, and refine conditions
 2015-08-27 13:42:15 -04:00
muzaffaryousaf
76f3ca8655 Accessibility fixes for team profile page. 
TNL-1930
 2015-08-27 22:02:29 +05:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name. 
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
 2015-08-27 12:59:25 -04:00
Christina Roberts
df76994ea5 Merge pull request #9415 from edx/christina/insensitive-check 
Do a case insensitive check for conflicts to improve performance.
 2015-08-27 12:57:29 -04:00
cahrens
41ac90fa7a Use team name prefix and UUID for team_id. 
TNL-3107
 2015-08-27 11:22:35 -04:00
Muhammad Ammar
d38da773ea Merge pull request #9265 from edx/ammar/use-studio-confirmation-dialog-in-lms 
Confirm when leaving team
 2015-08-27 17:26:07 +05:00
Tasawer
07148c6350 Removing experimental logistration endpoints 
ECOM-1017
 2015-08-27 06:21:47 +00:00
utkjad
387303d364 Injecting call stack manager in CSM/CSMH,introducting @trackit,@wrapt, and refining implementation[PLAT-758] 2015-08-26 22:29:43 +00:00
David Ormsbee
7543e05baa PEP8 fix. 2015-08-26 15:08:38 -04:00
David Ormsbee
ff62a8eaaa Merge branch 'release' into release-2015-08-26-conflict 2015-08-26 14:28:35 -04:00
Awais Qureshi
830a695f4a Merge pull request #9461 from edx/awais786/XCOM-538-otto-admin-restrict-nonexisting-course 
adding validator to make sure course exists in db before creating in …
 2015-08-26 23:14:55 +05:00
Tim Krones
aa55d1c569 If no end date has been set for a course, be explicit about it in course 
timeline info.
 2015-08-26 18:39:47 +02:00
Eric Fischer
4d974730bf Removing extraneous render from team_discussion.js 
On the advice of https://github.com/edx/edx-platform/pull/9470,
the render call here is not needed and should be removed in order
to allow the view's owner to determine when it needs to be rendered.

This will hopefully also fix the flaky tests we've been seeing,
we'll need to continue to monitor the builds to be sure.
 2015-08-26 12:20:33 -04:00
Eric Fischer
3e407b9d7f Revert "Fix for flaky TeamDiscussionView js tests" 
This reverts commit d64c2b299f.
 2015-08-26 12:20:33 -04:00
Peter Fogg
fad40cf3f8 Show a team's last activity in the UI. 
Fix timeago and requireJS.
 2015-08-26 12:07:55 -04:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity. 
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
 2015-08-26 12:07:54 -04:00
Fred Smith
4bc622745c Merge pull request #9481 from edx/revert-9456-derf/add_setting_for_DISPLAY_ANALYTICS_ENROLLMENTS 
Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYT…
 2015-08-26 12:04:47 -04:00
Awais
cdfc9da4d9 adding validator to make sure course exists in db before creating in otto. 2015-08-26 20:50:18 +05:00
muhammad-ammar
d8b419c64f Review changes 2015-08-26 20:26:35 +05:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
Fred Smith
16ac5801c9 Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…" 2015-08-26 11:10:21 -04:00
Chris Rodriguez
96fc306337 Fixes modal color 2015-08-26 11:00:54 -04:00
Peter Fogg
4aec2abf10 Merge pull request #9450 from edx/peter-fogg/sort-topic-page 
Add sorting controls on topics page.
 2015-08-25 20:26:32 -04:00
Peter Fogg
382909b7c3 Add sorting controls on Teams topics page. 
TNL-1936
 2015-08-25 16:59:52 -04:00
Braden MacDonald
79a075328f Allow configuring sensitive third_party_auth settings via lms.auth.json 2015-08-25 16:35:35 -04:00
Muhammad Shoaib
dc2e1c0b84 Merge pull request #9393 from edx/muhhshoaib/PHX-12-css-changes-instructor-dashboard-proctored-attempts 
PHX-112 css styling for proctoring tab student attempts in instructor dashboard
 2015-08-26 00:11:06 +05:00
Matt Drayer
f01fd6e7a7 Merge pull request #9442 from edx/asadiqbal08/SOL-1097 
asadiqbal08/SOL-1097-Certificate url do not appears correctly when student share certificate on Linkedin
 2015-08-25 12:53:16 -04:00
clrux
4e6dbc9e62 Merge pull request #9440 from OmarIthawi/omarithawi/nav-seq-module-rtl 
Flipped the direction of the seq_module arrows
 2015-08-25 11:39:57 -04:00
asadiqbal
c230f22b52 SOL-1097 2015-08-25 19:41:05 +05:00
Muhammad Shoaib
dff2688c06 Merge pull request #9446 from edx/muhhshoaib/PHX-124-alignment-issues-in-proctoring-exam-screens 
PHX-124
 2015-08-25 19:20:17 +05:00
David Ormsbee
3e4325dc4a Merge pull request #9453 from edx/ormsbee/faster_tests_class_dashboard 
Convert class dashboard tests to use SharedModuleStoreTestCase.
 2015-08-25 09:40:26 -04:00