Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,147 Commits 1 Branch 0 Tags
8bd686d63cbd46775f35faddddcf0baaffcba310
Commit Graph

252 Commits

Author SHA1 Message Date
Peter Fogg
4a77693f4a Show notification on course outline reorder. 2013-08-01 09:41:27 -04:00
chrisndodge
8573ac3909 Merge pull request #510 from edx/feature/cdodge/allow-course-run-in-course-create 
Feature/cdodge/allow course run in course create
 2013-07-31 14:44:50 -07:00
Will Daly
b27857ca17 Merge pull request #534 from edx/will/fix-signup-test 
Fix broken Studio signup.feature acceptance test
 2013-07-31 08:32:01 -07:00
Jonah Stanley
8d11c246e1 Merge pull request #516 from edx/jonahstanley/upgrade-chrome-version 
Jonahstanley/upgrade chrome version
 2013-07-31 08:17:46 -07:00
Will Daly
a48c7cfc26 Replaced direct call to browser.is_text_present() with 
`world.css_find()` to protect against StaleElementException
in Jenkins.
 2013-07-31 08:38:46 -04:00
Chris Dodge
ae77795fc1 fix small - and harmless - typo in a test field setting 2013-07-30 17:20:10 -04:00
Chris Dodge
e23b693d90 put a 4th field in the create new course form where the user must specify a course_run. Also update unit tests to also provide this 4th parameter. Styling changes to better lay out the form fields are still TBD. 2013-07-30 17:20:09 -04:00
David Baumgold
7d7513b6fe Merge pull request #470 from edx/db/course-team-admin-grants 
Grant admin rights to members of the course team
 2013-07-30 13:36:56 -07:00
David Baumgold
0022469e07 Change "user" to "admin" in course team BDD descriptions 2013-07-30 15:14:20 -04:00
David Baumgold
eaac4f8bdc Add a lettuce test for course team admins removing admin status 2013-07-30 14:24:17 -04:00
David Baumgold
fba50589ff Add a lettuce test for course team admins granting admin status 2013-07-30 13:48:43 -04:00
JonahStanley
dd0f7bc310 Fixed indenting and cleaned up if clause 2013-07-30 12:46:42 -04:00
JonahStanley
ee46b3ef24 One click categories do not have animations 2013-07-29 15:58:23 -04:00
JonahStanley
419207ac3d Fixed issues with problem-editor.feature 2013-07-29 14:49:50 -04:00
Diana Huang
d1b503d53a Only redirect when redirect url is an internal page. 2013-07-29 14:18:04 -04:00
JonahStanley
20ce33dcdb Fixed broken tests from chrome versioning 2013-07-29 13:38:27 -04:00
David Baumgold
0bd25c05e2 Fix up lettuce tests for course team page redesign 2013-07-29 13:12:06 -04:00
David Baumgold
97a02d415f Make assertion failure message more understandable 2013-07-29 13:12:04 -04:00
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship 
Studio: Authorship Rights Request UI + Dashboard Clean-up
 2013-07-26 03:59:07 -07:00
Sarina Canelake
50d35b30b1 Fix failing acceptance test 2013-07-25 14:56:22 -04:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
Adam Palay
2efcb0cdca Change default names for various LMS components 
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
 2013-07-25 10:38:47 -04:00
Peter Fogg
6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories 
Peter fogg/notification stories
 2013-07-23 09:05:10 -07:00
Peter Fogg
d87dba9e04 Correctly persist checklist settings. 
Incidentally, fixes an acceptance test (which would have caught this
bug) not running. Its step regex was "They are correctly selected
after I reload the page$", which happens to be matched by "I reload
the page$", another step definition. Lettuce seems to arbitrarily pick
between definitions if they both match a step, so it's good to ensure
that each step isn't a sub-regexes of another.
 2013-07-22 15:10:59 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship 
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
 2013-07-22 12:15:42 -04:00
Peter Fogg
fb0fcc310b Factor out common code between module editing and course overview. 2013-07-22 11:37:09 -04:00
Peter Fogg
75edc65748 Use Backbone notifications for setting graded status. 2013-07-22 11:37:09 -04:00
Peter Fogg
5029f460ec Use Backbone notifications for component delete. 2013-07-22 11:37:08 -04:00
Peter Fogg
9fe4cb734c Use Backbone notifications for course section delete. 2013-07-22 11:37:08 -04:00
Will Daly
76a63a6ef0 Disabled test failing due to bug in Studio 2013-07-19 17:13:51 -04:00
Will Daly
17daa2a023 Fixed two other tests 2013-07-19 16:49:16 -04:00
Will Daly
27d51b3453 Attempt to fix video test 2013-07-19 16:49:15 -04:00
Calen Pennington
8b5979641b Change default rerandomize and showanswer 
The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
 2013-07-16 14:33:58 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions. 
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
 2013-07-16 14:24:41 -04:00
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
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
35094a968b Beginnings of refactoring the acceptance tests 2013-07-12 10:32:45 -04:00
JonahStanley
d1661fa6aa Refactored recently merged in tests 2013-07-12 09:28:51 -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
c53aac4596 CMS acceptance tests now should not get stale element exception errors 2013-07-12 09:28:50 -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
871ab87bf2 Fix saving notification CSS. 2013-07-12 09:01:03 -04:00
Peter Fogg
5b4524d75e Merge pull request #301 from edx/peter-fogg/explicit-course-settings 
Peter fogg/explicit course settings
 2013-07-11 14:09:07 -07:00