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

5905 Commits

Author SHA1 Message Date
Tasawer
cd69ca2b23 Removed unused url endpoints + fixed broken tests 
ECOM-1017
 2015-08-31 12:50:08 +00:00
Peter Fogg
9e7c93d931 Merge pull request #9504 from edx/peter-fogg/sort-team-page 
Allow sorting of teams in a topic
 2015-08-28 16:25:57 -04:00
Peter Fogg
2c774fd271 Allow sorting of teams in a topic. 
TNL-1937
 2015-08-28 15:46:07 -04:00
David Ormsbee
1e430a76ca Merge pull request #9495 from edx/ormsbee/faster_tests_course_struct 
Convert course_structure_api tests to SharedModuleStoreTestCase.
 2015-08-28 15:06:16 -04:00
David Ormsbee
f696c98f82 Merge pull request #9510 from edx/ormsbee/faster_tests_disc_api_serializers 
Use SharedModuleStoreTestCase in Discussion API serializer tests.
 2015-08-28 13:39:15 -04:00
clrux
5b545c2b0d Revert "Course navigation menu accessibility issue" 2015-08-28 13:28:08 -04:00
clrux
52a8bc50cb Merge pull request #9367 from edx/clrux/ac-76-course-nav 
Course navigation menu accessibility issue
 2015-08-28 13:27:44 -04:00
chrisndodge
69ddbc0dc4 Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers 
add the ability to persist the course_key where the user answered the…
 2015-08-28 13:03:58 -04:00
David Ormsbee
e9378881e8 Use SharedModuleStoreTestCase in Discussion API serializer tests. 2015-08-28 11:43:48 -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
Chris Rodriguez
c0bfdf5e5d Removing instances of old mechanism; tests 2015-08-28 07:50:33 -04:00
Chris Rodriguez
c9b775bda2 wip test fixes 2015-08-28 07:50:33 -04:00
Ahsan Ulhaq
b32d2205d4 Course navigation menu accessibility issue 
Following have been done
1- Change the structure of the course navigation Menu HTML
2- Add some basic styling
3- Add basic JS for html rendering
4- Update tests according to new structure

AC-76
 2015-08-28 07:49:31 -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
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
David Ormsbee
290383252b Convert course_structure_api tests to SharedModuleStoreTestCase. 2015-08-26 23:24:57 -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
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
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
Peter Fogg
382909b7c3 Add sorting controls on Teams topics page. 
TNL-1936
 2015-08-25 16:59:52 -04: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
asadiqbal
c230f22b52 SOL-1097 2015-08-25 19:41:05 +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
David Ormsbee
fdfaa56579 Merge pull request #9449 from edx/ormsbee/faster_tests_ccx 
Move some CCX view tests to use SharedModuleStoreTestCase (performance).
 2015-08-25 09:24:26 -04:00
David Ormsbee
08343b9636 Merge pull request #9438 from edx/ormsbee/instructor_dash_tests_speedup 
Speed up Instructor Dash tests + add manual reset for SharedModuleStoreTestCase
 2015-08-25 08:52:19 -04:00