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
dcadams
de1c68796b
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
2013-06-06 08:48:10 -07: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
Peter Fogg
4415fb4c42
Started removing XML from video editor.
...
TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.
TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
2013-06-06 10:29:24 -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
Slater-Victoroff
3b165da170
Replaced troublesome pyes integration with direct calls made to elasticsearch rest api
2013-06-06 08:56:16 -04:00
brianhw
5ff9f3be88
Merge pull request #81 from edx/zoldak/skip-mktg-url-link-test
...
Skip a test that is causing intermittent failures due to the way it is ordered.
2013-06-05 23:01:36 -07:00
Jay Zoldak
1f284c56c1
Skip a test that is causing intermittent failures due to the way it is overriding urls
2013-06-05 18:15:16 -04:00
dcadams
bc5d792338
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
2013-06-05 15:14:48 -07:00
Will Daly
582b35a90e
Merge pull request #80 from edx/will/fix-rake-test
...
Will/fix rake test
2013-06-05 14:33:30 -07:00
Will Daly
359e61d0f2
Fixed issue with xargs on Mac OS X.
...
Removed cleaning of reports folders, since this was
interferring with coverage reports generated
sequentially by rake test.
2013-06-05 17:06:41 -04:00
Piotr Mitros
af2416756e
Moved from djanalytics to edinsights
2013-06-05 17:06:36 -04:00
Ned Batchelder
56385cdf32
Merge pull request #79 from edx/ned/private-settings
...
Developer-private settings files
2013-06-05 13:17:26 -07:00
Ned Batchelder
7e8c06caf3
Developer-private settings files
...
Developers can have private settings files by creating
lms/envs/private.py or cms/envs/private.py. They are imported
at the end of dev.py. Note that they won't be imported if you
are using one of the other dev*.py variants.
2013-06-05 16:07:17 -04:00
Victor Shnayder
97c788a33a
Merge pull request #78 from edx/victor/fix-help-button
...
Re-insert "if in course" check for displaying paragraph about forums.
2013-06-05 13:04:55 -07:00
