Commit Graph

19654 Commits

Author SHA1 Message Date
Julian Arni
79b1bffdc8 fix breakage from dir renaming 2013-07-16 13:30:39 -04:00
Ned Batchelder
f3d8738365 static_template_view.models is gone, remove it from docs. 2013-07-16 13:09:23 -04:00
Ned Batchelder
954ddf496d We don't need to run sphinx on our tests. 2013-07-16 13:08:06 -04:00
Julian Arni
bf60b24aa8 Switch to common structure and shared resources 2013-07-16 13:01:12 -04:00
David Ormsbee
a0749bd242 Merge pull request #412 from edx/dave/ie10_mathjax_fix
Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194
2013-07-16 09:50:18 -07:00
ihoover
66eb47fb0d Disabled csrf and made auto_login page toggleable with setting 2013-07-16 11:54:50 -04:00
Greg Price
894b62ba9b Merge pull request #406 from edx/gprice/register-button-enabling-tweak
Tweak behavior of submit buttons on register and login pages
2013-07-16 08:52:42 -07:00
David Ormsbee
35f66f8469 Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194 2013-07-16 09:20:35 -04:00
Don Mitchell
ef8618f7ad Make DraftModuleStore mongo only
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
2013-07-16 08:55:26 -04:00
Calen Pennington
3d1188b126 Make release email script wiki-friendly 2013-07-16 08:29:18 -04:00
Kevin Chugh
6e2de9dba2 tweak css and fix merge conflicts 2013-07-15 21:12:05 -04:00
Kevin Chugh
fbd0f1bec0 wire up static HTML to allow panel functionality 2013-07-15 20:09:01 -04:00
Calen Pennington
22302e3a46 Make jasmine tests quieter 2013-07-15 16:50:46 -04:00
Renzo Lucioni
92ae50d415 Remove unused code and include problem ID of data we send 2013-07-15 15:18:01 -04:00
Brian Talbot
978d33badd Merge pull request #319 from edx/talbs/studio-sassmixins
Studio Sass Mixin/Extend Re-Org
2013-07-15 11:52:35 -07:00
Brian Talbot
51037650fb Merge pull request #393 from edx/talbs/studio-nav-fix
Studio: Revises Course Updates Nav Visual Display Issue
2013-07-15 11:39:37 -07:00
Frances Botsford
27b7e35bd3 i18n the PDF prev/next button text 2013-07-15 13:54:04 -04:00
Renzo Lucioni
c770458e6a Reinstate problem_check event as Problem Checked event 2013-07-15 13:31:56 -04:00
Greg Price
7c5943a87c Tweak behavior of submit buttons on register and login pages
The buttons are not re-enabled if the registration/login submission succeeds
(and, therefore, the user is about to be directed to another page). Also, any
error message that is present does not disappear immediately before the page
redirects.
2013-07-15 13:13:52 -04:00
Calen Pennington
e9d400cbde Merge remote-tracking branch 'origin/release' into rc/2013-07-16 2013-07-15 13:03:47 -04:00
Lyla Fischer
2262ffe4e5 updated imageresponse example to a more universal example (baby animals) 2013-07-15 12:17:43 -04:00
Lyla Fischer
d83d49cac4 drag_and_drop template added 2013-07-15 11:26:03 -04:00
Peter Fogg
5c0fd18910 Validate date/time settings when typed in directly.
The changeTime event isn't fired when the user types in the field, but
only when clicking on the time in the dropdown. I'd consider this a
timepicker bug, but for now we can just listen to the user typing in
the field and update the value (and thus validate) like we do with
other field types.
2013-07-15 11:00:43 -04:00
Brian Talbot
388724c485 Studio: updates Sass mixins/extend references based on textbook/Sass cleanup 2013-07-15 10:12:51 -04:00
Brian Talbot
19a7e63e40 Studio: renames nav dropdown pattern and corrects references 2013-07-15 10:12:51 -04:00
Brian Talbot
34e9a21da8 Studio: renames and simplifies .cont-trucated Sass extend 2013-07-15 10:12:50 -04:00
Brian Talbot
91a6e34769 Studio: adds further comment/prefix revisions to Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
7ea55757bf Studio: references newly renamed app-wide Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
88d06a16e5 Studio: renames and re-orgs app-wide Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
a2ac5c87db Studio: revises nav display issue by re-scoping poor Updates Sass rules 2013-07-15 10:12:17 -04:00
Peter Fogg
f9f0d9ccf6 Merge pull request #402 from edx/peter-fogg/fix-section-release-tests
Fix section release acceptance test failure.
2013-07-15 07:08:30 -07:00
Peter Fogg
60d151497f Fix section release acceptance test failure. 2013-07-15 09:21:25 -04:00
David Baumgold
7f5aedb215 Merge pull request #380 from edx/db/studio-i18n
Studio internationalization
2013-07-13 05:45:50 -07:00
Jason Bau
c9943306ef put block around main_vendor js in main_django.html
should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
2013-07-12 23:22:50 -07:00
chrisndodge
dcc63be4b5 Merge pull request #388 from edx/fix/cdodge/dont-display-github-links-in-mongo-lms
[STUD-431] Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRAT...
2013-07-12 18:03:43 -07:00
Chris Dodge
db7434fa18 add comment as to why we are turning off this feature flag 2013-07-12 20:02:23 -04:00
ichuang
547f230002 Merge pull request #381 from edx/feature/ichuang/export_all_courses
Add management command to Studio for exporting all courses; useful for periodic backups of course content in Studio
2013-07-12 16:59:53 -07:00
ichuang
8b6a55e2a8 fix pep-8 in export_all_courses 2013-07-12 19:58:16 -04:00
chrisndodge
8f743424ba Merge pull request #387 from edx/fix/cdodge/unescape-quote-strings
[STUD-406] Fix/cdodge/unescape quote strings
2013-07-12 15:32:55 -07:00
Brian Talbot
e1c02b1b31 Studio: removing preventDefault from course creator request button 2013-07-12 16:50:00 -04:00
David Baumgold
04ddb63dad i18n the studio nav help button 2013-07-12 16:27:54 -04:00
Frances Botsford
260b5ccef4 i18n the view live button on the studio dashboard 2013-07-12 16:25:44 -04:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Chris Dodge
ac4e20b4f3 change serialize_field to check for type. If value is a string, simply return that, otherwise do a json.dumps 2013-07-12 15:27:36 -04:00
David Baumgold
5a5b3cfe8a Merge pull request #384 from antoviaque/vagrant-mount
vagrant: Always mount `node_modules` folder after Vagrant NFS mount
2013-07-12 12:17:51 -07:00
Vik Paruchuri
ffad965536 fix some combinedopenended ui and data routing 2013-07-12 15:06:11 -04:00
Brian Talbot
b28b4bfb75 Studio: abstracts and revises form/notice UI 2013-07-12 14:25:32 -04:00
Brian Talbot
c75041e168 Studio: adds in disabled/submitting state and logic for course creation button 2013-07-12 14:25:32 -04:00
Vik Paruchuri
0cadc8af36 Change status bar UI 2013-07-12 14:13:53 -04:00
Jonah Stanley
1bca87caf0 Merge pull request #383 from edx/jonahstanley/add-test-documentation
Added documentation to new acceptance test features and techniques
2013-07-12 11:08:06 -07:00