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

32411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Syed Hasan raza
0448925f6b Merge pull request #9354 from edx/shr/bug/MA-824-fix-transcript-for-html5 
fetch transcript for html5 if 404
 2015-08-28 00:58:55 -07:00
muzaffaryousaf
f788caa6cc Edit team page for Instructor only. 
TNL-1914
 2015-08-28 12:47:15 +05:00
Sarina Canelake
406c9bc556 Merge pull request #9464 from mirjamsk/mirjamsk/TNL-3096 
Adresses TNL-3096
 2015-08-27 19:36:43 -04:00
Matt Drayer
5140be7d5d Merge pull request #9479 from edx/asadiqbal08/SOL-1152 
asadiqbal08/SOL-1152- Getting error on editing the certificate in deactivated mode.
 2015-08-27 16:40:16 -04:00
Will Daly
325dbe0077 Merge pull request #9466 from edx/will/upgrade-django-model-utils 
Upgrading django-model-utils to 2.3.1
 2015-08-27 13:09:27 -07:00
Braden MacDonald
ba1b84210d Merge pull request #9313 from open-craft/twitter-tpa 
Fix for Twitter compatibility
 2015-08-27 12:21:29 -07: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
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
mirjamsk
336982e42b Adresses TNL-3096 
Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests
 2015-08-27 15:50:33 +00:00
cahrens
41ac90fa7a Use team name prefix and UUID for team_id. 
TNL-3107
 2015-08-27 11:22:35 -04:00
Syed Hassan Raza
a2bca09c86 fetch transcript for html5 with youtubeId if 404 2015-08-27 08:04:57 -07:00
Will Daly
3c400783dd Merge pull request #9467 from edx/will/upgrade-django-mptt 
Upgrade django-mptt to 0.7.4
 2015-08-27 07:45:22 -07:00
Ned Batchelder
b6626620fd Merge pull request #9477 from edx/ned/clarify-advanced-component-types 
Add a comment explaining what ADVANCED_COMPONENT_TYPES should be.
 2015-08-27 10:31:56 -04:00
Jesse Zoldak
15ce2e10c6 Merge pull request #9484 from edx/zoldak/coverage-371 
Updated coverage to 3.7.1
 2015-08-27 10:18:27 -04:00
Waheed Ahmed
6b81f72d0e Merge pull request #9462 from edx/waheed/plat808-added-course-id-in-exception 
Added course in exception message for InvalidTabsException.
 2015-08-27 17:52:04 +05:00
raeeschachar
03520e663d Merge pull request #9417 from edx/raees-chrome-bok-choy-tests 
Fixed test_new_textbook_uplaod test that was failing on Chrome
 2015-08-27 17:33:50 +05:00
raeeschachar
646bd9397f Merge pull request #9444 from edx/raees-chrome-bok-choy-test-cohort-enable-disable 
Fixed Chrome test cohort enabled disabled in Cohort Configuration Test
 2015-08-27 17:32:46 +05: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
Ned Batchelder
65a317951c Add a comment explaining what ADVANCED_COMPONENT_TYPES should be. 
While I'm in there, also fix the comment for ADVANCED_PROBLEM_TYPES.
 2015-08-27 07:38:19 -04:00
Waheed Ahmed
7646433995 Added course in exception message for InvalidTabsException. 2015-08-27 13:07:43 +05:00
tasawernawaz
d8f484acc1 Merge pull request #9459 from edx/tasawer/dev-story/ecom-1017-removing-experimental-logistration-endpoints 
Remove experimental logistration endpoints
 2015-08-27 12:26:16 +05:00
raeeschachar
7cf3895cc4 Fixed Chrome test cohort enabled disabled in Cohort Configuration Test 2015-08-27 12:06:03 +05:00
asadiqbal
9f34720d56 SOL-1152 2015-08-27 11:27:43 +05:00
Tasawer
07148c6350 Removing experimental logistration endpoints 
ECOM-1017
 2015-08-27 06:21:47 +00:00
Matt Drayer
40b5663bbe Merge pull request #9474 from edx/asadiqbal08/SOL-1128 
asadiqbal08/SOL-1128-Certificates: Studio Setup Copy and UI changes
 2015-08-27 00:11:11 -04: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
a3599425e1 Merge pull request #9487 from edx/release-2015-08-26-conflict 
Merging 2015-08-26 release conflict branch to master
 2015-08-26 17:59:11 -04: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
David Ormsbee
02cc9ca86a Merge pull request #9436 from edx/rc/2015-08-25 
2015-08-25 Release
 2015-08-26 14:11:12 -04:00
Eric Fischer
94e11e1e58 Merge pull request #9463 from edx/efischer/js-flakes 
Revert "Fix for flaky TeamDiscussionView js tests"
 2015-08-26 13:54:48 -04:00
Jesse Zoldak
1340ec8c84 Updated coverage to 3.7.1 2015-08-26 13:44:30 -04: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
David Ormsbee
74394bfe1b Merge pull request #9480 from edx/ormsbee/pull_from_last_weeks_hotix 
Fixes modal color
 2015-08-26 11:44:55 -04: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