chrisndodge
d965221ec7
Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips
...
debugged tooltip latency/vanishing issue
2012-12-14 06:26:48 -08:00
Brian Talbot
caf143514c
debugged tooltip latency/vanishing issue
2012-12-12 14:11:30 -05:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05: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
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
Calen Pennington
93cc17cf3b
Starting to generate jasmine tests for common/lib
2012-11-14 15:03:55 -05:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Carlos Andrés Rocha
e5b11a9c57
Add HD control to video player
2012-10-30 19:21:17 -04:00
Victor Shnayder
da56f190a2
putting vsepr static image files where vsepr js can find them. TODO: reogranize after proper input type static file storage is sorted out.
2012-10-26 21:41:22 -04:00
Calen Pennington
f19ec64659
Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment
2012-10-25 10:47:41 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
Tom Giannattasio
f84b603133
wrapped up section date setting; need help with already published sections
2012-10-22 16:43:44 -04:00
Chris Dodge
8ad26fc27e
replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not.
2012-10-18 21:11:46 -04:00
chrisndodge
6011d6d333
Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks
...
improvements on asset upload refresh. Now we don't need to refresh the w...
2012-10-17 10:47:47 -07:00
Chris Dodge
82e77a26c6
add mustache.js to common static repo
2012-10-17 13:47:07 -04:00
Victor Shnayder
f4d8df94dd
Make chem preview more robust
...
- give the preview div an id, use that to look it up instead of dancing around in the DOM
2012-10-14 11:35:32 -04:00
ichuang
bf959d8fc3
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx
2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad
add import filter capability to html & problem editing; provides latex2edx interface
2012-10-13 22:33:41 -04:00
Victor Shnayder
db8639e06a
Fix preview code
...
- I'm starting to vaguely understand js variable scope and closures. Long way to go though :)
2012-10-12 22:52:41 -04:00
Chris Dodge
a12baec599
add new files
2012-10-12 20:55:16 -04:00
Victor Shnayder
1c18ad9607
make loader only load scripts once per run, midway through fixing multiple chem equations per page
2012-10-12 19:18:58 -04:00
Victor Shnayder
19d3cb3870
Add a chemicalequationinput with live preview
...
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one. This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
chrisndodge
750e70e842
Merge pull request #878 from MITx/feature/cale/edge-landing-page
...
Feature/cale/edge landing page
2012-10-12 08:01:46 -07:00
Calen Pennington
4814f8c38e
Cleaning up logos for edge landing page
2012-10-12 10:31:46 -04:00
Tom Giannattasio
c3e2a544da
tweaks to datepicker and calendar
2012-10-11 14:53:45 -04:00
Chris Dodge
0cf6a1179a
wip - trigger display message when release data is different than parent release date
2012-10-08 10:43:46 -04:00
Chris Dodge
d55769861e
check if 'delete metadata field' is not in the list of system metadata
2012-10-05 14:45:07 -04:00
Chris Dodge
758c446929
wip on setting date/times on subsection page
2012-10-05 09:56:07 -04:00
Calen Pennington
8ca10a8356
Separate unit page from vertical implementation for editing
2012-10-01 15:19:35 -04:00
Calen Pennington
b305c0bae2
Make drag/drop save content immediately in seqs and verticals
2012-10-01 15:17:41 -04:00
Calen Pennington
fd7223bd87
Make editing work, building towards drag/drop saving
2012-10-01 15:17:41 -04:00
Calen Pennington
ce3638538c
Make inline editing save to mongo and then update the preview
2012-10-01 15:17:41 -04:00
Calen Pennington
05b9e6cab2
Standardize more of css between lms and cms
2012-10-01 15:17:40 -04:00
Calen Pennington
4381674ec5
Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms
2012-10-01 15:17:40 -04:00
Calen Pennington
d240b5b1eb
Consolidate bourbon and link to it from both cms and lms
2012-10-01 15:17:40 -04:00
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
