Brian Talbot
bb24a079a1
studio - alerts: initial pass at alert styling and markup complete
2013-02-22 14:28:13 -05:00
Arthur Barrett
78bf8d5876
update annotationinput jsonv alue on tag selection or comment change
2013-02-22 00:42:12 -05:00
Brian Wilson
8076c5b731
remove unneeded files (that break collectstatic)
2013-02-21 17:38:00 -05:00
Arthur Barrett
0e2c46a718
Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index).
2013-02-21 17:01:43 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Brian Wilson
d5e34b0a44
fix initialization of scale dropdown, and check for valid values of page number
2013-02-21 15:35:03 -05:00
Arthur Barrett
a8178de497
Added styling to the annotationinput capa problem.
2013-02-21 13:52:22 -05:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
Brian Wilson
00e31c0116
fix toolbarViewer styling
2013-02-21 10:30:20 -05:00
Brian Wilson
731f4abd8a
fix bug with nav to a page, and add pdfviewer.css.
2013-02-21 03:15:08 -05:00
Brian Wilson
1850528a99
add contents of pdfjs to common/static/js/vendor, after fixing CR/LF issues in localization files
2013-02-20 18:49:59 -05:00
Brian Wilson
50cae69945
define pdfviewer.js, and use from static_pdfbook.html
2013-02-20 18:37:17 -05:00
Arthur Barrett
610e210cc8
Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule
2013-02-20 11:32:46 -05:00
Arthur Barrett
2f68cba24d
merged from master
2013-02-20 11:07:46 -05:00
Brian Wilson
c234f3625e
add full version of pdf.js, and main files for jquery-pdfdoc
2013-02-19 18:05:36 -05:00
Victor Shnayder
c1c050a6b6
WIP on an inputtype for heroesX annotation
...
- has a text area for saved but (currently) ungraded comments
- has a set of tags with weights
2013-02-19 17:35:40 -05:00
cahrens
167d07037d
Merged, delete Ace.
2013-02-19 14:56:37 -05:00
cahrens
f91060d197
Merge branch 'master' into feature/cas/manual-policy
...
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/settings/course_grading_policy.js
cms/static/js/views/settings/main_settings_view.js
cms/static/sass/_settings.scss
cms/templates/settings.html
cms/urls.py
2013-02-19 13:27:35 -05:00
Diana Huang
f4addddf42
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
...
Feature/vik/improve oe ui
2013-02-19 07:27:29 -08:00
Arthur Barrett
72d9c1d7d2
Saving work-in-progress of guided classification exercise.
2013-02-18 19:02:54 -05:00
Brian Talbot
6c95460761
studio - resolving merge from master
2013-02-15 09:15:06 -05:00
Brian Wilson
0d3b566dd8
finish piping URL through to pdf.js
2013-02-14 15:47:53 -05:00
Victor Shnayder
e352226df5
Merge remote-tracking branch 'origin/master' into 700x-sandbox
2013-02-14 09:19:25 -05:00
John Hess
259bd8817f
Moved onclick to 'fold' button instead of to courseware's button
2013-02-13 15:10:32 -05:00
Brian Talbot
f1ad05059c
studio - correcting an image-replacement Sass mixin
2013-02-13 09:18:23 -05:00
jmclaus
9dbe911907
Back to last version of Protex
2013-02-13 09:45:44 +01:00
Don Mitchell
d569c559ca
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
2013-02-12 16:57:00 -05:00
Kevin Chugh
21f4616080
spread less than and greater than fix to responses and comments, and profile view
2013-02-12 09:18:46 -05:00
Kevin Chugh
d57c78f9d9
fix showing less than and greater than in code
2013-02-11 20:01:09 -05:00
cahrens
044a8a5cf6
CodeMirror.
2013-02-11 12:37:31 -05:00
Vik Paruchuri
46da4cf241
Add in a better notification icon
2013-02-09 10:15:11 -05:00
Vik Paruchuri
0feb8f66bc
Fix colors on legend, add random assessment
2013-02-08 23:59:39 -05:00
Your Name
f500806247
make hide/show synchronous for cohort filters
2013-02-08 18:18:12 -05:00
Your Name
cc0a6a2da9
make hide/show synchronous for cohort filters
2013-02-08 18:03:27 -05:00
Your Name
7761f6cb04
make cohort filter visibility conditional on selected commentable cohortedness
2013-02-08 17:22:29 -05:00
Victor Shnayder
0e06f5f587
Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui
2013-02-08 15:01:30 -05:00
Victor Shnayder
6d9a9ec46f
Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
...
This reverts commit e4819a1b55b6ec41cae0
2013-02-08 15:00:25 -05:00
Your Name
21c06c741b
inline mustache working
2013-02-08 14:28:48 -05:00
Brian Talbot
1b679750ad
studio - settings: more revamp of tabs to views WIP
2013-02-08 12:36:21 -05:00
Kevin Chugh
3cfc5c4545
cohort filter wokorking
2013-02-07 19:18:21 -05:00
Vik Paruchuri
4973363353
Attach images to rubric to indicate which graders scored what
2013-02-07 18:35:09 -05:00
Your Name
3965f9129d
cohort filter almost done
2013-02-07 18:13:53 -05:00
John Hess
f39a98f9ba
Revert "Protex now loads correctly in every scenario" --- actually breaks grading, though it did fix loading
...
This reverts commit 2627a2f12c
2013-02-07 16:14:42 -05:00
Kevin Chugh
d047d826c7
update coffeescript to hide cohort choice if first commmentable is not cohorted
2013-02-06 22:00:03 -05:00
Victor Shnayder
18ddd1ee56
Merge pull request #1453 from MITx/victor/protex
...
Victor/protex
2013-02-06 18:03:53 -08:00
jmclaus
2627a2f12c
Protex now loads correctly in every scenario
2013-02-06 20:49:23 -05:00
jmclaus
98865bb7c0
Loading bug fixed by ugly hack
2013-02-06 20:49:16 -05:00
jmclaus
85b92f30de
GWT now does no set any target shape in onModuleLoad()
2013-02-06 20:49:06 -05:00
jmclaus
e27b1e04a7
Fixed small alighment pb, decreased font size of text box
2013-02-06 20:48:57 -05:00
jmclaus
3bd7e1b703
Crisper AA letters, canvases non-selectable
2013-02-06 20:48:48 -05:00
