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

26062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
srpearce
dcbe23d4bd Merge pull request #5311 from edx/sylvia/docs/SFD 
Sylvia/docs/sfd
 2014-10-01 12:05:56 -04:00
Sylvia Pearce
17c8fa81f5 Student-facing documentation v1 2014-10-01 11:58:30 -04:00
Waqas Khalid
26ad885ab5 Merge pull request #5403 from mlkwaqas/waqas/tnl90-ordering-of-pinned-thread-ignored 
Pinned thread should come first when sorting
 2014-10-01 20:45:20 +05:00
Christina Roberts
7f4cc1c75c Merge pull request #5407 from edx/cohort-management 
Cohorts UI
 2014-10-01 11:01:03 -04:00
Stephen Sanchez
348c7a3c7d Merge pull request #5454 from edx/sanchez/fix-login-button 
Tweak to old header styles to fix login button
 2014-10-01 10:58:18 -04:00
Calen Pennington
8b789bb76b Merge pull request #5441 from cpennington/split/get-item-bulk-operation 
Wrap get_item inside bulk_operations internally, to cache query for active versions
 2014-10-01 10:25:39 -04:00
Adam
6a5fc054ba Merge pull request #5445 from edx/release 
Release
 2014-10-01 09:32:23 -04:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard 
TNL-162
 2014-10-01 09:22:32 -04:00
Brian Talbot
b58f7ad7b4 resolving display issues by re-implementing discussions-scoped is-hidden classes 2014-10-01 09:22:32 -04:00
Brian Talbot
21aab92183 LMS: revising .is-hidden utility class to be used at a global level 2014-10-01 09:22:31 -04:00
Brian Talbot
62db7a82a1 converting instructor dashboard message UI to use .is-hidden vs.is-shown stateful CSS classes 2014-10-01 09:22:31 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard. 
TNL-163
 2014-10-01 09:22:31 -04:00
Brian Talbot
13882b7544 adding copy revisions and light styling support for cohort management 2014-10-01 09:22:31 -04:00
Brian Talbot
3aa842db52 Adding static rendering for cohort group creation UI 
* adding styling/markup for "add new group" controls, messages, and form
* small FED and UI changes to overall cohort management UI
 2014-10-01 09:22:31 -04:00
Nimisha Asthagiri
b4c826e747 TNL-329 Client-side work for displaying cohort description. 2014-10-01 09:22:30 -04:00
Nimisha Asthagiri
f72974d4df TNL-328 Server-side work for displaying type of cohort. 2014-10-01 09:22:30 -04:00
Brian Talbot
138fc14544 addressing FED feedback 2014-10-01 09:22:30 -04:00
Brian Talbot
8df19d819f correcting needed markup for cohort management static UX template 2014-10-01 09:22:30 -04:00
Nimisha Asthagiri
3bb1ab080d TNL-160 Default cohorts, automatically created. 2014-10-01 09:22:30 -04:00
Brian Talbot
267e8c97f1 LMS: adds static cohort group management UI to the Instructor Dashboard 2014-10-01 09:22:30 -04:00
Brian Talbot
f753a09fbd LMS: revises membership UI layout on instructor dashboard 2014-10-01 09:22:29 -04:00
Andy Armstrong
9e366fe202 Show cohorts on the new instructor dashboard 
TNL-161

Remove placeholder text
 2014-10-01 09:22:29 -04:00
stephensanchez
9698c631ae Tweak to old header styles to fix login button 2014-10-01 13:12:56 +00:00
Ben Patterson
6d5cd5d0b8 Merge pull request #5139 from edx/benp/enforce-pep8-pylint-threshold 
Paver: fail if pylint/pep8 violations threshold is breached.
 2014-10-01 08:08:49 -04:00
Anton Stupak
f221f010e9 Merge pull request #4930 from e-kolpakov/master 
Fix for TNL-147
 2014-10-01 14:52:34 +03:00
Waheed Ahmed
e9529c4271 Merge pull request #5330 from edx/waheed/tnl269-fix-multiple-jsinput 
Fixed multiple JsInput's in problem.
 2014-10-01 15:25:01 +05:00
