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

12096 Commits

Author SHA1 Message Date
David Ormsbee
42b736ae50 Shift some shoppingcart tests to use SharedModuleStoreTestCase. 2015-08-27 23:02:30 -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
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
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
Fred Smith
28368a0d71 DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENROLLMENTS 2015-08-25 09:29:17 -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
Omar Al-Ithawi
e57d8a732c RTL next and prev. arrows in sequence module navigation 2015-08-25 12:37:18 +03:00
Muhammad Shoaib
73722c47d3 Merge pull request #9375 from edx/muhhshoaib/PHX-118-timer-bar-scroll-out-view-css 
PHX-118 added the css for the timer bar visibility when the page scrolls
 2015-08-25 12:37:44 +05:00
David Ormsbee
d6f3cd8634 Convert class dashboard tests to use SharedModuleStoreTestCase. 2015-08-25 01:57:47 -04:00
David Ormsbee
2ecf7aec46 Update Instructor Dashboard tests to use SharedModuleStoreTestCase. 
Also added reset_test_case() and @modifies_courseware to SharedModuleStoreTestCase.

Revert "More verbose test builds in Jenkins, for debugging."

This reverts commit 58cade4cc4288335026649470a48b7bbca969ee8.
 2015-08-25 01:28:55 -04:00
David Ormsbee
4053d625c9 Move some CCX view tests to use SharedModuleStoreTestCase (performance). 2015-08-24 16:21:27 -04:00
David Ormsbee
f2b3f913c8 Merge pull request #9443 from edx/ormsbee/group_access_test_speedups 
Use bulk_operations in group access tests.
 2015-08-24 14:54:00 -04:00
Bill DeRusha
28bca8e683 Merge pull request #9365 from edx/bderusha/edx-search-for-teams-TNL-3013 
Add basic elasticsearch search for teams
 2015-08-24 11:40:40 -04:00
unknown
88a038aa1e Fixed email parm function for CCX email 
modified:   lms/djangoapps/instructor/tests/test_enrollment.py
 2015-08-24 20:34:11 +05:00
Muhammad Shoaib
e8b399aaa1 PHX-118 added the css for the timer bar visibility when the page scrolls 2015-08-24 20:11:23 +05:00
Eric Fischer
d64c2b299f Fix for flaky TeamDiscussionView js tests 
After being able to reproduce the errors exactly by making certain
elements unfindable, I concluded that the issues we've been seeing
on headless jenkins runs are due to execution happening too quickly
and elements not loading in time to be interacted with.

The fix is to make liberal use of Jasmine 1.3 `runs` and `waitsFor`
functionality, to ensure that execution happens in the order that
we want, with rendering being checked before proceeding.

Once again, I can't be 100% sure that this fixes the Jenkins errors,
as those are very hard to reliably reproduce, but this is an
educated guess at fixing the problem with no drawbacks, as I've
been able to successfully run all tests locally.
 2015-08-24 10:06:52 -04:00
Muhammad Shoaib
8c2de514f8 PHX-124 
fixed the alignment issues in proctoring exam screens
 2015-08-24 18:58:13 +05:00
Bill DeRusha
973314de7b Add basic elasticsearch search for teams 
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
 2015-08-24 09:22:06 -04:00
Muhammad Shoaib
0e9ed196c7 PHX-112 css styling for proctoring tab student attempts in instructor dashboard 2015-08-24 15:43:40 +05:00
zubair-arbi
8ca590d4f3 display course id instead of name in course name placeholder, if ajax call to get course data fails 2015-08-24 14:03:57 +05:00