Commit Graph

15604 Commits

Author SHA1 Message Date
Chris Dodge
ecbf148688 add a new django-admin command to dump out a course structure document. This is response to an emergency request from Harvard researchers. 2013-07-16 16:53:01 -04:00
Renzo Lucioni
f2898f8cbf Merge pull request #407 from edx/renzo/problem-check-event
Reinstate problem_check event as Problem Checked event
2013-07-16 12:20:30 -07:00
James Tauber
d4f8ab3f09 Merge pull request #414 from edx/jtauber/switch-transifex-project
changed transifex project to edx-platform
2013-07-16 11:08:03 -07:00
James Tauber
3a095acced changed transifex project to edx-platform 2013-07-16 13:38:34 -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
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
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
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
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
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
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
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
Jason Bau
e7bb85dee1 Merge pull request #259 from edx/features/jbau/stanford-shib
Bugfix for stanford shib
2013-07-12 10:19:58 -07:00
mikigoyal
0a05cdc21b Merge pull request #389 from edx/lms/bug/lms-605
Fixed a spelling mistake. LMS-605
2013-07-12 10:05:10 -07:00
Chris Dodge
958ecdb053 raise a more appropriate Exception 2013-07-12 12:47:51 -04:00
Chris Dodge
547f4633d5 use better syntax for asserting that exception is thrown 2013-07-12 12:47:23 -04:00
Miki Goyal
ae45f5461c Fixed a spelling mistake. LMS-605 2013-07-12 12:19:15 -04:00
e0d
b8346f2bcf Merge branch 'release' 2013-07-12 12:11:23 -04:00
Jonah Stanley
72c9a24dd6 Merge pull request #274 from edx/jonahstanley/refactor-global-to-world
Jonahstanley/refactor global to world
2013-07-12 09:10:25 -07:00
Chris Dodge
1060cf5cec Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False 2013-07-12 11:51:57 -04:00
Calen Pennington
772dd30259 Merge pull request #249 from edx/feature/cale/release-email-list
Tidy up argument parsing in release email script
2013-07-12 08:47:42 -07:00
Chris Dodge
ab4012cc59 fix up some of the test courses which had hardcoded that quot; escaping 2013-07-12 11:33:46 -04:00
Chris Dodge
5aae3c6971 add new tests for the string literal serialization 2013-07-12 11:14:35 -04:00
Chris Dodge
50bea28d75 Add a 'string literal' serialization method and use it in the lambda function mapping table when the value to xml serialize is of basestring type. Also a couple of drive-by pep8 fixes. 2013-07-12 11:13:59 -04:00
mikigoyal
4eb82224f0 Merge pull request #382 from edx/bug/lms-600
Fix alt text for the login page: LMS-600
2013-07-12 07:45:50 -07:00
JonahStanley
940113efee Fixed long lines 2013-07-12 10:32:49 -04:00
JonahStanley
484e217de3 Fixed some errors 2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507 Scenario Dictionary now holds objects 2013-07-12 10:32:48 -04:00
JonahStanley
8110307ba9 CMS now refactored to use world dictionary 2013-07-12 10:32:48 -04:00