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

11998 Commits

Author SHA1 Message Date
Mushtaq Ali
7c61e08dcd Fix course info sidebar #3095 2015-08-21 18:39:38 +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
Zia Fazal
53f1b2de0c fix for organization id drop down not populating 2015-08-18 13:37:06 +05:00
Christina Roberts
3bf6b9bd32 Merge pull request #9357 from edx/christina/tnl-3072 
The stale flag needs to take into account its previous state.
 2015-08-17 20:30:17 -04:00
Eric Fischer
350d15876a Expand instructor definition 
Per discussions, for the purposes of the teams API, an 'instructor'
is any of:
	-course staff
	-global staff
	-discussion privileged users
This change will include the last case, which previously did not have
instructor access. Changes will be documented on the teams API wiki:
https://openedx.atlassian.net/wiki/display/TNL/Team+API

Tests have also been added to confirm this functionality.

TNL-2984
 2015-08-17 17:59:43 -04:00
cahrens
41f207dec3 The stale flag needs to take into account its previous state. 
Otherwise it can change from false to true without re-rendering. TNL-3072
 2015-08-17 17:05:27 -04:00
Mark Sadecki
19604a4a6e Merge pull request #9038 from mitocw/fix/aq/extended_labels_issues_ccx 
Fixed explicit label issues related to CCX accessibility
 2015-08-17 14:31:38 -04:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Calen Pennington
9cbc8564a1 Merge pull request #9109 from jazkarta/ccx_course_published_signal 
Changes to a CCX course should emit a course_published event
 2015-08-17 13:14:00 -04:00
Sarina Canelake
5481a6a1a8 Merge pull request #9146 from open-craft/OC-791-course-timeline 
Instructor Dashboard: Display info about course timeline
 2015-08-17 13:10:57 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
clrux
2dd3f6c60f Merge pull request #9257 from edx/clrux/ux-2515-calc-label 
Calculator: fixing remainder of a11y errors
 2015-08-17 10:40:19 -04:00
muzaffaryousaf
9e7d278dd0 Revert "Accessibility fixings." 
This reverts commit 789732a7c8.
 2015-08-17 16:52:01 +05:00
muzaffaryousaf
e73a855659 Revert "Accessibility fixings for new post button on teams." 
This reverts commit e133a63a5b.
 2015-08-17 16:51:52 +05:00
muzaffaryousaf
e133a63a5b Accessibility fixings for new post button on teams. 
TNL-1930
 2015-08-17 16:27:45 +05:00
muzaffaryousaf
789732a7c8 Accessibility fixings. 
TNL-1930
 2015-08-17 15:56:58 +05:00
Amir Qayyum Khan
e18fa2f489 Fixed explicit labels related issues on CCX coach dashboard and membershp team management to fix #21 2015-08-17 13:28:44 +05:00
Brian Talbot
aa5fed718d Merge pull request #9207 from edx/talbs/remove-mktg-iframe 
Clean Up: Remove edx.org Specific MKTG Iframe Assets
 2015-08-14 17:42:01 -04:00
Christina Roberts
5e928417f1 Merge pull request #9325 from edx/christina/more-teams-tests 
Add an additional test case related to re-fetching data.
 2015-08-14 16:36:01 -04:00
Brian Talbot
944f51a60b LMS: removing old and not needed edx.org MKTG iframe assets 
* removing templates/styling
* removing test logic and URLs
 2015-08-14 16:17:19 -04:00
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -04:00
clrux
50e7a9d6fd Merge pull request #9318 from edx/clrux/ac-133-hidden-form-label 
Matching label to inputs in LMS course
 2015-08-14 13:48:31 -04:00
Andy Armstrong
fb6ec9560f Fix broken test due to two PRs merging 2015-08-14 12:24:46 -04:00
Ned Batchelder
346ff84076 Merge pull request #9311 from edx/ned/quiet-devstack-logs 
Quiet some devstack log messages
 2015-08-14 12:08:19 -04:00
Andy Armstrong
1265d540ad Merge pull request #9302 from edx/andya/team-refresh-handling 
Implement model refreshing for Teams tab
 2015-08-14 11:50:54 -04:00
Chris Rodriguez
1cd73c764e Matching label to inputs 2015-08-14 11:44:35 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab 
TNL-2976
 2015-08-14 11:12:11 -04:00
Diana Huang
7e9bba5e19 Merge pull request #9316 from edx/diana/create-teams-error 
Show correct error when creating a team.
 2015-08-14 11:10:21 -04:00
Carlos de la Guardia
aa647bd87e fix test broken by course_overview changes 2015-08-14 10:00:04 -05:00
Calen Pennington
3f9027d05e Log delete_many calls and metrics 2015-08-14 10:22:24 -04:00
Diana Huang
d244368dbf Show correct error when creating a team. 
TNL-3063
 2015-08-14 10:20:02 -04:00
Mark Sadecki
50240c3e77 Merge pull request #9114 from mitocw/fix/aq/ccx_schedule 
Fixed accessibility issues in Schedule Tab in CCX
 2015-08-14 09:02:42 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration 
Integration of Proctoring into the LMS
 2015-08-14 07:18:14 -04:00
Carlos de la Guardia
066d5ab651 Changes to a CCX course should emit a course_published event 2015-08-14 01:24:11 -05:00
frances botsford
8da4fcbbcb Merge pull request #9309 from edx/frances/teams-style-fixes 
Teams cards list spacing
 2015-08-13 23:01:32 -04:00
Daniel Friedman
04d3cb982d Merge pull request #9303 from edx/usman/tnl3053-fetch-memberships 
Also pass course_id when fetching memberships for user in team profile view.
 2015-08-13 22:32:59 -04:00
chrisndodge
7d0c9459f2 Merge pull request #9305 from edx/cdodge/fix-broken-styling-ecomm 
fix various style regressions on eComm tab of Instructor dashboard
 2015-08-13 20:30:32 -04:00
Christina Roberts
4fc2ae7ca8 Merge pull request #9312 from edx/diana/remove-invite-link 
Remove invite link functionality from teams.
 2015-08-13 20:02:53 -04:00
Eric Fischer
ec916a31dd Merge pull request #9289 from edx/efischer/tnl-2962-filter-team-by-course 
TNL-2962 Add course_id filtering to team_membership API endpoint
 2015-08-13 19:20:34 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Diana Huang
afa587cc38 Remove invite link functionality from teams. 
TNL-3062
 2015-08-13 17:53:26 -04:00
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams 
Enable teams and deprecate the advanced setting
 2015-08-13 17:47:15 -04:00
Ned Batchelder
2c8ab7db4b Quiet some devstack log messages 2015-08-13 17:26:47 -04:00