cahrens
|
7f1c89b492
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 10:28:52 -04:00 |
|
Brian Talbot
|
ceb4c719f7
|
changing default timeFormat within datepair.js for instances where the plugin is called by default HTML classes
|
2013-04-04 17:38:14 -04:00 |
|
Brian Talbot
|
d87c4e3866
|
resolving local merge with master
|
2013-04-03 15:01:55 -04:00 |
|
John Hess
|
17fa312b26
|
Merge pull request #1695 from MITx/jmclaus/genex-save-state
Genex now saves its state
|
2013-04-02 07:58:17 -07:00 |
|
Victor Shnayder
|
b0356e32b2
|
Merge pull request #1589 from MITx/peter/symbolic
Added support for superscripts in variables
|
2013-03-27 10:40:50 -07:00 |
|
Victor Shnayder
|
235cce1323
|
Merge pull request #1713 from MITx/jmclaus/edit-molecule-css-fix
CSS from JSME doesn't affect surrounding content now
|
2013-03-25 07:51:02 -07:00 |
|
Don Mitchell
|
2dcfd1eba1
|
Merge pull request #1719 from MITx/feature/btalbot/studio-checklists
Add course checklists to Studio
|
2013-03-22 12:49:30 -07:00 |
|
Brian Talbot
|
7051a94e7b
|
resolved local master merge conflicts with studio sass
|
2013-03-21 16:15:19 -04:00 |
|
cahrens
|
8ca6e324af
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/sass/base-style.scss
cms/urls.py
|
2013-03-21 12:23:13 -04:00 |
|
Brian Talbot
|
caae29a8ac
|
studio - fixing a default mixin value used when defining font-size for elements
|
2013-03-21 12:21:02 -04:00 |
|
jmclaus
|
d763a6fc3a
|
CSS from JSME doesn't affect surrounding content now
|
2013-03-21 12:19:40 +01:00 |
|
cahrens
|
fd9c29f449
|
Merge branch 'master' into feature/btalbot/studio-checklists
|
2013-03-20 16:37:56 -04:00 |
|
Brian Talbot
|
99cf432390
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-20 10:45:01 -04:00 |
|
Brian Talbot
|
9069d822a4
|
Merge branch 'master' into fix/btalbot/studio-sasscleanup
|
2013-03-20 10:38:07 -04:00 |
|
jmclaus
|
8e7990598c
|
Merge branch 'master' into jmclaus/genex-save-state
|
2013-03-20 09:23:16 +01:00 |
|
e0d
|
39d451d92a
|
Merge pull request #1687 from MITx/hotfix/edz/pinning
Allow backwards compatibility for forums pinning UI.
|
2013-03-19 09:31:14 -07:00 |
|
jmclaus
|
57b43d7a6c
|
Genex now saves its state
|
2013-03-19 16:36:55 +01:00 |
|
cahrens
|
49ee903eda
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
|
2013-03-18 15:30:19 -04:00 |
|
Brian Talbot
|
cdcdfd49e0
|
studio - alerts: resolving local master merge conflcits
|
2013-03-18 10:58:16 -04:00 |
|
Brian Talbot
|
84a5475d5a
|
studio - sass cleanup: resolving conflicts with local master merge
|
2013-03-15 12:42:33 -04:00 |
|
Your Name
|
a761e2e829
|
make pinning backward compatible
|
2013-03-15 12:38:28 -04:00 |
|
Calen Pennington
|
fb8352e2cc
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
|
2013-03-15 10:33:54 -04:00 |
|
Calen Pennington
|
8531d56268
|
Merge pull request #1665 from MITx/jmpm-analytics
Enables basic analytics tab in instructor dashboard
|
2013-03-15 07:06:02 -07:00 |
|
Calen Pennington
|
029d8c8085
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
|
2013-03-15 09:46:47 -04:00 |
|
Brian Talbot
|
1aa8786b53
|
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
|
2013-03-14 19:07:03 -04:00 |
|
Valera Rozuvan
|
c54ad38fef
|
Better positioning of elements draggables with labels in slider.
|
2013-03-14 19:42:55 +02:00 |
|
Peter Baratta
|
bac9f1f571
|
Merge branch 'master' into peter/symbolic
|
2013-03-14 06:31:17 -06:00 |
|
Kevin Chugh
|
8d766c4b51
|
fix conflict
|
2013-03-13 21:01:37 -04:00 |
|
Your Name
|
7f877344d6
|
added comment to explain sorting
|
2013-03-13 19:47:19 -04:00 |
|
Your Name
|
896ee094c6
|
added comment to explain sorting
|
2013-03-13 19:44:41 -04:00 |
|
Your Name
|
117be695cb
|
candidate without inline
|
2013-03-13 18:40:10 -04:00 |
|
Your Name
|
08bc073fa5
|
updates
|
2013-03-13 16:40:04 -04:00 |
|
Your Name
|
a2f9e4d565
|
almost there
|
2013-03-13 15:29:57 -04:00 |
|
Your Name
|
7450128064
|
update coffeescript
|
2013-03-13 12:52:07 -04:00 |
|
jmclaus
|
db282d891c
|
Problem 5 grades correctly. Also added missing images
|
2013-03-13 16:27:56 +01:00 |
|
Your Name
|
8280c55992
|
pinning .1
|
2013-03-12 17:40:26 -04:00 |
|
David Ormsbee
|
5f125e6807
|
Merge branch 'master' into jmpm-analytics
|
2013-03-10 01:09:03 -05:00 |
|
Brian Talbot
|
786ffd1092
|
studio - further small cleanup on Sass
|
2013-03-08 12:44:24 -05:00 |
|
Brian Talbot
|
3b2c970248
|
studio - reorganized and documented used Sass for studio
|
2013-03-08 11:47:11 -05:00 |
|
Peter Baratta
|
49f85211fa
|
More documentation for the javascript
|
2013-03-08 03:39:34 -07:00 |
|
Victor Shnayder
|
84f05f9f61
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
|
2013-03-08 00:40:18 -05:00 |
|
Brian Talbot
|
afa704c253
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-07 11:38:07 -05:00 |
|
Victor Shnayder
|
57700a56d4
|
remove links to missing image files. We can add them if needed later.
|
2013-03-06 19:11:36 -05:00 |
|
jkarni
|
3bb108b12e
|
Merge pull request #1608 from MITx/feature/jkarni/genex
Feature/jkarni/genex
|
2013-03-06 14:35:01 -08:00 |
|
David Ormsbee
|
d0bff1ed3c
|
Merge branch 'master' into jmpm-analytics
Conflicts:
lms/djangoapps/instructor/views.py
lms/envs/common.py
lms/templates/courseware/instructor_dashboard.html
|
2013-03-06 17:09:09 -05:00 |
|
Victor Shnayder
|
12b6b7d403
|
Merge pull request #1609 from MITx/diana/refactor-chemical-equation
Refactor Chemical Equation Preview
|
2013-03-06 12:09:03 -08:00 |
|
Victor Shnayder
|
fb350ed1e3
|
Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
Feature/abarrett/annotatable xmodule DO NOT MERGE
|
2013-03-06 12:05:27 -08:00 |
|
Diana Huang
|
42e711e7d2
|
Update tests and documentation.
|
2013-03-06 14:53:13 -05:00 |
|
Diana Huang
|
1aa3580dcb
|
Switch over to using the inputtype ajax handler for chemical input.
|
2013-03-06 14:41:48 -05:00 |
|
Julian Arni
|
d05e82e35c
|
Merge branch 'master' into feature/jkarni/genex
|
2013-03-06 13:25:30 -05:00 |
|