Julian Arni
78ca8fb7be
Add rtd-specific syspath
2013-08-02 08:08:51 -04:00
Julian Arni
0908ce408a
Fix 'images' capitalization
2013-08-01 14:29:53 -04:00
Julian Arni
9f4b7261a8
Merge branch 'master' into jkarni/docs-merge
2013-08-01 11:41:44 -04:00
Peter Fogg
e501a176b1
Merge pull request #540 from edx/peter-fogg/overview-reorder-notification
...
Show notification on course outline reorder.
2013-08-01 07:17:59 -07:00
e0d
97013d610a
Merge pull request #541 from edx/e0d/escalated-priv-migrations
...
adding migrate env for cms
2013-08-01 07:15:08 -07:00
Adam
933935a887
Merge pull request #433 from edx/tsinghuax/lms-i18n
...
Tsinghuax/lms i18n
2013-08-01 07:00:00 -07:00
Peter Fogg
4a77693f4a
Show notification on course outline reorder.
2013-08-01 09:41:27 -04:00
e0d
60aaa8a876
Merge pull request #544 from edx/e0d/fix-loadtest-feature-flag
...
these values are set implicitly at :147, setting them here clobbers them
2013-08-01 06:01:43 -07:00
e0d
ef75f9bb2c
adding migrate env for cms
...
cleanup
2013-08-01 08:43:20 -04:00
Adam Palay
69ffb6a87b
replace edx with variable substitution
...
fixes template errors
keep tos untranslated
formatting fixes
2013-07-31 19:39:15 -04:00
Calen Pennington
e8ee29786f
Remove news carousel and other unused pages
...
Remove unused course_filter page
removes university_profile urls and templates
removes all university_profile views
remove news from templates/index
2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a
LMS i18n from Tsinghua
2013-07-31 19:39:15 -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
Calen Pennington
8f97608200
Merge pull request #527 from edx/cale/restrict-us-to-less-than-distribute-0.7,-which-breaks-setuptools
...
Restrict us to less than distribute 0.7, which breaks setuptools
2013-07-31 14:00:31 -07:00
e0d
8abd7bb6fe
these values are set implicitly at :147, setting them here clobbers them
2013-07-31 16:40:54 -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
59c367b883
Merge pull request #542 from edx/db/fix-pylint
...
Fix some pylint issues
2013-07-31 13:12:54 -07:00
David Baumgold
248793c127
Fix some pylint issues
2013-07-31 15:42:11 -04:00
David Ormsbee
e68ddcd057
Merge branch 'release'
2013-07-31 15:33:30 -04:00
Frances Botsford
b6777118c6
removing animate class from course creation for now
2013-07-31 15:25:38 -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
Brian Talbot
b85f92de8d
Studio: wraps new course creation form in authorship rights logic
2013-07-31 11:29:00 -04:00
Don Mitchell
68e1bcf42e
Remove edu from doc string examples & typos
2013-07-31 11:24:51 -04: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
Don Mitchell
f2977704fe
Remove unused tests
...
which a previous refactoring had replaced. Coverage of locator.py is
100%
2013-07-31 09:35:21 -04: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
Brian Talbot
50b930a772
Studio: syncs up visual and semantic standards b/t create course and user forms
2013-07-30 18:42:03 -04:00
Brian Talbot
16187462b3
Studio: syncs up visual and semantic standards b/t create course and user forms
2013-07-30 18:21:07 -04: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
5451bb642c
Code cleanup.
...
From PR review.
2013-07-30 17:43:43 -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
Chris Dodge
beda411e28
improve error message regarding uniqueness
2013-07-30 17:29:02 -04:00
Brian Talbot
ec9ea28e92
Studio: abstracting out shared creation form action properties
2013-07-30 17:29:02 -04:00
Chris Dodge
d005323ace
update error message to be more specific to what the user needs to fix
2013-07-30 17:25:47 -04:00
Chris Dodge
d321406cc3
fix indent
2013-07-30 17:25:47 -04:00
Chris Dodge
f50d304166
missed a local variable
2013-07-30 17:25:47 -04:00
Frances Botsford
2ce2f08664
fix for extra long error on course creation
2013-07-30 17:25:47 -04:00
Chris Dodge
279896e484
put new unique functions inside the primary function
2013-07-30 17:25:47 -04:00
