David Baumgold
741bbb3f92
pylint cleanup
2013-08-01 14:16:55 -04:00
David Baumgold
64ad5567f3
Create urls/views/templates for dev-only views
...
Our designers find it helpful to be able to stub out simple views that aren't ready
to be seen for production yet, and check them into version control so that other
people can see them and provide feedback. This commit introduces a few new files
and directories for this purpose, as well as a sample view that will only be seen
in dev mode, and never in production.
2013-07-31 17:20:26 -04:00
Don Mitchell
b80aad2308
Merge pull request #528 from edx/dhm/rename_revision
...
Rename CourseLocator.revision to branch
2013-07-31 13:18:17 -07:00
David Baumgold
248793c127
Fix some pylint issues
2013-07-31 15:42:11 -04:00
frances botsford
2ac27550a5
Merge pull request #537 from edx/fix/frances/studio-ie-menu-bug
...
fix for ie bug where drop down menus were still clickable when collapsed
2013-07-31 10:19:56 -07:00
Frances Botsford
9ab21be98c
fix for ie bug where drop down menus were still clickable when collapsed
2013-07-31 12:17:21 -04: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
Peter Fogg
25955a79c4
Merge pull request #492 from edx/peter-fogg/fix-stud-146
...
Fix word cloud modules not exporting correctly.
2013-07-31 08:19:32 -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
jkarni
bba0611584
Merge pull request #532 from edx/jkarni/fix/superfluous-fn
...
Remove get_preview_module.
2013-07-31 07:21:29 -07:00
Vasyl Nakvasiuk
1233d73e01
Merge pull request #497 from edx/alex/graphical_slider_tool_for_studio
...
"Graphical Slider Tool" integration into studio
2013-07-31 06:36:49 -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
Julian Arni
9725cff71e
Remove get_preview_module.
...
And replace calls with calls to load_preview_module.
2013-07-30 17:31:48 -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
Don Mitchell
119652a62a
Rename CourseLocator.revision to branch
...
and all related vars and methods.
2013-07-30 14:37:33 -04:00
David Baumgold
eaac4f8bdc
Add a lettuce test for course team admins removing admin status
2013-07-30 14:24:17 -04:00
Brian Talbot
573445aa8c
Studio: adds badge UI firefox fix
2013-07-30 14:01:17 -04:00
Brian Talbot
7a41855fdb
Studio: adds logic to show add new user to team view
2013-07-30 14:00:58 -04:00
Peter Fogg
512269f842
Add descriptor for modules with empty XML data.
...
This allows a more general approach to modules such as word_cloud and
video which have no XML data (it's all store in metadata), but use
XmlDescriptor for backwards compatibility. They now generate an empty
tag on export, and clear out empty tags on import.
Also a small change to the video module as a result -- if it's asked
to parse empty XML data, it won't try to parse anything.
2013-07-30 13:53:38 -04:00
David Baumgold
fba50589ff
Add a lettuce test for course team admins granting admin status
2013-07-30 13:48:43 -04:00
Brian Talbot
c82ad6cdaa
Studio: revises badge and create call to action design
2013-07-30 13:19:39 -04:00
Brian Talbot
2161961f64
Studio: corrects legend element copy on new user form
2013-07-30 13:18:56 -04:00
Don Mitchell
6a7fa41e03
Merge pull request #526 from edx/dhm/yacibug
...
Yet another Course Info bug
2013-07-30 09:54:16 -07:00
JonahStanley
dd0f7bc310
Fixed indenting and cleaned up if clause
2013-07-30 12:46:42 -04:00
Don Mitchell
1fb4354a12
Wrap malformed course_update rather than silently failing update
2013-07-30 12:08:57 -04:00
Don Mitchell
27d32f1932
Test reproducing the error: malformed course_update silently failing update
2013-07-30 12:01:15 -04:00
David Baumgold
71bb527022
Merge pull request #515 from edx/db/template-improvements
...
Studio: Improvements for loading JS templates on Advanced Settings and Course Updates pages
2013-07-30 08:24:54 -07:00
David Baumgold
4f5c2cce75
Re-added missing render() call
2013-07-30 11:22:13 -04:00
Peter Fogg
0967cb0d9d
Fix word cloud modules not exporting correctly.
2013-07-30 10:29:12 -04:00
Diana Huang
0d10a872c8
Merge pull request #499 from edx/diana/login-redirect
...
Only redirect when redirect url is an internal page.
2013-07-30 05:29:39 -07:00
Mark L. Chang
8b6c2787f6
copy changes
2013-07-30 00:14:44 -04:00
Brian Talbot
611dab077f
Studio: places 'add team member' call to course team view
2013-07-29 17:29:15 -04:00
Christina Roberts
f2a9d6fb8e
Merge pull request #519 from edx/christina/course_creators
...
Change in signature for add_user_with_status_unrequested.
2013-07-29 14:14:35 -07:00
cahrens
f347bd446b
Change in signature for add_user_with_status_unrequested.
2013-07-29 16:48:59 -04:00
Brian Talbot
6980e9f175
Studio: bulletproofs actions on course team view
2013-07-29 16:36:45 -04:00
JonahStanley
ee46b3ef24
One click categories do not have animations
2013-07-29 15:58:23 -04:00
Peter Fogg
0c9732024a
Add (currently failing) test case around saving metadata.
2013-07-29 15:39:18 -04:00
JonahStanley
419207ac3d
Fixed issues with problem-editor.feature
2013-07-29 14:49:50 -04:00
David Baumgold
372992244c
Removed course_info_handouts AJAX load
2013-07-29 14:30:16 -04:00
David Baumgold
5b9e283552
Load course info update template on page instead of via AJAX
2013-07-29 14:29:04 -04:00
David Baumgold
eac14615cd
Load advanced_entry template on page, rather than via AJAX
2013-07-29 14:28:40 -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
64566c14e6
Fix unit tests
2013-07-29 13:12:07 -04:00
David Baumgold
0bd25c05e2
Fix up lettuce tests for course team page redesign
2013-07-29 13:12:06 -04:00
David Baumgold
36a10876c0
Fix variable scoping issue in Mako template
2013-07-29 13:12:06 -04:00
Brian Talbot
deced24b32
Studio: refactored form-based Sass and revised markup/copy for course team admin mgmt
2013-07-29 13:12:06 -04:00
David Baumgold
e5ef5ef1a0
Show disabled trash icon instead of not showing it at all
2013-07-29 13:12:06 -04:00
David Baumgold
41832744d7
Correct course team admin badging logic
2013-07-29 13:12:06 -04:00
