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

16095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
e68ddcd057 Merge branch 'release' 2013-07-31 15:33:30 -04:00
Calen Pennington
094bf7e55d Merge pull request #536 from edx/cale/make-render_template-mocking-clearer 
Make render_template mocking clearer
 2013-07-31 11:37:55 -07: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
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04: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
Calen Pennington
e43dbd29c4 Merge pull request #487 from edx/cale/lms-xblock-student-view 
Cale/lms xblock student view
 2013-07-31 09:04:38 -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
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
Ned Batchelder
15859dd880 Merge pull request #522 from edx/ned/quiet-mongoimport-noise-during-tests 
Quiet mongoimport noise during tests
 2013-07-31 07:25:57 -07:00
Ned Batchelder
4cb8f58b27 Quiet mongoimport noise during tests 2013-07-31 10:25:09 -04: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
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands 
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
 2013-07-31 09:22:10 -04: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
Vasyl Nakvasiuk
61327bc599 fix python code styles 2013-07-31 10:43:06 +03:00
Jim Abramson
c7ff657b4d Merge pull request #531 from edx/hotfix/jsa/user_api_basic_auth 
make user api work with basic auth
 2013-07-30 14:52:27 -07: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
jsa
fc5d4aa745 make user_api compatible with HTTP basic auth 2013-07-30 17:13:48 -04:00
e0d
45d7444edf Merge pull request #530 from edx/e0d/fix_feature_flag 
E0d/fix feature flag
 2013-07-30 13:45:56 -07: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
e0d
b9d762a0b8 changing the default in common.py 2013-07-30 16:20:35 -04:00
e0d
f1962a7bd7 removing an unneeded line that does damage 2013-07-30 16:20:18 -04: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
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
Your Name
21f1e58ce7 fix for underscore template issue for xmodules 2013-07-30 12:12:17 -04:00
Carlos Andrés Rocha
5b30c06b75 Merge pull request #480 from edx/rocha/show-dates-in-instructor-analytics 
Show dates when the data was collected in the instructor dashboard panel
 2013-07-30 09:11:58 -07: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
Calen Pennington
487c9a4f10 Merge pull request #524 from edx/cale/external_discussion_tab 
Cale/external discussion tab
 2013-07-30 08:59:09 -07:00
Kevin Chugh
4de1ab2de8 Merge pull request #523 from edx/feature/kevin/notifications_panel_xmodule_workaround 
fix for underscore template issue for xmodules
 2013-07-30 08:46:40 -07:00
Calen Pennington
5e4cf50086 Make sure that all tab types used by the default for the course.tabs field work correctly 2013-07-30 11:32:31 -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
Carlos Andrés Rocha
b8d1a138ae Show dates when the data was collected in the instructor dashboard panel 2013-07-30 11:16:27 -04:00
Your Name
56c8057ed0 fix for underscore template issue for xmodules 2013-07-30 10:34:36 -04:00
Peter Fogg
f355e4a8f4 More general solution to word cloud export problems. 2013-07-30 10:29:12 -04:00
Peter Fogg
0967cb0d9d Fix word cloud modules not exporting correctly. 2013-07-30 10:29:12 -04:00
David Ormsbee
b65200c2a8 Merge branch 'master' into rc/2013-07-30 2013-07-30 08:34:21 -04:00
Jim Abramson
77a796e2c7 Merge pull request #520 from edx/feature/kevin/email_notifications_panel 
Feature/kevin/email notifications panel
 2013-07-30 05:30:56 -07: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
Jim Abramson
98fe2d495a Merge pull request #517 from edx/bug/jsa/edx_api_key 
add EDX_API_KEY to aws.py
 2013-07-30 04:05:39 -07:00