Waheed Ahmed
e2ce977756 Fixed multiple JsInput's in problem. 
TNL-269
 2014-10-01 14:21:25 +05:00
E. Kolpakov
dcc82e1abe Added default font to a list of available fonts in text editor XModule 
Added acceptance test scenario to test for existense of "Default" font and all tinyMCE built-in fonts
Updated AUTHORS
 2014-10-01 12:52:38 +04:00
Renzo Lucioni
e895e10185 Merge pull request #5427 from edx/renzo/profile-page-preferred-language 
Allow changing of language preference from profile page
 2014-09-30 23:34:52 -04:00
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Alison Hodges
4ad2c4923f Merge pull request #5446 from edx/ahodges/doc/xreffix 
Fixes and xref
 2014-09-30 17:58:08 -04:00
Alison Hodges
d73e1f3992 Fixes and xref 2014-09-30 17:57:45 -04:00
Adam
e738aceeeb Merge pull request #5443 from edx/hotfix/2014-09-29 
Hotfix/2014 09 29
 2014-09-30 17:47:34 -04:00
Ben Patterson
1f196523f3 Paver: pep8/pylint violations limit switch. Fail if limit is breached. 
This adds the -l switch, wherein a violations limit is passed in. For
example:
  paver run_pep8 -l 700

Will fail if more than 700 violations are found.

By default, this limit is not enforced (i.e. if the -l switch
is not passed into the command, then a limit will not be put
into effect for that run)
 2014-09-30 17:38:33 -04:00
Alison Hodges
89b618fc97 Merge pull request #5437 from edx/ahodges/doc/DOC1037 
Release notes for Insights
 2014-09-30 17:32:23 -04:00
Alison Hodges
2c37dfcb70 Release notes for Insights 2014-09-30 17:31:58 -04:00
Don Mitchell
3622d0d09f Merge pull request #5439 from edx/mixed_ms_coverage 
Test caching of courses in mixed maps
 2014-09-30 16:58:31 -04:00
Adam
a9afba07bb Merge pull request #5442 from edx/adam/update-template 
update password reset template (TNL-503)
 2014-09-30 16:28:34 -04:00
Calen Pennington
37cfed61e9 Wrap get_item inside bulk_operations internally, to cache query for active versions 
[LMS-11402]
 2014-09-30 16:06:01 -04:00
Calen Pennington
87558c2c9c Merge pull request #5212 from cpennington/split/import-export-performance 
Improve performance of split-mongo import/export performance
 2014-09-30 15:44:04 -04:00
Don Mitchell
30155d33bd Test caching of courses in mixed maps 2014-09-30 15:01:20 -04:00
Alison Hodges
cd1a4d1d0b Merge pull request #5371 from edx/ahodges/doc/insights 
Updates to browser and preface files
 2014-09-30 14:24:41 -04:00
Alison Hodges
01a3c4e3ce Updates to browser and preface files 2014-09-30 14:24:18 -04:00
Brian Talbot
76207bbe89 Merge pull request #5426 from edx/talbs/fix-lms-header-boxmodel 
FIX: LMS - New Global Header Vertical Alignment
 2014-09-30 13:40:58 -04:00
Dave St.Germain
b7429cddde Merge pull request #5429 from edx/dcs/mobile-delint 
Cleaning up pylint and pep8 errors in mobile API.
 2014-09-30 11:10:43 -04:00
Brian Talbot
872dae0f27 LMS: resolving vertical alignment issues with new header global nav items 2014-09-30 08:44:02 -04:00
Waqas Khalid
92d2a332d6 Pinned thread should come first when sorting 
Pinned threads come on the top when we sort threads
by most recent activities but in the most activities
and most vote case it doesn't come on top. Pinned
thread should come on top in any case of sorting

TNL-90
 2014-09-30 17:37:40 +05:00
Calen Pennington
1a17b31a8b Make definitions and structures truly append-only 2014-09-29 22:35:42 -04:00
Calen Pennington
ef23c19bf4 Prevent queries into split using deprecated CourseLocators, BlockUsageLocators, or DefinitionLocators 2014-09-29 22:35:41 -04:00
Calen Pennington
1a682dacd1 Include caching definitions in split bulk operations 2014-09-29 22:35:41 -04:00