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

32368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Usman Khalid
6a1be48e1e Merge pull request #9418 from edx/usman/tnl2883-video-tests 
Fix video bumper tests.
 2015-08-26 16:59:42 +05:00
Usman Khalid
0dbb969be3 Fixed video bumper tests. 
TNL-2883
 2015-08-26 14:50:56 +05: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
Kevin Falcone
65377423c0 Merge pull request #9471 from edx/jibsheet/third-party-auth-settings 
Allow configuring sensitive third_party_auth settings via lms.auth.json
 2015-08-25 17:39:13 -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
David Ormsbee
5807ae97d0 Merge pull request #9455 from edx/ormsbee/faster_tests_shib 
Convert Shib external auth test to use SharedModuleStoreTestCase.
 2015-08-25 13:58:19 -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
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
Bill DeRusha
cd751ab5fe Merge pull request #9460 from edx/bderusha/edx-search-for-teams-TNL-3013-patch 
Remove pylint: disable invalid-name for paginator error and fix syntax
 2015-08-25 11:01:11 -04:00
asadiqbal
c230f22b52 SOL-1097 2015-08-25 19:41:05 +05:00
David Ormsbee
154c9bae43 Merge pull request #9457 from edx/ormsbee/faster_tests_user_api 
Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase
 2015-08-25 10:31:23 -04: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
Fred Smith
c1f1821963 Merge pull request #9456 from edx/derf/add_setting_for_DISPLAY_ANALYTICS_ENROLLMENTS 
DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…
 2015-08-25 10:18:20 -04:00
Bill DeRusha
81ced1c964 Remove disable pylint for paginator error and fix syntax 2015-08-25 10:08:16 -04:00
David Ormsbee
a1a9a2a576 Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase 2015-08-25 09:47:59 -04: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
83c91e244c Convert Shib external auth test to use SharedModuleStoreTestCase. 2015-08-25 08:56:16 -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
Sarina Canelake
887a3af401 Merge pull request #9452 from edx/sarina/update-dummy-strings 
Update dummy translation files with Underscore template strings
 2015-08-24 20:25:05 -04:00
Sarina Canelake
6381be87c6 Update dummy translation files with Underscore template strings 2015-08-24 18:05:13 -04:00
Ned Batchelder
4c03b2bbee Merge pull request #9451 from edx/ned/extract_more_i18n 
Adjust the i18n extraction rules to get all the strings we should get.
 2015-08-24 17:54:26 -04:00
Ned Batchelder
3eb2e31c52 Adjust the i18n extraction rules to get all the strings we should get. 
There's a move afoot to put assets inside individual Django apps,
instead of in upper-level "templates" directories.  These i18n
configuration files have to take this into account.

.underscore files are easy to find by their unique file extension, so
the rule can be simple.  Mako files are .html, so we have to be more
nuanced about it.  We don't want to get pure HTML files, and we don't
want to get .html files for tests, even if they are Mako templates.
 2015-08-24 16:27:36 -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
Kelketek
71e367ea81 Merge pull request #9445 from edx/update-edx-submissions 
Update edx-submissions hash
 2015-08-24 11:36:15 -05:00
David Ormsbee
f83dcaa37d Merge pull request #9448 from mitocw/fix/aq/email_ccx 
Fixed URL and course title in CCX enrollment/unenrollment email
 2015-08-24 12:17:35 -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
5d1bd22505 Merge pull request #9431 from edx/efischer/js-flakes 
Potential fix for flaky TeamDiscussionView js tests
 2015-08-24 10:49:09 -04:00