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

14304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giulio Gratta
7104937fb8 move url() wrapper into SASS variable 2013-06-06 17:54:41 -07: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
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
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 e9c5d765ec, reversing
changes made to 5ff9f3be88.
 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
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
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
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
Victor Shnayder
1b81d06337 Re-insert "if in course" check for displaying paragraph about forums. 
Accidentally got removed in pull request 13.
 2013-06-05 16:04:21 -04:00
JonahStanley
d226a21eb0 Changed wording to I will 2013-06-05 16:01:45 -04:00
JonahStanley
f652a5d8c4 Small wording fix 2013-06-05 15:57:42 -04:00
JonahStanley
260659cfc6 Fixed wording in the step 2013-06-05 15:56:45 -04:00
JonahStanley
d147103be0 Fixed tab issue (tabs are now correctly spaces) 2013-06-05 15:55:12 -04:00
JonahStanley
0548b119a9 Fixed other scenarios that were skipped 2013-06-05 15:21:23 -04:00
JonahStanley
acc743eea8 Added functionality to bypass alerts 
This is done with the following steps:
'I confirm all alerts' means that all alert and confirm windows are returned and returned true respectively
'I dismiss all alerts' means that all confirm windows are returned false
'I answer all prompts with "([^"]*)"' means that all prompts are returned with the given string

Please note that these settings are on a PER PAGE basis.  This means that for best results, the step must be given right before the alert is generated.
 2013-06-05 15:08:58 -04:00
Calen Pennington
3c498f66b3 Add script to generate lists of changes made by all users in a release 2013-06-05 15:04:08 -04:00
Will Daly
ee0115971b Merge pull request #68 from edx/will/diff-cover-integration 
Will/diff cover integration
 2013-06-05 12:00:16 -07:00
chrisndodge
5d3f6dc477 Merge pull request #74 from edx/fix/cdodge/about-elements-not-exporting 
[STUD-244] add exporting of 'about' content as well as adding unit test checks
 2013-06-05 11:53:24 -07:00
chrisndodge
7fc994831f Merge pull request #75 from edx/feature/cdodge/allow-setting-of-session-cookie-name 
seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be ...
 2013-06-05 11:35:26 -07:00
Chris Dodge
ffdeac3dcd seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str() 2013-06-05 14:31:32 -04:00