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

26109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
4f795f8270 Fix hardcoded course urls 2014-10-03 10:56:00 -04:00
John Eskew
2a8529d37a Change email address detection in TinyMCE link plugin. 
- If link has a "@" and a ":", do not consider it an email address.
Add un-minified version of plugin.js file for link plugin.
Update build instructions to include media plugin.
Commit re-built minified JS.
Add all plugins to Jakefile.js in zip file.
Reason for this commit:
Split acceptance test was failing when TinyMCE detected a Split asset
key as an email address. Fix was to modify email address detection.
 2014-10-03 10:56:00 -04:00
Calen Pennington
139e10d9b8 Teach mongo_connection to retry read operations in the face of AutoReconnect errors 2014-10-03 10:55:59 -04:00
John Eskew
d4927de0f7 Remove unneeded import 2014-10-03 10:55:59 -04:00
Don Mitchell
8e67549484 Fix cms hardcoded keys 2014-10-03 10:55:59 -04:00
John Eskew
fd6c9bed28 Fix course export/updates and upload CMS acceptance tests. 2014-10-03 10:55:59 -04:00
Don Mitchell
edffa73512 Convert acceptance to opaque keys 2014-10-03 10:55:58 -04:00
Don Mitchell
785a3c823d Merge pull request #5469 from edx/split/content_update 
Fix cached definition change detection
 2014-10-03 09:16:01 -04:00
Waheed Ahmed
84e12bdfdf Merge pull request #5479 from edx/waheed/tnl157-fix-incorrect-relative-time 
Fixed incorrect relative time value.
 2014-10-03 16:32:00 +05:00
Waheed Ahmed
3bfe09b821 Fixed incorrect relative time value in time.js. 
TNL-157
 2014-10-03 15:37:46 +05:00
Oleg Marshev
536a815a28 Merge pull request #5433 from edx/oleg/fix-utc-time-studio-details 
Show date and time on Schedules and Details in UTC (TNL-85).
 2014-10-03 12:32:52 +03:00
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
Waqas Khalid
89e89d2a3b Merge pull request #5467 from mlkwaqas/waqas/forum-typo-thread-show 
Additional dollar sign in template
 2014-10-03 13:03:52 +05:00
Nimisha Asthagiri
f8c75b01c6 Merge pull request #5477 from edx/nimisha/update_release_script 
Remove no longer used stage-edge.edx.org.
 2014-10-02 21:30:11 -04:00
Nimisha Asthagiri
ccb503c6a1 Remove no longer used stage-edge.edx.org. 2014-10-02 17:20:44 -04:00
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
Piotr Mitros
54731383be Merge pull request #4003 from edx/pmitros/fix-sequential-none 
Fix case where DB gets populated with string None
 2014-10-02 15:09:26 -04:00
cahrens
2286366c90 Remove unused files, add missing spec file. 2014-10-02 15:05:17 -04:00
Waqas Khalid
46abd26e20 Remove extraneous dollar sign in template 2014-10-02 23:28:17 +05:00
Don Mitchell
d723425a83 Fix cached definition change detection 
LMS-11485
 2014-10-02 14:22:07 -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
cahrens
e9e37dfaa1 Don't put all of xmodule_js as src (changes coverage metrics). 2014-10-01 15:11:13 -04: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