Commit Graph

16546 Commits

Author SHA1 Message Date
Brian Talbot
b4457371a8 Studio: revises and syncs up activation message UI with dashboard UI 2013-07-11 14:53:22 -04:00
JonahStanley
5d300bf36f Fixed the broken unit tests from deleting full 2013-07-11 14:34:41 -04:00
Chris Dodge
fbe2cde6e5 add simple unit test on the defaulting of the settings 2013-07-11 14:31:53 -04:00
cahrens
702fb54700 Merge branch 'talbs/studio-authorship' of github.com:edx/edx-platform into talbs/studio-authorship 2013-07-11 13:54:11 -04:00
cahrens
9b2c384666 Add post callback to request course creator status. 2013-07-11 13:53:56 -04:00
Peter Fogg
7c9648babd Hide saving notification only when AJAX request completes. 2013-07-11 13:27:15 -04:00
Peter Fogg
9c8f63726f Rename CMS.Views.Notification.Saving to Mini, in line with its more diverse modern usage. 2013-07-11 13:13:08 -04:00
Brian Talbot
dd2f34a929 Studio: cleans up new course form and course listings display 2013-07-11 12:48:43 -04:00
Brian Talbot
59850cb4a3 Studio: cleans up new course form and course listings display 2013-07-11 12:44:26 -04:00
cahrens
52b5da3e61 Merge branch 'talbs/studio-authorship' of github.com:edx/edx-platform into talbs/studio-authorship
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/templates/index.html
2013-07-11 12:41:22 -04:00
cahrens
3715d6c429 Only send a single variable to index.html about authorship rights. 2013-07-11 12:39:51 -04:00
cahrens
51c9523f97 Only send a single variable to index.html about authorship rights. 2013-07-11 12:36:30 -04:00
David Ormsbee
be3d11449b Merge pull request #320 from edx/dave/ie8_csrf_fix
Remove use of keyword "delete" in forum coffee code to fix IE8 bug LMS-441
2013-07-11 09:31:46 -07:00
Jonah Stanley
38cabe91ee Merge pull request #369 from edx/jonahstanley/unskip-acceptance-tests
Unskip Acceptance Tests
2013-07-11 09:14:53 -07:00
Chris Dodge
c3ad168b10 also add some defaulting to the querying of the settings where it defaults to an empty set 2013-07-11 12:12:42 -04:00
JonahStanley
4e015eacf5 Fixed the whitelist test to not use full course 2013-07-11 12:05:18 -04:00
Chris Dodge
b39edd821c seems like we need to define COURSES_WITH_UNSAFE_CODE in cms.envs.common.py, although cms.envs.common.py imports lms.envs.common (where this is defined). 2013-07-11 12:05:07 -04:00
JonahStanley
24ab36c87a Unskip Acceptance Tests 2013-07-11 11:33:40 -04:00
Frances Botsford
08fe23ac5f adjusted the LMS PDF textbook zoom elements positioning 2013-07-11 11:26:59 -04:00
Peter Fogg
f3837009af Remove ellipsis from internationalized notifications. 2013-07-11 11:26:17 -04:00
Frances Botsford
b1653f0561 layout cleanup on LMS PDF Textbook viewer 2013-07-11 11:19:39 -04:00
Brian Talbot
aaa67b28a9 Studio: revises template logic, html, and styling for Dashboard UI states 2013-07-11 11:11:25 -04:00
John Jarvis
67f8d48840 Merge pull request #367 from edx/jarv/gce-email-backend
adding option for file based backend
2013-07-11 08:02:47 -07:00
JonahStanley
d2632227de Fixed all but one test 2013-07-11 10:55:00 -04:00
Vik Paruchuri
d710d8e43a Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 2013-07-11 10:52:50 -04:00
Lyla Fischer
e3fa27a3d8 moved docs into one repo. Broke compilation 2013-07-11 10:38:20 -04:00
David Baumgold
11fa458692 Merge pull request #368 from edx/db/fix-course-team-add-user
Fix course team JS to handle non-200 status codes
2013-07-11 07:17:34 -07:00
JonahStanley
676da2d592 Removed set trace 2013-07-11 10:12:10 -04:00
JonahStanley
7b9a725201 Fixed comment relating to full course 2013-07-11 10:12:09 -04:00
JonahStanley
67326cfae8 Fixed xmodule tests to not rely on full
Also fixed things in the toy course where needed
2013-07-11 10:12:09 -04:00
JonahStanley
7fb5f505d6 Refactored out full from the lms tests 2013-07-11 10:12:06 -04:00
JonahStanley
982777f547 All cms unit test no longer rely on the full course.
Factories were used when possible but tests depending on importing or things not manageable by factories used the toy course.  New files were added to include the needed functionality.  Most files are blank or have minimal xml needed to work
2013-07-11 10:09:05 -04:00
JonahStanley
55e6d1ad67 Asset tests do not rely on the full course
A blank asset file was also added to toy
2013-07-11 10:08:47 -04:00
JonahStanley
62f2764728 First half of refactorization.
This fixes the following tests(T stands for toy, F stands for factory made):
T import_textbook_as_content_element (needed to add a textbook to toy)
F static_tab_reordering
T import polls (needed to add a poll to toy)
T xlint_fails
F delete
T about_overrides (needed to add an about override to toy)
F remove_hide_progress_tab
2013-07-11 10:08:40 -04:00
JonahStanley
bbf2398bac Fixed test_course_settings to not rely on full course 2013-07-11 10:07:57 -04:00
JonahStanley
456daa9ce5 Deleted Files and annotated tests 2013-07-11 10:07:02 -04:00
David Baumgold
1f7fcaed50 Separate Mako logic and JS logic 2013-07-11 09:39:32 -04:00
David Baumgold
cffa013314 Fix course team JS to handle non-200 status codes 2013-07-11 09:30:50 -04:00
Peter Fogg
d9716a7249 Update acceptance tests for course settings. 2013-07-11 09:11:59 -04:00
Peter Fogg
ec13349ae3 Remove outdated deleteKeys from advanced settings. 2013-07-11 09:11:59 -04:00
Peter Fogg
3d4f9268da Make sure that changing grading cutoffs triggers a save confirmation, and reliable reverting of changes. 2013-07-11 09:11:59 -04:00
Peter Fogg
eba1bd0972 Refactor and update acceptance tests around saving settings. 2013-07-11 09:11:59 -04:00
Peter Fogg
9094f1890b Change course settings to require explicit save.
Rather than asynchronously saving when a setting is updated, we now
prompt the user to confirm their changes and only persist the data if
they hit the save button. Lettuce tests are updated to expect this
behavior and some new ones are added.
2013-07-11 09:11:07 -04:00
Peter Fogg
164a469e9d Factor showNotificationBar out into ValidatingView.
When all settings require an explicit save, this functionality will be
shared between each view (with slight changes, e.g. click handlers.)
2013-07-11 09:11:07 -04:00
David Ormsbee
aaf3a47538 Remove use of keyword "delete" in forum coffee code to fix IE8 bug LMS-441.
Change client-side code references from "delete" to "_delete". Some of these
were method names (or would generate method names), which breaks in IE8
because "delete" is a JavaScript reserved keyword. foo["delete"] is ok, but
foo.delete is not. This also makes forums marginally functional in IE8,
though the left-nav still has some display issues.
2013-07-10 17:54:13 -04:00
Jason Bau
4b59a85dae Merge pull request #336 from edx/fix/jbau/parameterize-s3-upload-bucket-name
Parameterize aws s3 bucket name for forum uploads
2013-07-10 14:51:08 -07:00
cahrens
135d10d4c5 Fix unicode return value. 2013-07-10 17:26:55 -04:00
Jonah Stanley
786f422ffa Merge pull request #298 from edx/jonahstanley/acceptance-tests-unique-database
Jonahstanley/acceptance tests unique database
2013-07-10 14:09:28 -07:00
David Baumgold
17f2b7d988 Merge pull request #361 from edx/antoviaque/vagrant-rbenv
Add support for Vagrant install, and switch from RVM to rbenv
2013-07-10 13:33:05 -07:00
Peter Fogg
975e28e9dc Remove undefined variable. 2013-07-10 16:31:43 -04:00