Chris Dodge
0c6991822b
move test so it doesn't split the tests from a helper method
2013-06-10 12:46:03 -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
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
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
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
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
Brian Talbot
86a7a255c3
resolves background color syncing for particular page/container wrappers
2013-06-06 11:45:33 -04:00
Frances Botsford
6526146b95
updated misused sass body-bg to container-bg variableon account and course views
2013-06-06 11:44:57 -04:00
Victor Shnayder
4ffe3c51b5
Adds segment-io integration into the LMS
...
Tell segment IO whenever a page is loaded. Once this works, we
can add more detailed instrumentation for events we care about.
Will be turned off in prod until the SEGMENT_IO_LMS feature flag is
set to True and a SEGMENT_IO_LMS_KEY is set.
2013-06-06 11:34:03 -04:00
Christina Roberts
743384502e
Merge pull request #89 from edx/bug/christina/mktg-urls
...
Bug/christina/mktg urls
2013-06-06 08:26:23 -07:00
Brian Talbot
d2de8e516c
Merge pull request #90 from edx/fix/frances/theming-background-color
...
LMS Sass Variable/Background Color Fixes
2013-06-06 08:03:05 -07:00
Brian Talbot
3775ac61a6
resolves background color syncing for particular page/container wrappers
2013-06-06 11:02:44 -04:00
Frances Botsford
6a2eedbf99
updated misused sass body-bg to container-bg variableon account and course views
2013-06-06 11:02:44 -04:00
cahrens
c715edf57a
Strip off https://
2013-06-06 10:55:41 -04:00
cahrens
39397c5c2f
Bullet-proofing for MKTG_URLS.
2013-06-06 10:29:10 -04:00
Jay Zoldak
f00b42c950
Merge pull request #88 from edx/zoldak/revert-search-push
...
Revert accidental push of changes to master
2013-06-06 07:26:49 -07:00
Vasyl Nakvasiuk
b5ba7b8269
Merge pull request #7 from edx/anton/video_tests_fix
...
Video tests fix
2013-06-06 07:15:25 -07:00
John Jarvis
e2ee5145da
updating mktg defaults in common.py
2013-06-06 10:08:49 -04:00
John Jarvis
a65a0f6294
Merge pull request #87 from edx/jarv/read-mktg-settings
...
updating mktg defaults in common.py
2013-06-06 07:08:03 -07:00
Jay Zoldak
51b70e42a4
Revert "Merge branch 'master' of https://github.com/edx/edx-platform into slater/search"
...
This reverts commit e9c5d765ec5ff9f3be88
2013-06-06 10:06:37 -04:00
John Jarvis
1ef8682ae3
updating mktg defaults in common.py
2013-06-06 10:05:44 -04:00
John Jarvis
79edee2d9a
read MKTG_URLS from env.json
2013-06-06 10:00:15 -04:00
John Jarvis
b4bbec59d9
Merge pull request #86 from edx/jarv/read-mktg-settings
...
read MKTG_URLS from env.json
2013-06-06 06:54:51 -07:00
John Jarvis
713d78002d
read MKTG_URLS from env.json
2013-06-06 09:50:43 -04:00
Vasyl Nakvasiuk
d0e3f99e77
BaseTestXmodule: create module on the fly
2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
45e32107e7
video module: remove old methods
2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
68716f99cc
video module: _get_timeframe -> get_timeframe
2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
b25710346f
add python video tests
2013-06-06 16:46:28 +03:00
Anto Stupak
8b06916eb6
Fix tests for firefox
2013-06-06 16:45:16 +03:00
Anton Stupak
7eb18fe019
adds test files for video
2013-06-06 16:45:16 +03:00
Slater-Victoroff
e9c5d765ec
Merge branch 'master' of https://github.com/edx/edx-platform into slater/search
2013-06-06 08:56:37 -04:00
