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

26088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Andrés Rocha
9cd26e551a List all courses during OAut2/OpenID Connect 
Previously, only courses respective to the branded instance were returned.

AN-3610
 2014-10-03 14:15:41 -04:00
Usman Khalid
4e796c575a Merge pull request #5366 from edx/usman/tnl367-transaction-level-decorator 
MySQL transaction isolation level decorator.
 2014-10-02 19:16:46 +05: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
Jesse Zoldak
8b95cb4840 Merge pull request #5459 from edx/zoldak/quiet-stevedore 
Quiet stevedore.extension logging in bok-choy tests
 2014-10-02 09:24:21 -04:00
David Baumgold
ff5017bca2 Merge pull request #5436 from Edraak/edraak/omarithawi/fix-four-unicode-issues-in-discussion 
Four Unicode fixes in discussion
 2014-10-02 09:15:56 -04:00
Adam
ca13e9aa50 Merge pull request #5424 from edx/adam/change-discussion-blackout-wording 
update discussion blackout setting warning (TNL-442)
 2014-10-02 09:12:09 -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
David Baumgold
b6ed821978 Merge pull request #5457 from edx/kill-DISABLE_RESET_EMAIL_TEST-flag 
Kill DISABLE_RESET_EMAIL_TEST flag
 2014-10-01 14:16:04 -04:00
Christina Roberts
bb58e4b3ce Merge pull request #5458 from edx/andya/lms-underscore-i18n 
Translate strings in LMS Underscore templates
 2014-10-01 14:04:28 -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
Jesse Zoldak
1c08f81c60 Quiet stevedore.extension logging in bok-choy tests 2014-10-01 12:14:51 -04:00
Jesse Zoldak
d9b9630c56 Merge pull request #5265 from edx/zoldak/fix-test 
Increase randomness of course name in testcase
 2014-10-01 12:13:10 -04:00
Andy Armstrong
191aba967b Translate strings in LMS Underscore templates 2014-10-01 12:12:50 -04:00
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
David Baumgold
31931827bf Kill DISABLE_RESET_EMAIL_TEST flag 
We're better served by just directly testing if we're in the LMS or not.
 2014-10-01 11:42:41 -04:00
Usman Khalid
8323939b46 Merge pull request #5455 from edx/usman/tnl488-disable-range-requests-in-pdf-viewer 
Disable range requests in pdf viewer.
 2014-10-01 20:11:41 +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
Usman Khalid
32063fe003 Added commit_on_success_with_read_committed decorator to views 
which raise IntegrityErrors.

TNL-367
 2014-10-01 19:48:37 +05:00
Usman Khalid
ae09573228 commit_on_success_with_read_committed should only work with atmost 
1 level of transactions.

TNL-367
 2014-10-01 19:45:38 +05:00
Usman Khalid
25a90301b3 Tests for the commit_on_success_with_read_committed decorator. 
TNL-367
 2014-10-01 19:45:38 +05:00
Usman Khalid
5ba236f405 Created commit_on_success_with_read_committed decorator. 
This decorator executes the decorated function inside a
transaction with isolation level set to READ COMMITTED.

TNL-367
 2014-10-01 19:42:47 +05:00
Calen Pennington
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates 
[LMS-11372]
[LMS-11370]
 2014-10-01 10:26:52 -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
Usman Khalid
b4caf38815 Disabled failing test test_video_end_time_with_default_start_time. 2014-10-01 19:16:08 +05: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
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
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