Commit Graph

14208 Commits

Author SHA1 Message Date
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
Jonah Stanley
b312944dcf Merge pull request #64 from edx/jonahstanley/fix-codemirror-tests
Jonahstanley/fix codemirror tests
2013-06-05 06:30:58 -07:00
Joe Blaylock
e092aadbf9 Merge pull request #48 from edx/jrbl/substitute-anonymous-user-id-in-html
Expose site-wide anonymized ids to HTML module
2013-06-04 14:13:59 -07:00
Calen Pennington
946c36e49a Merge pull request #56 from edx/fix/cale/coffee-assets-watch
Use coffee watch command to watch whole directories, so that it will pic...
2013-06-04 13:59:19 -07:00
JonahStanley
bbd34235b8 Made finding place to click a bit nicer 2013-06-04 16:40:18 -04:00
JonahStanley
7f2fa8ff3a Fixed issue with code mirror editing
It turns out that code mirror things can be edited.  Once the div is clicked, a new text area appears that can be obtained and sent keys
2013-06-04 16:33:54 -04:00
Peter Fogg
90a1a8cb72 Merge pull request #63 from edx/peter-fogg/single-click-video-creation
Unbreak acceptance tests in the cms.
2013-06-04 13:10:39 -07:00
Nate Hardison
b606d7ce56 Merge pull request #53 from edx/nate/fix-mako-templ-encoding
Specify UTF-8 encoding when loading Mako template
2013-06-04 13:02:05 -07:00
Peter Fogg
2b6a449b2a Unbreak acceptance tests in the cms. 2013-06-04 15:48:20 -04:00
Brian Talbot
5baee34896 Merge pull request #60 from edx/fix/btalbot/lms-header
LMS Slim Header Visual Clean-Up
2013-06-04 12:26:13 -07:00
Jay Zoldak
fda444220a Merge pull request #62 from edx/zoldak/turn-off-lettuce-screenshot-on-failure
Turn off automatic snapshot to tmp dir on lettuce failure
2013-06-04 12:22:21 -07:00
Jay Zoldak
59b26a791b Turn off automatic snapshot to tmp dir on lettuce failure 2013-06-04 15:09:44 -04:00
Brian Talbot
7c4e20f9e5 lms - adds in alt text attribute to logo/edX home image for accessibility purposes 2013-06-04 14:46:01 -04:00
Brian Talbot
f34b131678 lms - revises the physical height of the edX logo within the slim-sized header and vertically aligns all elements 2013-06-04 14:46:01 -04:00
Nate Hardison
c790d6263f Merge pull request #59 from edx/nate/comment-atop-generated-asset-files
Add comment to dynamically-generated asset files
2013-06-04 11:35:12 -07:00
Nate Hardison
7bccce4e9c Add comment to dynamically-generated asset files
To avoid confusion about where these files come from, add a header
comment upon preprocessing that warns people to not modify the
generated files directly, and points them to the appropriate
template file.
2013-06-04 11:14:02 -07:00
Peter Fogg
779f86c440 Merge pull request #46 from edx/peter-fogg/single-click-video-creation
Peter fogg/single click video creation
2013-06-04 11:08:40 -07:00
e0d
30d5b8943f Merge pull request #14 from edx/feature/e0d/additional-sandbox-reqs
adding sympy and networkx
2013-06-04 10:48:52 -07:00
e0d
39ee489460 adding sympy and networkx 2013-06-04 13:27:57 -04:00
Peter Fogg
70736c1da8 Remove tabs from unit.html for the third time. 2013-06-04 13:23:09 -04:00
Peter Fogg
e982d7fcdc Refactor test_contenstore to remove code duplication. 2013-06-04 13:22:08 -04:00
Christina Roberts
2cfea12dfe Merge pull request #51 from edx/bug/christina/about_page_url
Fix bug STUD-103. The url base for about page links needs to be www.edx....
2013-06-04 10:02:57 -07:00
Calen Pennington
6b68f2c0fe Use coffee watch command to watch whole directories, so that it will pick up new coffee files as they are created 2013-06-04 12:52:56 -04:00
Brian Talbot
1b4eece295 Merge pull request #55 from edx/fix/btalbot/studio-advancedicon
Studio - Advanced Component Icon
2013-06-04 08:54:58 -07:00
Brian Talbot
3bcbc9f979 studio - replaces iconography for advanced component button within the unit view 2013-06-04 11:26:16 -04:00
Brian Talbot
c8f1d49c6a Merge pull request #22 from edx/fix/btalbot/edx.org-accessibility
Fix/btalbot/edx.org accessibility
2013-06-04 08:05:03 -07:00
Brian Talbot
eca9eedecf edx.org - adds in I18n syntax for login and register view page titles 2013-06-04 10:59:32 -04:00
Brian Talbot
e4cc0dfdba edx.org - revises login and register graphical banner images to include higher contrast between type and imagery 2013-06-04 10:45:42 -04:00
Brian Talbot
aa8f73ffb4 edx.org - revises base blue and color references to adhere to WCAG color contrast guidelines 2013-06-04 09:37:21 -04:00
Brian Talbot
8da62871a9 edx.org - revises registration h1 text to match the graphical banner texdt 2013-06-04 09:37:21 -04:00
Nate Hardison
64a85e19e7 Specify UTF-8 encoding when loading Mako template
When loading a Mako template from a Django template, the file
encoding of the Mako template was left unspecified. In some cases,
this would cause the Mako template to be interpreted as an ASCII
template, resulting in blowups if the template was encoded in
UTF-8 (e.g., lms/templates/footer.html).

Now, both the input and output encodings are specified as UTF-8.
2013-06-03 17:19:33 -07:00
Peter Fogg
266938a7b3 Finish the comment I forgot about... 2013-06-03 16:55:28 -04:00
Peter Fogg
90bbff8965 Add test to be sure that advanced components require multiple clicks. 2013-06-03 16:53:14 -04:00
Peter Fogg
e06f0083e2 Adding myself to AUTHORS. 2013-06-03 16:39:16 -04:00
Peter Fogg
bf88e5ce6a Be more explicit about template location. 2013-06-03 15:48:07 -04:00
Peter Fogg
8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. 2013-06-03 15:36:55 -04:00
cahrens
38e3ff13ed pep8 cleanup. 2013-06-03 15:32:42 -04:00
cahrens
93be67d49a Fix bug STUD-103. The url base for about page links needs to be www.edx.org for Drupal site, vs. LMS_BASE which is used for Studio. Note that the complete URL is still not correct, but a redirect exists to take it to the new location. 2013-06-03 15:21:02 -04:00
Peter Fogg
d3ec1cb915 Add tests for single-click discussion creation. 2013-06-03 14:57:34 -04:00
Peter Fogg
eff78bfd86 Add doc for click_component_from_menu and make sure css is present in any case. 2013-06-03 14:39:02 -04:00
Joe Blaylock
6262274805 Expose site-wide anonymized ids to HTML module
Co-authored-by: Nate Hardison <natehardison@gmail.com>
2013-06-03 11:35:42 -07:00
Ned Batchelder
c865641f13 Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox
Ned/move loncapa etc into sandbox
2013-06-03 11:27:16 -07:00
Peter Fogg
ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. 2013-06-03 14:21:50 -04:00
James Tauber
c0859cb042 Merge pull request #35 from antoviaque/install-update-templates
Install steps - Fixes syntax of `update_templates` django command
2013-06-03 10:47:22 -07:00
Jonah Stanley
cdadcba9da Merge pull request #10 from edx/jonahstanley/add-more-tests
Jonahstanley/add more tests
2013-06-03 10:25:53 -07:00