Chris Dodge
4391783248
add exporting of 'about' content as well as adding unit test checks
2013-06-05 12:40:09 -04:00
dcadams
0fb1136559
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
2013-06-05 09:25:49 -07:00
chrisndodge
468dfe3437
Merge pull request #71 from edx/feature/cdodge/allow-setting-of-session-cookie-name
...
Feature/cdodge/allow setting of session cookie name
2013-06-05 08:36:17 -07:00
Chris Dodge
6fb97d52c0
fix typos
2013-06-05 11:21:35 -04:00
Diana Huang
ff7b851f95
Merge pull request #4 from edx/diana/fix-error-descriptor
...
Ensure that the original error gets preserved by the ErrorModule
2013-06-05 07:39:40 -07:00
Chris Dodge
4bade8d286
allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox)
2013-06-05 10:30:28 -04:00
Chris Dodge
3c9bd1ddf8
allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox)
2013-06-05 10:26:30 -04:00
Slater-Victoroff
1ac6e12304
Pyes working, considering switch to raw requests, phonetic and fuzzy search both working
2013-06-05 10:22:18 -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
dcadams
a8ec1ca9d5
Modified code such that non-logged in student activates correctly.
2013-06-04 17:08:34 -07:00
Will Daly
e1d3fb7301
Added warning message when no coverage information found.
...
Added comments to tests.rake
2013-06-04 19:21:24 -04:00
Will Daly
99c185f06b
Added diff coverage printout to rake coverage command
2013-06-04 18:39:49 -04:00
Will Daly
a5fc721922
Merge branch 'master' into will/diff-cover-integration
2013-06-04 18:19:07 -04:00
Will Daly
5662ecfde9
Updated to current tag of diff-cover
2013-06-04 18:13:42 -04:00
Will Daly
9c506020d9
Fixed bug in tests.rake in which rm would be called with no args.
2013-06-04 17:51:12 -04:00
dcadams
1ea6545556
Worked on reducing pep8 violations.
2013-06-04 14:17:13 -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
marco
f213113361
cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
2013-06-04 15:15:12 -04: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
dcadams
56f81fb104
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
2013-06-04 10:29:04 -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
JonahStanley
c62cc23bc2
Refactored Navigation Methods
2013-06-04 13:06:18 -04:00
JonahStanley
ab5f71ea44
Merge branch 'master' into jonahstanley/add-navigation-tests
2013-06-04 13:05:36 -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
JonahStanley
862bb3f8bc
Added the beginnings of the navigation tests
...
I still need to refactor the methods but at this point, all tests work
2013-06-04 11:34:52 -04:00
Brian Talbot
3bcbc9f979
studio - replaces iconography for advanced component button within the unit view
2013-06-04 11:26:16 -04:00
marco
714a3f1e40
added in vendor font references to lms for font-awesome
2013-06-04 11:21:07 -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
marco
0936e614a5
addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown.
2013-06-04 11:04:06 -04: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
Diana Huang
d895c64f4a
Use full descriptor when showing errors, not just the model data.
2013-06-04 10:43:06 -04:00
