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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Wilson
0eb190fc61 Add _get_request_value to safely access request.REQUEST for browser events. 2014-10-03 11:45:08 -04:00
Greg Price
183d688129 Add events for cohort modifications 
This includes cohort creation/deletion and membership changes.
 2014-10-03 11:32:43 -04:00
Greg Price
606ad7ab26 Remove dead code 2014-10-03 11:32:42 -04:00
Greg Price
c51e504e81 Add cohort information to forum search events 2014-10-03 11:32:41 -04:00
Greg Price
71bb506850 Fix error when doing non-ASCII forum search 
Fixes TNL-160
 2014-10-03 11:32:41 -04:00
Mark Hoeber
76a52acfea Merge pull request #5230 from edx/markhoeber-doc913 
WIP: edXML Doc Draft
 2014-10-03 11:19:44 -04:00
Mark Hoeber
f39a41ba40 Alpha OLX guide 2014-10-03 11:18:41 -04:00
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
Jesse Zoldak
9a8753d41e Disable flaky JS FileUploader SystemFeedback and NotificationView tests 
TNL-559
 2014-10-03 10:50:20 -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
Andy Armstrong
3c43bc65a3 Merge pull request #5475 from edx/andya/cohort-doc-fixes 
Update final text strings & readthedoc URL
 2014-10-02 15:47:58 -04:00
Daniel Friedman
3c32d2c7a2 Merge pull request #5473 from edx/dan-f/background-student-profiles-add-cohort 
Make student profile CSV download a background task, add cohort column
 2014-10-02 15:30:55 -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
Daniel Friedman
ba3f7f9409 Make student profile CSV download a background task, add cohort column 2014-10-02 14:21:13 -04:00
Adam Palay
766066fd9b image files with different extensions should generate thumbnails with distinct names (TNL-532) 2014-10-02 13:50:17 -04:00
Andy Armstrong
7be11b47da Address PR review comments 2014-10-02 13:07:58 -04:00
David Baumgold
9c81004fc7 Remove test cleanups 
Since `ddt` should make them unnecessary
 2014-10-02 12:18:16 -04:00
David Baumgold
62fcc6f23a Use ddt for shib tests 2014-10-02 12:18:15 -04:00
Andy Armstrong
ba491195e6 Update final text strings & readthedoc URL 
TNL-401
 2014-10-02 11:54:23 -04:00
zubair-arbi
dbe4410d44 set overflow to scroll so that user can see full content with increased font size 
TNL-256
 2014-10-02 19:34:57 +05: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