Chris Dodge
|
2aceb2e44a
|
make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter
|
2012-11-29 15:56:03 -05:00 |
|
Chris Dodge
|
46870f4391
|
be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling
|
2012-11-29 15:09:28 -05:00 |
|
Chris Dodge
|
050cb89cf7
|
fix crash with working with custom tags with XML filestore
|
2012-11-29 13:24:41 -05:00 |
|
Chris Dodge
|
021ed3bca6
|
fix crash with working with custom tags with XML filestore
|
2012-11-29 13:24:07 -05:00 |
|
chrisndodge
|
89ad8cc564
|
Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup
Static tabs cleanup
|
2012-11-29 06:49:28 -08:00 |
|
Tom Giannattasio
|
6cfabb76c1
|
finished styling for static tabs; required some rework of global styles
|
2012-11-28 15:39:43 -05:00 |
|
Tom Giannattasio
|
6ad8a9aced
|
most of the styling and function changes made
|
2012-11-28 15:10:46 -05:00 |
|
chrisndodge
|
9723bea5c0
|
Merge pull request #1079 from MITx/feature/cdodge/tabs-show-only-name-on-preview
made a special 'module preview' view for Static Tabs in the CMS. Per Tom...
|
2012-11-26 11:23:24 -08:00 |
|
Chris Dodge
|
b3dcc140b7
|
made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button
|
2012-11-26 14:22:13 -05:00 |
|
Chris Dodge
|
62fa734c68
|
added factory_boy to requirements.txt
|
2012-11-26 13:36:35 -05:00 |
|
Calen Pennington
|
8e68573243
|
Merge pull request #1041 from MITx/fix/cdodge/video-captions
wire through course asset path information to the video playback module ...
|
2012-11-26 08:29:05 -08:00 |
|
Chris Dodge
|
6d45445aef
|
assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility
|
2012-11-26 11:19:51 -05:00 |
|
Chris Dodge
|
2d7f1b73d7
|
consolidate logic to compute caption path to server-side, we don't need to do this client-side
|
2012-11-26 11:19:51 -05:00 |
|
Chris Dodge
|
71f16d40e1
|
wire through course asset path information to the video playback module and corresponding .coffee files
|
2012-11-26 11:19:51 -05:00 |
|
Calen Pennington
|
4e3da342d7
|
Merge pull request #1048 from MITx/feature/cdodge/xlint
Feature/cdodge/xlint
|
2012-11-26 08:11:34 -08:00 |
|
Chris Dodge
|
fff3782884
|
cleave xlint entry point in xml_importer.py to be separate from the import method
|
2012-11-26 11:05:57 -05:00 |
|
Tom Giannattasio
|
f2fec99efa
|
fixed header float bug
|
2012-11-26 10:46:02 -05:00 |
|
Calen Pennington
|
ee618d4223
|
Merge pull request #1069 from MITx/feature/cas/tom/lms-styles
added basic lms styles
|
2012-11-26 06:57:57 -08:00 |
|
Tom Giannattasio
|
86ebba3f0e
|
removed askbot
|
2012-11-26 09:55:37 -05:00 |
|
Calen Pennington
|
c6a9f722cc
|
Merge pull request #1049 from MITx/feature/jzoldak/cms-unit-testing
Add Studio integration with factory boy for creating XModule objects in the data store
|
2012-11-26 06:54:50 -08:00 |
|
Calen Pennington
|
2b6e2b5143
|
Merge pull request #1056 from MITx/bugfix/ichuang/xml_importer
xml_importer bugfix - when importing without policy override use course_location
|
2012-11-26 06:54:22 -08:00 |
|
chrisndodge
|
b250cad6ee
|
Merge pull request #1075 from MITx/fix/cdodge/env-bad-checkin
fix edit conflict
|
2012-11-26 06:44:59 -08:00 |
|
Chris Dodge
|
2524cd614a
|
fix edit conflict
|
2012-11-26 09:36:59 -05:00 |
|
Tom Giannattasio
|
a98cead8ee
|
added basic lms styles
|
2012-11-20 13:02:08 -05:00 |
|
Calen Pennington
|
4e876b056e
|
Merge pull request #1062 from MITx/fix/cdodge/xmodule-script-load-bug
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript()...
|
2012-11-19 12:52:36 -08:00 |
|
Chris Dodge
|
ec6b1a12e9
|
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency.
|
2012-11-19 15:46:57 -05:00 |
|
ichuang
|
f84f08fae4
|
xml_importer bugfix - when importing without policy override use course_location
|
2012-11-17 21:38:15 -05:00 |
|
Calen Pennington
|
650f537763
|
Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests
Make jasmine testing quieter
|
2012-11-16 13:35:45 -08:00 |
|
Calen Pennington
|
3b2b8ad4fa
|
Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests
Capa Problem jasmine tests running independently
|
2012-11-16 13:35:19 -08:00 |
|
Calen Pennington
|
719277876f
|
Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks
remove 'mode' property when creating a new CodeMirror control. This appe...
|
2012-11-16 12:52:33 -08:00 |
|
Jay Zoldak
|
8d0abcb974
|
Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests
|
2012-11-16 15:10:19 -05:00 |
|
Jay Zoldak
|
ea4c0ed86a
|
Refactor fixtures for capa problems.
|
2012-11-16 14:59:46 -05:00 |
|
Jay Zoldak
|
a10a3209aa
|
Fix all but 4 broken tests.
|
2012-11-16 14:47:09 -05:00 |
|
Jay Zoldak
|
6ae0add931
|
Fix the new problem create statements in the describe blocks for the capa display spec.
|
2012-11-16 13:26:16 -05:00 |
|
Jay Zoldak
|
718ce4db28
|
Get Problem constructor working again, and copy the helper file from lms.
|
2012-11-16 13:02:38 -05:00 |
|
Calen Pennington
|
0fff578e7d
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
.gitmodules
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/course.scss
lms/urls.py
|
2012-11-16 09:03:15 -05:00 |
|
Chris Dodge
|
975d75c116
|
When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course
|
2012-11-15 21:45:20 -05:00 |
|
Chris Dodge
|
2a35132b2a
|
When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course
|
2012-11-15 21:44:20 -05:00 |
|
Chris Dodge
|
9ae8558382
|
put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror
|
2012-11-15 20:35:45 -05:00 |
|
David Ormsbee
|
7c7ca3ff6b
|
Merge pull request #1052 from MITx/feature/victor/actual-askbot-removal
Removing Askbot
|
2012-11-15 13:56:58 -08:00 |
|
Jay Zoldak
|
bf6a147c85
|
Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc.
|
2012-11-15 15:43:39 -05:00 |
|
Chris Dodge
|
0be0889d9c
|
in order to support CodeMirror mode of 'text/html' we also have to include 'htmlmixed.js' as well as 'css.js' from the CodeMirror distro
|
2012-11-15 15:21:40 -05:00 |
|
David Ormsbee
|
eff3a7c3c7
|
Batch together alter statements to minimize how long we lock the auth_users table
|
2012-11-15 14:55:21 -05:00 |
|
David Ormsbee
|
156dc1fb6c
|
Merge branch 'master' into feature/victor/actual-askbot-removal
Conflicts:
lms/envs/aws.py
|
2012-11-15 14:24:55 -05:00 |
|
Chris Dodge
|
39c33b42b2
|
remove 'mode' property when creating a new CodeMirror control. This appears to completely crash if the user puts in a <style ...> tag in the input. This was causing imported static tabs to not be editable
|
2012-11-15 13:56:42 -05:00 |
|
David Ormsbee
|
dbe7346aae
|
Merge pull request #1050 from MITx/bridger/feature/progress_percent_fix
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
|
2012-11-15 10:29:24 -08:00 |
|
Bridger Maxwell
|
ba57e8a7a5
|
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
|
2012-11-15 13:24:19 -05:00 |
|
Chris Dodge
|
d21095367a
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
|
2012-11-15 13:16:02 -05:00 |
|
Jay Zoldak
|
0654665b20
|
Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy'
|
2012-11-15 11:40:29 -05:00 |
|
Jay Zoldak
|
edb9f8ce40
|
Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing
|
2012-11-14 15:16:17 -05:00 |
|