Ned Batchelder
4c6e482d39
Merge pull request #24 from edx/ned/remove-test-ike
...
Remove test_ike.py, Ike says we don't need it, and it looks like a test.
2013-06-02 18:45:05 -07:00
Christina Roberts
52b76c87f4
Merge pull request #11 from edx/feature/christina/metadata-ui
...
Feature/christina/metadata ui
2013-06-01 16:01:53 -07:00
Peter Fogg
5434f2750e
Cleaning up code to fix pylint/pep8 errors.
2013-05-31 15:58:12 -04:00
Ned Batchelder
ae2a507ec8
Remove test_ike.py, Ike says we don't need it, and it looks like a test.
2013-05-31 15:40:51 -04:00
JonahStanley
cb9da2cd03
Potentially fixed all flakey tests
...
New function was added: is_css_not_present
This function works like is_css_present in that it will wait and can take in an optional argument to wait longer. This should be used everywhere INSTEAD of not is_css_present as in the latter case, you are telling selenium to wait for the thing you don't want to be there to either be there or time out.
2013-05-31 15:16:45 -04:00
Victor Shnayder
e01991eca5
Tweak copy
2013-05-31 14:56:37 -04:00
JonahStanley
3308bb4be7
Fixed pull request comments and refactored the duplicate code
2013-05-31 14:53:29 -04:00
Ned Batchelder
98673f8e6a
Somehow, when I moved symmath, I left behind its test files!?
2013-05-31 14:39:23 -04:00
Frances Botsford
92e159ea37
text and style adjustments to help button modal
2013-05-31 14:31:16 -04:00
Vik Paruchuri
badd3a8d13
Properly stub out the controller_qs variable in the tested module. Test times out without this.
2013-05-31 13:14:19 -04:00
Peter Fogg
2277c82efd
Fix pep8 whitespace violation.
2013-05-31 12:54:09 -04:00
marco
290d049c29
Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui
2013-05-31 12:41:13 -04:00
marco
72e1fab1c4
SASS variable and naming standards sync-up based on @talbs feedback completed
2013-05-31 12:40:40 -04:00
Peter Fogg
a503a753cd
Remove unnecessary pylint warning disable.
2013-05-31 12:16:25 -04:00
Peter Fogg
453bf42133
Revert changes to how video_alpha is stubbed out for testing.
2013-05-31 12:12:14 -04:00
Ned Batchelder
9314154ec1
Move loncapa grading helpers into the sandbox-packages directory.
2013-05-31 12:01:33 -04:00
Peter Fogg
782cb05410
Add passing Lettuce testing for video autoplay in LMS.
2013-05-31 11:22:45 -04:00
e0d
2e84540af0
removing the request debugger entirely.
2013-05-31 11:15:28 -04:00
Victor Shnayder
75f127d76b
Change help button text, fixing LMS-319
2013-05-31 10:59:00 -04:00
JonahStanley
a49acc73ee
Removed the save_html line
2013-05-31 09:16:14 -04:00
marcotuts
46967a78dc
Merge pull request #6 from edx/release
...
Release 2013-05-29, with Hotfix 2013-05-30 back into master
2013-05-30 16:34:22 -07:00
David Baumgold
bdc9570cd1
Removed Symbolset font files
2013-05-30 16:09:17 -04:00
Peter Fogg
1ead857792
Working on Lettuce tests for video in LMS.
...
In progress, committing for the great git history rewrite.
2013-05-30 15:01:23 -04:00
JonahStanley
c27391ce8f
Accidently left in a set_trace and forgot to include files
2013-05-30 15:00:01 -04:00
JonahStanley
ccc253d5c0
Sped up tab lettuce test
2013-05-30 14:56:08 -04:00
JonahStanley
7fe206a9d2
Sped up some Lettuce Tests
2013-05-30 14:23:49 -04:00
JonahStanley
62b74008e6
Added tests for Limited Attempt Problems and Showing the Answer
2013-05-30 14:22:37 -04:00
Peter Fogg
6eeb12ad1c
Add Lettuce tests for autoplay in Studio.
2013-05-30 11:34:15 -04:00
chrisndodge
91c8570c37
Merge pull request #2142 from edx/fix/cdodge/repair-edge-login
...
update POST-back URL to the new one - post Drupal
2013-05-29 21:16:48 -07:00
Peter Fogg
5465bda5f3
Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div.
2013-05-29 17:00:25 -04:00
Peter Fogg
e0d5118ca0
Add hidden HTML so that the video player knows whether or not we're in the LMS.
2013-05-29 15:45:36 -04:00
Chris Dodge
879f7d1051
fix Edge login to use the updated POST-back URL /login -> /login_ajax
2013-05-29 12:11:25 -04:00
Chris Dodge
eb4dd76328
update POST-back URL to the new one - post Drupal
2013-05-29 12:02:41 -04:00
Jonah Stanley
fa6bbfb9e2
Merge pull request #2129 from edx/fix/jonahstanley/fix-flakey-test
...
Fixed Flakey Acceptance Test
2013-05-29 07:48:46 -07:00
Brian Wilson
54fb46cee4
make debug_request available only when DEBUG is enabled, so that production doesn't have this security risk.
2013-05-28 15:30:25 -04:00
JonahStanley
c3c4a0e9ad
Hopefully fixed registration flakey test
2013-05-28 15:22:47 -04:00
marcotuts
ab18953eec
Merge pull request #2020 from edx/ux/marco/forums-icons
...
updated pinning icons
2013-05-28 11:22:13 -07:00
caesar2164
3106ad027d
Merge pull request #2125 from edx/giulio/fix-footer-layout
...
fix footer and header spacing/margin issues
2013-05-28 11:12:49 -07:00
Giulio Gratta
186da0d5fe
fix user button/dropdown spacing/scrolling issue
2013-05-28 10:49:58 -07:00
Brian Talbot
25305dc8f7
lms/mktg - removes margins from social icons and reinstates flex-gutter margin to colophon area of footer
2013-05-28 13:44:16 -04:00
Brian Talbot
ef6c365ca0
lms/mktg - revises paragraph in colophon portion of footer to match footer's flex-grid value
2013-05-28 13:36:47 -04:00
Giulio Gratta
8d7b46b51b
fix footer element spacing issues
2013-05-28 10:15:39 -07:00
Greg Price
e755bdfdfd
Tweak text on 500 error page
2013-05-28 10:59:19 -04:00
Vik Paruchuri
5050eab74a
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
2013-05-24 14:26:33 -04:00
caesar2164
94300608a0
Merge pull request #2112 from edx/feature/giulio/variablize-colors
...
fixing video-bg-image and homepage-bg-image urls
2013-05-23 11:21:23 -07:00
Calen Pennington
69beea854c
Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports
...
Record junit reports of jasmine tests
2013-05-23 11:06:34 -07:00
Giulio Gratta
538ffe6fbe
fixing video-bg-image and homepage-bg-image urls
2013-05-23 11:04:24 -07:00
Giulio Gratta
566a8b3823
fix bad css and clean up after rebase/merge
2013-05-23 09:44:42 -07:00
Giulio Gratta
93258c548f
fixed hardcoded changes left over from parent theme branch backport
2013-05-23 09:44:41 -07:00
Giulio Gratta
3dd5733cee
first round of color replacements with variables
2013-05-23 09:44:40 -07:00
