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

15584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Baratta
944e3390e0 Add support for various math functions in calc.py. 2013-06-10 11:35:34 -04:00
Peter Baratta
ed90ed9a34 Added tests for new math functions 2013-06-10 11:35:33 -04:00
Peter Baratta
58e98d13cc Make Jenkins test the calc module 2013-06-10 11:35:04 -04:00
Peter Baratta
a746a9ad15 Get rid of unused code 2013-06-10 11:08:48 -04:00
Peter Fogg
115ae42bee Changed description of source and track fields. 2013-06-10 11:07:11 -04:00
Peter Fogg
ee64d8c024 Fixed .75 and 1.5 speeds playing at 1.0 speed. 2013-06-10 11:01:22 -04:00
Calen Pennington
6c24694a7c Fix tests that vary urls.py 
Create a mixin class that can be used for tests that customize urls.py
to force django to reload it, so that they don't break other tests.
 2013-06-10 10:56:50 -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
Juho Kim
98b978528b simplified analytics conf 2013-06-07 18:54:36 -04:00
cahrens
1273bc22b3 Additional test coverage. 2013-06-07 17:24:07 -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
cahrens
f3b92312d9 Add test for serialize/deserialize. 2013-06-07 15:58:31 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -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
Juho Kim
e161a0a65e simplified analyticserver settings 2013-06-06 18:58:20 -04:00
Nate Hardison
b05ff885fa Replace /faq route in LMS urls 
This route was mistakenly removed by the theming changes since the
"FAQ" marketing link actually points to help_edx, not faq_edx.
 2013-06-06 14:18:08 -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
1fefec2176 Fixed the need of a global variable 2013-06-06 15:28:45 -04: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
JonahStanley
8d15b74a97 Fixed errors in spacing and refactoring out of scenario 2013-06-06 14:38:59 -04:00
Ned Batchelder
cab49716b5 Whitelisted courses now run Python code outside the sandbox. 2013-06-06 14:27:12 -04:00
Ned Batchelder
9a631fe476 All uses of safe_exec need to get the correct random seed. 2013-06-06 14:27:12 -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
Juho Kim
665bc6e3db analytics server setup simplified 2013-06-06 13:48:20 -04: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
Calen Pennington
d92134e60c Merge pull request #45 from edx/feature/cale/release-email-list 
Add script to generate lists of changes made by all users in a release
 2013-06-06 09:51:55 -07:00
cahrens
e5efdde76a Strip off https:// 2013-06-06 11:51:46 -04:00
cahrens
9220a4f459 Bullet-proofing for MKTG_URLS. 2013-06-06 11:51:46 -04:00