Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,372 Commits 1 Branch 0 Tags
7516fb565208e7043018ea4cdb9b377d61d00a92
Commit Graph

14372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bethany LaPenta
7516fb5652 Added to author file 2013-06-13 14:35:29 -04:00
Bethany LaPenta
85f1386918 Fixed test_system looking like a test to nosetests, also fixed a class in test_error_module.py that had one class inheriting from another 2013-06-13 14:30:07 -04:00
Greg Price
7c326f6520 Merge pull request #120 from edx/gprice/help-widget-tweaks 
Reviewed by @brianhw https://rbcommons.com/s/edx/r/17/
 2013-06-11 07:47:35 -07:00
Greg Price
2e38130cb7 Add feedback submission test case for invalid email address 2013-06-10 18:01:44 -04:00
Greg Price
ca8927ed67 Tweak text in help modal per request from Mary 2013-06-10 18:01:44 -04:00
Greg Price
42b7a0717b Tag all Zendesk issues with "LMS" per request from Mary 2013-06-10 18:01:44 -04:00
Greg Price
7be6880fd2 Add course id tagging to feedback submissions 2013-06-10 18:01:44 -04:00
Greg Price
73d3b14500 Add more information to Zendesk tickets and make the information more readable 2013-06-10 18:01:44 -04:00
Greg Price
17647abd5c Add datadog reporting to the feedback submission mechanism 2013-06-10 18:01:43 -04:00
Will Daly
673c015e8e Merge pull request #113 from edx/will/jenkins-detached-head 
Will/jenkins diff cover
 2013-06-10 14:00:17 -07:00
Don Mitchell
976280e693 Merge pull request #110 from edx/bug/dhm/baddrafts 
Have the draft module store actively prevent non-leaf nodes from being
 2013-06-10 12:01:49 -07:00
Ned Batchelder
62b2323588 Merge pull request #94 from edx/ned/fix-silly-xml-encoding-errors 
Fix encoding errors when hashing XML
 2013-06-10 10:45:37 -07:00
Ned Batchelder
fea6792637 In these tests, 'rendered_html' is neither rendered, nor HTML. Name it context_repr, since that's what it is. 2013-06-10 13:11:10 -04:00
dcadams
0b4e03e8bc Merge pull request #66 from edx/feature-dcadams-usermanagement 
Feature user-management autoenroll
 2013-06-10 10:10:57 -07:00
Ned Batchelder
5bc7333ca8 Test the Unicode handling during construction of an ErrorModule directly. 2013-06-10 12:58:10 -04:00
Ned Batchelder
a841bf7d2e Use repr instead of str for getting context data via the system render function, so it works better for non-ASCII data. 2013-06-10 12:57:39 -04:00
chrisndodge
1c348a94d4 Merge pull request #116 from edx/fix/cdodge/make-sure-imported-files-are-location-clean 
partial fix for STUD-145, catch invalid location errors and return a HTT...
 2013-06-10 09:48:56 -07:00
Chris Dodge
0c6991822b move test so it doesn't split the tests from a helper method 2013-06-10 12:46:03 -04:00
Christina Roberts
5bc91d8a04 Merge pull request #117 from edx/bug/christina/max-attempts 
Allow a value of 0 for max attempts. STUD-264.
 2013-06-10 09:40:35 -07:00
cahrens
b0b3062a20 Allow a value of 0 for max attempts. STUD-264. 2013-06-10 11:51:25 -04:00
Chris Dodge
d9ce3162e0 partial fix for STUD-145, catch invalid location errors and return a HTTP 400 error to client 2013-06-10 11:47:37 -04:00
Will Daly
13fc113282 Updated to latest version of diff-cover (now compares 
to `origin/master` instead of `master`)
 2013-06-10 10:17:56 -04:00
