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

12047 Commits

Author SHA1 Message Date
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
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
Braden MacDonald
79a075328f Allow configuring sensitive third_party_auth settings via lms.auth.json 2015-08-25 16:35:35 -04:00
Fred Smith
28368a0d71 DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENROLLMENTS 2015-08-25 09:29:17 -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
Eric Fischer
f07c303628 Revert "JS Flakiness in TeamDiscussionView" 2015-08-21 13:56:44 -04:00
Eric Fischer
a1a9f3bdcb Merge pull request #9405 from edx/efischer/js-flakes 
JS Flakiness in TeamDiscussionView
 2015-08-21 10:29:21 -04:00
Mushtaq Ali
d1e31afa4b Merge pull request #9397 from edx/mushtaq/tnl-3095-fix-course-sidebar-padding 
Fix course info sidebar padding
 2015-08-21 19:20:31 +05:00
Mushtaq Ali
7c61e08dcd Fix course info sidebar #3095 2015-08-21 18:39:38 +05:00
Eric Fischer
90b94a46bc Potential fix for flaky TeamDiscussionView js tests 
Adding waitsFor check in the beforeEach method. The condition I'm
waiting for here is shamelessly borrowed from bok-choy's
wait_for_ajax._is_ajax_finished() method:
https://github.com/edx/bok-choy/blob/master/bok_choy/page_object.py#L431

This seems to fix the errors I was able to generate with the
set_timeout, which themselves looked ver similar to the failing
master tests, so I *think* this will fix our woes, but since I was
never able to get the tests to fail exactly the same way I can't be sure.

Since there don't seem to be any drawbacks, this is going into mainline
as-is and we'll monitor for the sporadic failures over the next few
weeks.
 2015-08-21 09:38:46 -04:00
chrisndodge
045a67aa30 Merge pull request #9416 from edx/cdodge/remove-external-id-from-report 
alter columns in proctoring exam report
 2015-08-21 07:29:00 -04:00
tasawernawaz
68da716d3d Merge pull request #9399 from edx/tasawer/bugfix/ecom-1932-Upgrade-page-not-displaying-in-French 
Fixing issue for french language
 2015-08-21 11:24:09 +05:00
Chris Dodge
110dbc048c alter columns in proctoring exam report 2015-08-20 20:21:54 -04:00
Alison Hodges
1e374f4d4e Merge pull request #9382 from edx/ahodges/comments_on_roles 
Adds a comment to reduce confusion over remaining role name differences
 2015-08-20 20:18:04 -04:00
Peter Fogg
16503d9853 Merge pull request #9410 from edx/peter-fogg/fix-tnl-3101-quality 
Peter fogg/fix tnl 3101 quality
 2015-08-20 16:16:08 -04:00
Alison Hodges
3547821b1a Adds a comment to reduce confusion over remaining role name differences 2015-08-20 16:09:35 -04:00
Peter Fogg
5c855bdc7b Fix quality violation. 2015-08-20 15:15:14 -04:00
Mushtaq Ali
c80906596b Fix Forum Update Issue #TNL-3101 2015-08-20 13:08:41 -04:00
Will Daly
d4f521b43d Merge pull request #9332 from edx/will/final-icrv-access-control 
In-Course Reverification Access Control
 2015-08-20 09:24:05 -07:00
zubair-arbi
ec28a75f14 In-course reverification access control 
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
 2015-08-20 08:43:55 -07:00
Matt Drayer
ebed8cd42a Merge pull request #9339 from edx/ziafazal/SOL-493 
ziafazal/SOL-493: Fetch scores via ScoresClient
 2015-08-20 10:20:48 -04:00
Tasawer
ad77bc51ec Fixing issue for french language 
ECOM-1932
 2015-08-20 17:49:52 +05:00
Awais
653554fd7a fixing issue with student reverification. 
ECOM-2106
 2015-08-20 16:25:05 +05:00
tasawernawaz
74c7c2ad77 Merge pull request #9392 from edx/tasawer/bugfix/ecom-1996-hiding-find-course-button-on-edge 
Hiding find courses button from dashboard of edge.edx.org
FYI @wedaly
 2015-08-20 14:13:10 +05:00
Tasawer
46f2adf68c Hiding find courses button from dashboard of edge.edx.org 
ECOM-1996
 2015-08-20 11:45:34 +05:00
