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

9122 Commits

Author SHA1 Message Date
Christina Roberts
5d7b5228f7 Merge pull request #5464 from edx/christina/js-coverage 
Don't put all of xmodule_js as src (changes coverage metrics).
 2014-10-02 17:14:18 -04:00
Stephen Sanchez
aba57382ab Merge pull request #5420 from edx/sanchez/enrollment-success-message 
Add new enrollment message to the dashboard
 2014-10-02 09:59:39 -04:00
Stephen Sanchez
bf112f7ef0 Add new enrollment message to the dashboard 
The body of the enrollment message template

Tokenize platform name in message.

Changing to a datetime enrollment approach

Adding sorting. A little refactoring.

Adding confguration model for time delta

Adding admin registration and basic form for new config model.

Fixing docstring typo

Updating default time delta to 0, adding test to show it disabled functionality.

Removing the form from configuration and tweaking the enrollment message html
 2014-10-02 12:32:35 +00:00
Omar Al-Ithawi
4f383353b3 Four Unicode fixes in discussion 2014-10-02 10:56:55 +03:00
cahrens
e9e37dfaa1 Don't put all of xmodule_js as src (changes coverage metrics). 2014-10-01 15:11:13 -04:00
Adam
db82d45681 Merge pull request #5461 from edx/release 
Release
 2014-10-01 13:14:20 -04:00
Calen Pennington
183e04106a Merge pull request #5392 from cpennington/escape-course-ids-in-html 
Properly escape CourseKeys and UsageKeys in html templates
 2014-10-01 12:32:54 -04: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
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates 
[LMS-11372]
[LMS-11370]
 2014-10-01 10:26:52 -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
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
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
Usman Khalid
548b01ab7c Disable http range requests in pdf.js. 
A bug in pdf.js or Chrome is causing pdf books to not load.

TNL-488
 2014-10-01 18:12:30 +05: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
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
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
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
Calen Pennington
1a682dacd1 Include caching definitions in split bulk operations 2014-09-29 22:35:41 -04:00
Greg Price
115c3543e3 Merge pull request #5347 from edx/gprice/notifier-api-cohorts 
Add a new user API for the notifier
 2014-09-29 17:04:45 -04:00
Greg Price
887bcb5578 Add a new user API for the notifier 
This new endpoint is designed specifically to fill the needs of the
notifier and should not be used by other clients.
 2014-09-29 17:04:23 -04:00
Carlos Andrés Rocha
9145d72ccb Update copy for link to analytics dashboard. 2014-09-29 16:46:51 -04:00
Dave St.Germain
bd581fdbb5 Cleaning up pylint and pep8 errors. 2014-09-29 16:39:32 -04:00
Carlos Andrés Rocha
fa43a4490a Enable analytics dashboard link in instructor dashboard. 2014-09-29 16:24:28 -04:00
Adam Palay
0c4f98a89b update password reset template (TNL-503) 2014-09-29 16:15:31 -04:00
Will Daly
9b4c59cdfc Merge pull request #5417 from edx/will/profile-feature-flag-third-party-auth 
Put student profile third party auth behind a feature flag
 2014-09-29 15:00:55 -04:00
Dave St.Germain
f1d08b3b62 Merge pull request #5406 from edx/dcs/mobile-api-tests 
Added tests for mobile API
 2014-09-29 14:45:41 -04:00
Dave St.Germain
575a8123bd Tests for mobile api 2014-09-29 13:37:36 -04:00
Don Mitchell
dc9654283e Fix unit tests for generated 
course ids.
 2014-09-29 11:25:56 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split 
11300
 2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Will Daly
9083c49f07 Put student profile third party auth behind a feature flag 2014-09-29 11:05:53 -04:00
zubair-arbi
570a922661 Merge pull request #5362 from edx/zub/bugfix/plat-88-importstatusinvalidkeyerror 
add couse key verification decorator in common for use in both studio an...
 2014-09-29 15:44:02 +05:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms 
PLAT-88
 2014-09-29 13:26:43 +05:00
Waheed Ahmed
29aa933140 Converted annotation lettuce test into bok-choy test. 
TNL-353
 2014-09-29 13:12:06 +05:00