Ned Batchelder
979ee6844e Add to the test, a check that the XML file truly has a non-ASCII character in it. 2013-06-07 19:05:01 -04:00
Ned Batchelder
4896e44589 Write a test for the XML unicode conversion fix. 2013-06-07 17:07:33 -04:00
Ned Batchelder
aac7e364d3 Make the repr right. 2013-06-07 17:05:58 -04:00
Don Mitchell
2266028921 Have the draft module store actively prevent non-leaf nodes from being 
saved as draft.
 2013-06-07 15:40:30 -04:00
caesar2164
3fe830a803 Merge pull request #98 from edx/giulio/fix-image-urls 
move url() wrapper into SASS variable
 2013-06-07 09:53:01 -07:00
Greg Price
2c29481611 Merge pull request #106 from edx/release 
Merge hotfix-2013-06-07
 2013-06-07 08:05:58 -07:00
Greg Price
7af474feac Merge pull request #104 from edx/hotfix/instructor-dash 
Fix XSS vulnerability in instructor dashboard
 2013-06-07 07:59:12 -07:00
Greg Price
625a9581eb Fix XSS vulnerability in instructor dashboard 2013-06-07 10:23:03 -04:00
e0d
6cf7d26381 Merge pull request #95 from edx/fix/e0d/no-name-e 
fixing bug noticed in production
 2013-06-07 07:13:39 -07:00
Ned Batchelder
69f8bf7afa Fix weird formatting. 2013-06-07 09:58:12 -04:00
Ned Batchelder
ccaf8178fd Change a test to get at some Unicode issues. 2013-06-07 09:57:51 -04:00
David Baumgold
eb18113f14 Merge branch 'release' 2013-06-07 09:23:29 -04:00
Valera Rozuvan
01678c3be0 Merge pull request #70 from edx/valera/gst_fixes_hsph 
GST fixes
 2013-06-07 06:15:28 -07:00
Valera Rozuvan
d9651d7497 GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info. 2013-06-07 16:12:50 +03:00
Valera Rozuvan
13fa55125b Merge pull request #69 from edx/valera/event_tracking 
Valera/event tracking
 2013-06-07 06:06:21 -07:00
Valera Rozuvan
1956020f5c Overhaul of event log of load, play, pause, seek, speed-change events. 2013-06-07 16:05:02 +03:00
Valera Rozuvan
48edd4a2bf Experimenting with optimal event attachment strategy. 2013-06-07 16:05:02 +03:00
Ned Batchelder
d4db4c6dea Fix encoding errors when hashing XML 
We occasionally get UnicodeEncodeErrors from these two places,
because the XML is a Unicode string, and is implicitly encoded to ascii.
 2013-06-07 07:10:32 -04:00
Giulio Gratta
7104937fb8 move url() wrapper into SASS variable 2013-06-06 17:54:41 -07:00
e0d
83a490c79d fixing bug noticed in production 2013-06-06 16:04:42 -04:00
Jonah Stanley
a3a7d1d548 Merge pull request #77 from edx/jonahstanley/fix-alert-tests 
Jonahstanley/fix alert tests
 2013-06-06 12:59:07 -07:00
JonahStanley
477f29d5ee Added docstring specifying when this method must be called 2013-06-06 14:52:35 -04:00
Brian Talbot
228b501410 Merge pull request #91 from edx/fix/btalbot/edx.org-bannertext 
Login/Register Page Headings Tweaks
 2013-06-06 11:48:59 -07:00
Alexander Kryklia
d6c772c5aa adds missed } 2013-06-06 14:48:41 -04:00
Brian Talbot
d3965cb3ee removes redundant h2 heading and syncs up h1 value (with broken mak/template syntax) for register view 2013-06-06 14:48:40 -04:00
Victor Shnayder
92aba63375 Merge pull request #65 from edx/victor/segment-io 
Adds segment-io integration into the LMS
 2013-06-06 11:11:00 -07:00
dcadams
7d961bae54 undid last commit where some coffee files were inadvertantly added. 2013-06-06 10:26:30 -07:00
Calen Pennington
5489a3b645 Merge pull request #44 from edx/feature/cale/run-all-tests 
Run all tests on jenkins
 2013-06-06 09:52:27 -07:00