Christina Roberts
2f5193cf18 Merge pull request #9383 from edx/christina/search-sort 
Add sorting by last_activity_at.
 2015-08-19 16:48:10 -04:00
Ahsan Ulhaq
a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages 
Add USD labels to prices on track selection pages
 2015-08-20 00:37:27 +05:00
Marco Morales
e56c3d91af Merge pull request #9310 from edx/frances/teams-padding-responsive 
Teams page content padding
 2015-08-19 15:31:55 -04:00
Eric Fischer
5ee49351f1 Merge pull request #9346 from edx/efischer/fix_docs_course_id_team_membership 
Updating documentation for team_membership endpoint
 2015-08-19 14:59:38 -04:00
Ahsan Ulhaq
3d62580fc2 Add USD labels to prices on track selection pages 
ECOM-2114
 2015-08-19 23:59:15 +05:00
cahrens
295108c9a4 Add sorting by last_activity_at. 
TNL-3011
 2015-08-19 14:23:38 -04:00
Christina Roberts
276cba90c6 Merge pull request #9262 from edx/christina/search-sort 
Add sorting by team_count, as well as secondary sort (by name).
 2015-08-19 12:25:07 -04:00
Eric Fischer
86f4806e84 Updating documentation for team_membership endpoint 
Recent changes to the team_membership API endpoint added the
course_id optional parameter, but the in-code documentation
was never updated to reflect this. The wiki documentation at
https://openedx.atlassian.net/wiki/display/TNL/Team+API is OK.

Related: https://github.com/edx/edx-platform/pull/9289
 2015-08-19 12:21:45 -04:00
cahrens
c5f5a58c28 Allow course staff and privileged users to create multiple teams. 
TNL-3071
 2015-08-19 11:07:15 -04:00
Chris Dodge
674b92f0b9 Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard 
Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard if the feature flag is enabled.
 2015-08-19 11:07:14 -04:00
Chris Dodge
c08fbd1406 only include JS when feature flag is on and the course has proctoring enabled 2015-08-19 11:07:14 -04:00
Eric Fischer
da3ac3e65b Validating team size on join, server-side 
By doing this, we can prevent the bug where multiple users can join
a team simutaneously and push its enrollment over the defined
maximum value. Tests have also been added to confirm this behavior.

TNL-3061
 2015-08-19 11:07:14 -04:00
cahrens
9fe6dd2791 Call super instead of referencing superclass directly. 2015-08-19 10:52:50 -04:00
cahrens
1bd4b1d60c Add sorting by team_count, as well as secondary sort. 
TNL-3012
 2015-08-19 10:52:50 -04:00
Zia Fazal
05e2cc9402 fetch StudentModule via query-chunking 
using ScoresClient instead of StudentModule

using ScoresClient without FieldDataCache
 2015-08-19 12:57:32 +05:00
Awais
4ca44effec Change default donation amount to $10. 
ECOM-2113
 2015-08-19 12:52:45 +05:00
David Baumgold
2aa7e266cf Clean up the Django ORM usage a bit 2015-08-18 15:44:26 -04:00
Diana Huang
de15f8ec55 Merge pull request #9360 from edx/diana/add-last-activity 
Add a new last_activity_at field.
 2015-08-18 12:03:48 -04:00
zubair-arbi
c49d51f98b Merge pull request #9359 from edx/ahsan/ECOM-2117-style-issues-on-credit-status-in-dashboard 
Style issues on the credit status in the dashboard
 2015-08-18 20:42:33 +05:00
Diana Huang
ce8f311256 Add a new last_activity_at field. 
TNL-3068
 2015-08-18 11:21:04 -04:00
Calen Pennington
1e6d83b59e Merge pull request #9307 from cpennington/user-state-client-metrics 
User state client metrics
 2015-08-18 10:43:37 -04:00
Matt Drayer
13ef9a62d1 Merge pull request #9358 from edx/ziafazal/SOL-1044-fix-org-ddl 
SOL-1125: fix for organization id drop down not populating
 2015-08-18 10:10:36 -04:00
Eric Fischer
1b66abc50a Merge pull request #9323 from edx/efischer/expand_instructor_definition 
Expand instructor definition
 2015-08-18 10:09:32 -04:00
Ahsan Ulhaq
722c5bb90d Style issues on the credit status in the dashboard 
ECOM-2117
 2015-08-18 17:42:03 +05:00