Calen Pennington
|
44805ca383
|
Make discussion js work for cms as well as lms so that inline discussion xmodules load
|
2012-10-01 15:16:54 -04:00 |
|
Arjun Singh
|
46d830df13
|
Merge branch 'master' into feature/arjun/new-discussions
|
2012-09-14 15:15:21 -07:00 |
|
Tom Giannattasio
|
7098b2e658
|
cleaned up loading animation in post-list
|
2012-09-12 10:07:16 -04:00 |
|
ichuang
|
b4a3591310
|
add jquery flot axislabels plugin
|
2012-09-08 23:21:13 -04:00 |
|
David Ormsbee
|
4e7ba6e651
|
Merge pull request #513 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
|
2012-08-22 20:18:36 -07:00 |
|
Bridger Maxwell
|
82ebc14bd6
|
Fixed inline circuit editing to only work if 'circuit-schematic' is at the beginning of a line.
|
2012-08-22 21:15:52 -04:00 |
|
Rocky Duan
|
951fb06341
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/envs/dev.py
|
2012-08-22 14:04:34 -07:00 |
|
Tom Giannattasio
|
4e6d7babcc
|
fixed wiki bugs; started sequence nav bugs
|
2012-08-21 12:51:33 -04:00 |
|
Rocky Duan
|
a905ac9e1d
|
updated backbone & single thread retrieval now working
|
2012-08-20 22:03:46 -07:00 |
|
Bridger Maxwell
|
55f3a971cf
|
Wiki circuit editors zoom to fit contents.
|
2012-08-18 00:10:42 -04:00 |
|
Bridger Maxwell
|
1470045b74
|
Fixed wiki circuit editor modal to be a little better styled.
|
2012-08-17 21:44:56 -04:00 |
|
Bridger Maxwell
|
a4b97c5f10
|
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
|
2012-08-17 21:44:05 -04:00 |
|
Bridger Maxwell
|
2a84d147f0
|
Fixed a sizing bug in circuit editor.
|
2012-08-17 20:22:28 -04:00 |
|
Bridger Maxwell
|
d3962ecd92
|
Updated CodeMirror modes for better syntax highlighting.
|
2012-08-17 20:16:08 -04:00 |
|
Kyle Fiedler
|
8473188fea
|
Added new styles for sequence nav and reset some of the styles for inputs
|
2012-08-17 17:41:45 -04:00 |
|
Bridger Maxwell
|
6b716c2883
|
Put in CodeMirror editor with inline circuits.
|
2012-08-17 14:32:29 -04:00 |
|
Tom Giannattasio
|
13c2bb588e
|
added styles for main article, sidebar and breadcrumb
|
2012-08-15 15:59:46 -04:00 |
|
Tom Giannattasio
|
abf26dced9
|
started styles
|
2012-08-15 13:10:47 -04:00 |
|
Calen Pennington
|
801df37872
|
Merge remote-tracking branch 'origin/master' into arjun/javascript_response
Conflicts:
common/lib/xmodule/xmodule/js/src/capa/display.coffee
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/module_render.py
|
2012-08-13 10:13:21 -04:00 |
|
Tom Giannattasio
|
185ab1f615
|
added spinner class and image
|
2012-08-10 14:22:34 -04:00 |
|
Kyle Fiedler
|
643617599a
|
Made sequnce nav black and white
|
2012-08-08 16:27:47 -04:00 |
|
Arjun Singh
|
26f31324c4
|
Moving a few static files out of lms into common
|
2012-08-07 13:39:59 -04:00 |
|
Kyle Fiedler
|
2bbb19790d
|
Fixed jquery ui image problem and added a base style sheet for lms to override fonts
|
2012-07-31 11:06:39 -04:00 |
|
Calen Pennington
|
c9e637d719
|
Make cms and lms tests run independently (they had been colliding on collectstatic)
|
2012-07-30 12:58:45 -04:00 |
|
Calen Pennington
|
29cf09763f
|
Fixing up cms tests to only use data in common/test/data
|
2012-07-25 10:09:25 -04:00 |
|
Calen Pennington
|
bdf964a305
|
Modularize video css
|
2012-07-24 16:14:05 -04:00 |
|
Calen Pennington
|
6029c28695
|
Modularize sequence css
|
2012-07-24 16:14:04 -04:00 |
|
Calen Pennington
|
408726e678
|
Standardize how JS XModules are instantiated
|
2012-07-24 16:14:04 -04:00 |
|
Calen Pennington
|
8481937f59
|
Move Logger and *withPrefix javascript into a common location
|
2012-07-24 16:14:03 -04:00 |
|
Calen Pennington
|
87ce82570d
|
Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware
|
2012-07-24 16:14:03 -04:00 |
|