Your Name
|
385026172e
|
remove double Comment from merge conflict
|
2013-04-22 15:28:27 -04:00 |
|
Kevin Chugh
|
bb12cdf6f4
|
remove whitespace
|
2013-04-21 19:57:19 -04:00 |
|
Kevin Chugh
|
bee25f3ba0
|
fix git mangle take 3
|
2013-04-21 19:51:04 -04:00 |
|
Kevin Chugh
|
9d57f0a9d2
|
fix git mangle take 2
|
2013-04-21 19:47:27 -04:00 |
|
Kevin Chugh
|
e8c646142f
|
Merge branch 'master' into feature/kevin/flagging
|
2013-04-21 06:15:55 -04:00 |
|
Kevin Chugh
|
649578ea2f
|
unify flag moderator permissions
|
2013-04-21 06:15:23 -04:00 |
|
Calen Pennington
|
2ff4564686
|
Ignore compiled xmodule assets
|
2013-04-18 15:46:08 -04:00 |
|
jmclaus
|
edfa456483
|
Grading works when sequence is loaded from saved state
|
2013-04-15 14:05:39 +02:00 |
|
Kevin Chugh
|
93978da87c
|
fixes cleanup
|
2013-04-09 14:57:43 -04:00 |
|
Kevin Chugh
|
8358e5162a
|
Merge branch 'master' into feature/kevin/flagging
|
2013-04-09 09:23:05 -04:00 |
|
cahrens
|
7f1c89b492
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 10:28:52 -04:00 |
|
Kevin Chugh
|
24095679a6
|
add back comment response flagging
|
2013-04-05 19:04:18 -04:00 |
|
Kevin Chugh
|
de7c511328
|
flagging working again
|
2013-04-05 16:39:22 -04:00 |
|
Kevin Chugh
|
0e8ef28347
|
flagging almost done
|
2013-04-05 13:23:09 -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 |
|
Kevin Chugh
|
daa0cd22d5
|
filter implemented for flagged
|
2013-04-01 23:16:22 -04:00 |
|
Kevin Chugh
|
5534d8bdce
|
fix mega merge conflicts
|
2013-03-29 07:33:52 -04: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 |
|
Arthur Barrett
|
d636f4fab0
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-03-25 19:04:58 -04: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 |
|
Arthur Barrett
|
0710bbd70c
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-03-19 13:43:45 -04: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 |
|
Arthur Barrett
|
20767d5cc7
|
create notes djangoapp for annotator.js
|
2013-03-15 12:41:52 -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 |
|