update from vetrolamu#2

Merged

vetrolamu merged 449 commits intopelikanchik:masterfrom vetrolamu:master

Aug 1, 2013

+23,863-2,163

This pull request is big! We're only showing the most recent 250 commits

Commits on Jul 22, 2013

Commits on Jul 23, 2013

Merge pull request #41 from edx/alex/word_cloud_course_factory
auraz
committed
Merge pull request openedx#462 from edx/cale/use-xblock-children-api
cpennington
committed
Add diff-quality rake task (rake quality)
Sarina Canelake
committed
Merge pull request openedx#461 from edx/db/change-asset-to-pdf
singingwolfboy
committed
Add error handler.
cahrens
committed
Studio: revises styling/message copy for authorship rights request error
talbs
committed
Merge pull request openedx#436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names
chrisndodge
committed
Merge pull request openedx#469 from edx/peter-fogg/fix-stud-486
Peter Fogg
committed
Merge pull request openedx#415 from edx/peter-fogg/notification-stories
Peter Fogg
committed
add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio
Chris Dodge
committed
add comment and fix mistake in test
Chris Dodge
committed
Studio: revises HTML and styling around new unit ID on unit view

talbs
authored and
Chris Dodge
committed
add a reference in the toy course to the test jump_to_id HTML module
Chris Dodge
committed
added explicit unit test to verify the link rewriting
Chris Dodge
committed
add input/output information in doc strings
Chris Dodge
committed
address review feedback
Chris Dodge
committed
fix fat finger string formatting
Chris Dodge
committed
add line break between arguments
Chris Dodge
committed
add some chinese characters to the test content
Chris Dodge
committed
Merge pull request openedx#463 from edx/fix/jkarni/linkoutline
jkarni
committed
Merge pull request openedx#452 from edx/feature/cdodge/add-jump-to-substituions
chrisndodge
committed
It seems like self.tabs is getting set to an empty set [] now rather than None. This causes the tab defaulting to not populate, leading to crashes in the LMS if someone makes a new course with addi…
Chris Dodge
committed
reordered email settings checkbox to impact styling for icon and cleaned up header navigation for discusisons
marcotuts
committed
add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition.
Chris Dodge
committed
Fix up auto auth tests.
Jay Zoldak
committed
working under cms too
ihoover
committed
resolve conflicts
ihoover
committed
Prevent XSS attack via submission_history page.
dianakhuang
committed
Studio: revises spacing fix for welcome to edX studio title

talbs
authored and
dianakhuang
committed
added csrf tests
ihoover
committed
Merge pull request openedx#481 from edx/fix/cdodge/regression-on-tabs-initialization
chrisndodge
committed
Merge pull request openedx#482 from edx/hotfix-2013-07-23
dianakhuang
committed
Merge branch 'release'
dianakhuang
committed
Merge pull request openedx#467 from edx/fix/adam/file-upload
adampalay
committed

Commits on Jul 24, 2013

Commits on Jul 25, 2013

Change git clone protocal to https

Trinh Nguyen
authored and
Trinh Nguyen
committed
Merge pull request openedx#460 from edx/sarina/update-diffcover
sarina
committed
Merge branch 'master' into feature/kevin/email_notifications_panel
kevinchugh
committed
Adjustment to show sequence tool tips in LMS

caesar2164
authored and
Sarina Canelake
committed
hook up panel to new stats service
kevinchugh
committed
Make the service-variant flag on manage.py longform only
cpennington
committed
Change default names for various LMS components

adampalay
authored and
Sarina Canelake
committed
Merge pull request openedx#494 from edx/renzo/blank-problem-score
rlucioni
committed
Merge pull request openedx#471 from edx/giulio/fix-tooltips
sarina
committed
Merge pull request openedx#417 from edx/ihoover/feature_flag_auto_auth
ihoover
committed
Use format for strings instead of %.
cahrens
committed
i18n "Create a New Course".
cahrens
committed
Merge pull request openedx#498 from edx/cale/make-the-service-variant-flag-on-manage.py-longform-only
cpennington
committed
Misc improvements to make lettuce testing a bit saner
singingwolfboy
committed
Add an XBlock studio_view to XModuleDescriptors
cpennington
committed
Allow user API access in dev environments
Greg Price
committed
Allow user id filtering in user preference API
Greg Price
committed
Merge pull request openedx#491 from edx/lettuce-improvements
singingwolfboy
committed
Fix failing acceptance test
Sarina Canelake
committed
fixes back nav button
adampalay
committed
Merge pull request openedx#502 from edx/sarina/fix-discussion-acceptance
sarina
committed
Studio: using defined red color variables for error-based system messages
talbs
committed

Commits on Jul 26, 2013

Merge pull request openedx#341 from edx/talbs/studio-authorship
Christina Roberts
committed
gst integration into studio
vasylnakvasiuk
committed

Commits on Jul 29, 2013

Commits on Jul 30, 2013

Commits on Jul 31, 2013

fix python code styles
vasylnakvasiuk
committed
Replaced direct call to browser.is_text_present() with
Will Daly
committed
Switch LMS over to using XBlock rendering commands
cpennington
committed
Merge pull request openedx#497 from edx/alex/graphical_slider_tool_for_studio
vasylnakvasiuk
committed
Merge pull request openedx#532 from edx/jkarni/fix/superfluous-fn
jkarni
committed
Quiet mongoimport noise during tests
nedbat
committed
Merge pull request openedx#522 from edx/ned/quiet-mongoimport-noise-during-tests
nedbat
committed
Merge pull request openedx#516 from edx/jonahstanley/upgrade-chrome-version

Jonah Stanley
authored and
Jonah Stanley
committed
Merge pull request openedx#492 from edx/peter-fogg/fix-stud-146
Peter Fogg
committed
Merge pull request #31 from vetrolamu/laboratory
vetrolamu
committed
Merge pull request openedx#534 from edx/will/fix-signup-test
Will Daly
committed
Merge pull request openedx#487 from edx/cale/lms-xblock-student-view
cpennington
committed
fix for ie bug where drop down menus were still clickable when collapsed
Frances Botsford
committed
Merge pull request openedx#537 from edx/fix/frances/studio-ie-menu-bug
frrrances
committed
1st commit
root
committed
1st commit
root
committed