Commit Graph

2738 Commits

Author SHA1 Message Date
Christina Roberts
729ca900e6 Merge pull request #1920 from edx/feature/christina/fields
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
2013-05-07 09:38:34 -07:00
Jay Zoldak
c2cd75469b Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually. 2013-05-06 17:05:47 -04:00
Jay Zoldak
522751e425 Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests 2013-05-06 14:28:05 -04:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07:00
Greg Price
00729a8c13 Add an omnipresent help tab to the LMS
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
cahrens
e44c6b6bf8 Don't reach in to default value. 2013-05-03 17:05:02 -04:00
cahrens
32d67be5f5 Get rid of _computed_default. 2013-05-03 16:42:41 -04:00
cahrens
5c3719b915 Get HTML LaTeX "working" again. 2013-05-03 15:31:18 -04:00
cahrens
9dd074f25b Cleanup. 2013-05-03 15:09:02 -04:00
cahrens
37d594ce37 Get rid of non-editable scope. 2013-05-03 14:58:33 -04:00
cahrens
46100fd258 Cleanup. 2013-05-02 12:32:32 -04:00
cahrens
01ede40b03 Switching branches 2013-05-02 09:43:03 -04:00
cahrens
13fe9c11cb Merged with master. 2013-05-01 09:33:35 -04:00
cahrens
1c8cef32ef Remove unused import. 2013-05-01 09:30:20 -04:00
cahrens
94e41319ee Unit test, remove display_name for now so there is no visible change. 2013-05-01 09:09:33 -04:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
Fix/btalbot/studio courseinfo
2013-04-30 13:34:52 -07:00
Chris Dodge
c5d520574d also move the MIT dome image in Latex to be in our source pack 2013-04-30 12:02:58 -04:00
Brian Talbot
886205dec3 revised placeholder course overview HTML value 2013-04-29 17:23:14 -04:00
Chris Dodge
33aada6d22 fix broken test. Since we're pre-populating the course overview when creating a course, the clone_course fails because it asserts that the destination course that it clones into is empty. Need to check that the course is basically empty (e.g. a course module and a overview module) 2013-04-29 16:43:32 -04:00
cahrens
8705ff8805 Remove system_metadata_fields. 2013-04-29 16:41:07 -04:00
Chris Dodge
680e932b8b use default staff images that is in /common/static/... 2013-04-29 15:42:58 -04:00
Christina Roberts
72dfd4995e Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete
Fix/cdodge/dangling verticals on delete
2013-04-29 11:58:22 -07:00
Chris Dodge
d7693d96b7 unit test should just use direct store. Also remove unused import and logging. 2013-04-29 09:18:49 -04:00
Calen Pennington
8c4526ed07 Fix coffeescript error in video spec file 2013-04-29 07:32:16 -04:00
Calen Pennington
4a397972fa Sort the css and js assets by numerical index 2013-04-29 07:31:48 -04:00
Chris Dodge
7d206e020d remove comment which is no longer valid as well as debug log messages 2013-04-26 16:13:26 -04:00
Chris Dodge
bbea8eb9f3 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-verticals-on-delete 2013-04-26 15:25:47 -04:00
Chris Dodge
55266f6e96 add a overview.yaml template and also clone that template into a newly created course 2013-04-26 13:39:22 -04:00
Chris Dodge
2e64bc33ff make sure delete_item always uses the draft store 2013-04-26 12:37:37 -04:00
Calen Pennington
8c54d5d610 Fix accidental force push that reset master
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.
2013-04-26 10:50:53 -04:00
Chris Dodge
f6417b4f71 add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip 2013-04-25 15:24:31 -04:00
cahrens
c7962cf07b Don't explicitly declare display_name. 2013-04-24 16:41:58 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server
Speed up local development
2013-04-24 12:12:05 -07:00
cahrens
45f86b662a Delete unused file. 2013-04-24 14:59:32 -04:00
cahrens
cc2d06975e Remove duplicated StringyX definitions. 2013-04-24 14:59:32 -04:00
cahrens
9e9886339a Refer to inherited field. 2013-04-24 14:59:31 -04:00
cahrens
e874de1249 Some cleanup TODOs. 2013-04-24 14:59:31 -04:00
Chris Dodge
506a9a20aa when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad 2013-04-22 10:13:33 -04:00
Calen Pennington
f7cad77b93 Ignore errors when deleting the old xmodule compiled assets directory 2013-04-18 15:45:32 -04:00
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Calen Pennington
346aee8863 Make django-pipeline only work with raw js and css 2013-04-18 07:18:36 -04:00
Calen Pennington
9c7ba41880 Only add the xmodule.coffee file once per class, and put it before all other coffeescript files 2013-04-18 07:18:36 -04:00
Will Daly
52c2f3ae37 Tested additional values of rerandomize (true/false/per_student)
Pylint fixes
2013-04-17 15:32:39 -04:00
Calen Pennington
6c7c49e6bd Fix pep8 violations 2013-04-17 11:07:58 -04:00
Calen Pennington
3cd414afbb Merge pull request #1825 from MITx/fix/cale/gradebook
Fix/cale/gradebook
2013-04-17 07:37:02 -07:00
Don Mitchell
24189378d6 Merge pull request #1864 from MITx/bug/christina/export
Don't try to export orphaned draft items.
2013-04-16 14:24:49 -07:00
cahrens
8c336ef998 Don't try to export orphaned draft items.
#278
2013-04-16 17:05:11 -04:00
Vik Paruchuri
5125d8b0de Reformat code 2013-04-16 13:48:58 -04:00
Vik Paruchuri
d82ac2b747 Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe 2013-04-16 13:45:46 -04:00
Vik Paruchuri
a71658cf77 Better test for get score 2013-04-16 12:12:12 -04:00