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

37497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christina Roberts
5f5daa266e Merge pull request #9342 from edx/christina/privileged-multiple-teams 
Allow course staff and privileged users to create multiple teams.
 2015-08-17 12:33:41 -04:00
Kevin Falcone
7cdfe2ea95 Merge pull request #9350 from edx/jibshet/escape-studio-courses 
HTML-escape uses of course display name.
 2015-08-17 12:27:43 -04:00
Kevin Falcone
58bc8e4973 Merge pull request #9349 from edx/jibsheet/escape-studio-courses-to-rc 
HTML-escape uses of course display name.
 2015-08-17 12:27:06 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Sarina Canelake
ed9b5c24db Merge pull request #9347 from edx/sarina/revert-pc 
Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial…
 2015-08-17 12:17:50 -04:00
Peter Fogg
2c6a9c5ebd HTML-escape uses of course display name. 2015-08-17 12:15:15 -04:00
Will Daly
3e19ebe9a8 Merge pull request #9348 from edx/will/ecom-2019-to-rc 
Fixing minimum grade value error
 2015-08-17 08:47:28 -07:00
Waheed Ahmed
9529359681 Merge pull request #9297 from edx/waheed/tnl3049-fix-admin-course-access-role-required-field-value 
Fixed admin course access role required field value not populating.
 2015-08-17 20:41:22 +05:00
chrisndodge
85c4c68e18 Merge pull request #9331 from edx/cdodge/only-global-staff-see-proctoring 
only let global staff (is_staff) see the proctoring tab
 2015-08-17 11:40:52 -04:00
Tasawer
7ee5d35fbb Fixing minimum grade value error 
ECOM-2109
 2015-08-17 08:40:51 -07:00
cahrens
425b8c6ba8 Allow course staff and privileged users to create multiple teams. 
TNL-3071
 2015-08-17 11:39:58 -04:00
Sarina Canelake
2861cbbf35 Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit" 
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
 2015-08-17 11:31:51 -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
Chris Dodge
1bd0ce572e 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-17 19:24:59 +05:00
Waheed Ahmed
f1af5b5c29 Fixed admin course access role required field value not populating. 
TNL-3049
 2015-08-17 19:22:06 +05:00
Marko Jevtic
63edfc6eb4 Applied suggestion from the 1st review 2015-08-17 14:14:17 +00:00
Jesse Zoldak
e57bf4a5d4 Merge pull request #9326 from edx/zoldak/TNL-3069 
Mark TeamPageTest class as flaky TNL-3069
 2015-08-17 09:29:03 -04:00
Muzaffar yousaf
1ac701ebed Merge pull request #9338 from edx/muzaffar/revert-master-changes 
Reverts the accessibility changes for team profile page.
 2015-08-17 18:16:43 +05:00
tasawernawaz
b9bd9ae3f6 Merge pull request #9336 from edx/tasawer/bugfix/ecom-2019-fixing-mininmum-grade-value-error 
Fixing minimum grade value error
 2015-08-17 18:15:32 +05:00
Renzo Lucioni
64f5df575a Merge pull request #9329 from edx/renzo/fix-release-script 
Fix release script typo
 2015-08-17 08:57:10 -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
Tasawer
58b088e109 Fixing minimum grade value error 
ECOM-2109
 2015-08-17 10:20:40 +00: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
Jolyon Bloomfield
c9fe2b9756 Fixing drag and drop labels 2015-08-16 20:16:40 -04:00
chrisndodge
a345edfa1c Merge pull request #9324 from edx/cdodge/dont-load-proctoring-JS-unnecessarily 
only include JS when feature flag is on and the course has proctoring…
 2015-08-16 08:36:09 -04:00
Chris Dodge
e19fa2c46f only include JS when feature flag is on and the course has proctoring enabled 2015-08-15 15:45:35 -04:00
Renzo Lucioni
03e6a12ede Fix release script typo 2015-08-15 14:31:41 -04: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
Jesse Zoldak
996ce1d62c Mark TeamPageTest class as flaky TNL-3069 2015-08-14 16:07:54 -04:00
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -04:00
Eric Fischer
69886290fa Merge pull request #9322 from edx/efischer/tnl3061-rc-branch 
Validating team size on join, server-side
 2015-08-14 14:03:18 -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
Eric Fischer
fc6930a5d7 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-14 13:15:53 -04:00
Andy Armstrong
1d01da0739 Merge pull request #9320 from edx/andya/fix-broken-test 
Fix broken test due to two PRs merging
 2015-08-14 12:50:44 -04:00
Andy Armstrong
1b08d9402f Merge pull request #9321 from edx/andha/rc-fix-broken-test 
Fix broken test due to two PRs merging
 2015-08-14 12:49:56 -04:00
Andy Armstrong
6e53d9c697 Fix broken test due to two PRs merging 2015-08-14 12:26:33 -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
Sarina Canelake
752226df14 Merge pull request #9315 from edx/sarina/20150814-update-translations 
Update translations (autogenerated message)
 2015-08-14 11:40:34 -04:00
cahrens
c84abfab40 Bok choy tests for dynamic updating after team changes. 2015-08-14 11:12:11 -04:00