cahrens
923ba365b1
Merge branch 'master' into talbs/studio-authorship
2013-07-12 13:35:52 -04:00
cahrens
08a1055cba
Updates to index page text.
2013-07-12 13:35:27 -04:00
Jason Bau
e7bb85dee1
Merge pull request #259 from edx/features/jbau/stanford-shib
...
Bugfix for stanford shib
2013-07-12 10:19:58 -07:00
mikigoyal
0a05cdc21b
Merge pull request #389 from edx/lms/bug/lms-605
...
Fixed a spelling mistake. LMS-605
2013-07-12 10:05:10 -07:00
Chris Dodge
958ecdb053
raise a more appropriate Exception
2013-07-12 12:47:51 -04:00
Chris Dodge
547f4633d5
use better syntax for asserting that exception is thrown
2013-07-12 12:47:23 -04:00
Miki Goyal
ae45f5461c
Fixed a spelling mistake. LMS-605
2013-07-12 12:19:15 -04:00
e0d
b8346f2bcf
Merge branch 'release'
2013-07-12 12:11:23 -04:00
Jonah Stanley
72c9a24dd6
Merge pull request #274 from edx/jonahstanley/refactor-global-to-world
...
Jonahstanley/refactor global to world
2013-07-12 09:10:25 -07:00
Chris Dodge
1060cf5cec
Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False
2013-07-12 11:51:57 -04:00
Calen Pennington
772dd30259
Merge pull request #249 from edx/feature/cale/release-email-list
...
Tidy up argument parsing in release email script
2013-07-12 08:47:42 -07:00
Chris Dodge
ab4012cc59
fix up some of the test courses which had hardcoded that quot; escaping
2013-07-12 11:33:46 -04:00
cahrens
d417a78c74
Tests for course creator status as returned in index page.
2013-07-12 11:25:12 -04:00
Chris Dodge
5aae3c6971
add new tests for the string literal serialization
2013-07-12 11:14:35 -04:00
Chris Dodge
50bea28d75
Add a 'string literal' serialization method and use it in the lambda function mapping table when the value to xml serialize is of basestring type. Also a couple of drive-by pep8 fixes.
2013-07-12 11:13:59 -04:00
mikigoyal
4eb82224f0
Merge pull request #382 from edx/bug/lms-600
...
Fix alt text for the login page: LMS-600
2013-07-12 07:45:50 -07:00
ichuang
a3e4f21a9c
use unicode instead of str for casting track.views args in idashboard
2013-07-12 10:43:06 -04:00
ichuang
e62cb45da4
tracking in idashboard should only log json-serializable objects
2013-07-12 10:42:48 -04:00
JonahStanley
940113efee
Fixed long lines
2013-07-12 10:32:49 -04:00
JonahStanley
484e217de3
Fixed some errors
2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507
Scenario Dictionary now holds objects
2013-07-12 10:32:48 -04:00
JonahStanley
8110307ba9
CMS now refactored to use world dictionary
2013-07-12 10:32:48 -04:00
JonahStanley
131f1a49c4
All lms acceptance tests refactored to use world dictionaries
2013-07-12 10:32:47 -04:00
JonahStanley
35094a968b
Beginnings of refactoring the acceptance tests
2013-07-12 10:32:45 -04:00
Jonah Stanley
70ce6a11e0
Merge pull request #333 from edx/jonahstanley/fix-flakey-video-test
...
Jonahstanley/fix flakey video test
2013-07-12 07:28:53 -07:00
Miki Goyal
4c8eb6b0d5
Adding myself to authors file
2013-07-12 10:24:48 -04:00
Xavier Antoviaque
bdca0f1d0e
vagrant: Always mount node_modules folder after Vagrant NFS mount
2013-07-12 11:15:00 -03:00
JonahStanley
f27ca66f51
Added documentation to new acceptance test features and techniques
2013-07-12 10:11:39 -04:00
ichuang
c53dd97f79
add extra modulestore() argument to single export script
2013-07-12 10:07:02 -04:00
ichuang
08b8438dda
add extra modulestore() argument to export to make it export drafts also
2013-07-12 10:06:48 -04:00
Miki Goyal
5fd84465e2
Fix alt text for the login page: LMS-600
2013-07-12 10:05:13 -04:00
ichuang
84c38b4e9a
fix two typos in export scripts
2013-07-12 09:43:52 -04:00
ichuang
84f531af54
add export_all_courses management script to cms
2013-07-12 09:41:39 -04:00
cahrens
4ecceb292e
Add tests for changing table status without staff permissions.
2013-07-12 09:30:36 -04:00
JonahStanley
d1661fa6aa
Refactored recently merged in tests
2013-07-12 09:28:51 -04:00
JonahStanley
c37a9e3e23
Refactored problem_setup to use retry_on_exception
2013-07-12 09:28:51 -04:00
JonahStanley
b4036c66cf
Refactored the ui tests to use retry_on_exception
2013-07-12 09:28:50 -04:00
JonahStanley
ebc9fa9e2a
Made a retry_on_exception world function that will retry the given function
2013-07-12 09:28:50 -04:00
JonahStanley
1ae86673f3
Changed a world.browser.find_by_css to world.css_find
2013-07-12 09:28:50 -04:00
JonahStanley
1f648d901e
Revert "Reworded css_text to use css_find"
...
This reverts commit a7de337fe2d218d6cb9c2f175c6ea71f5ddcb6da.
2013-07-12 09:28:50 -04:00
JonahStanley
287b750a22
Reworded css_text to use css_find
2013-07-12 09:28:50 -04:00
JonahStanley
2c0c8dfb90
Fixed structure of css_text and css_value
2013-07-12 09:28:50 -04:00
JonahStanley
c53aac4596
CMS acceptance tests now should not get stale element exception errors
2013-07-12 09:28:50 -04:00
JonahStanley
f1dd81a67a
Refactored LMS so all potential stale element exceptions are avoided
2013-07-12 09:28:49 -04:00
JonahStanley
8b0e7c5782
Made a new command css_has_class that will safely check the class and get around stale elements
2013-07-12 09:28:49 -04:00
JonahStanley
d86502bdc1
Added in a retry for checking the class of the video
2013-07-12 09:28:49 -04:00
Peter Fogg
b7eb287aa9
Merge pull request #379 from edx/peter-fogg/fix-notification-saving
...
Fix saving notification CSS.
2013-07-12 06:26:41 -07:00
Peter Fogg
871ab87bf2
Fix saving notification CSS.
2013-07-12 09:01:03 -04:00
James Tauber
d6edbd5e18
Merge pull request #377 from edx/jtauber/fix-virtualenv-directory
...
Use $WORKON_HOME consistently for virtualenv.
2013-07-11 21:13:49 -07:00
James Tauber
047da7a7ce
Use $WORKON_HOME consistently for virtualenv.
...
Some parts of the `create-dev-env/sh` script use `$WORKON_HOME` and
others hardcode `$HOME/.virtualenvs` which means if you **don't** put
your virtualenvs under `$HOME/.virtualenvs`, the script doesn't work at
all.
This commit removes the hardcoding of virtualenv location and
consistently uses `$WORKON_HOME` everywhere.
2013-07-11 18:18:22 -04:00
