Julian Arni
|
3203360e9e
|
Removed console.logs
|
2013-03-01 14:57:38 -05:00 |
|
Julian Arni
|
b39bbec23e
|
Fixed many more broken references in css
|
2013-03-01 14:43:28 -05:00 |
|
Julian Arni
|
6ccd496add
|
Fixing broken split-button-arrow-focus link
|
2013-03-01 14:22:41 -05:00 |
|
Julian Arni
|
09ff623561
|
Updated version of JSME.
|
2013-03-01 13:38:35 -05:00 |
|
Arthur Barrett
|
1da644fcb3
|
merge from master. resolved conflict with test_responsetypes.py by using the version from master.
|
2013-02-28 11:22:32 -05:00 |
|
Arthur Barrett
|
44a68e6903
|
added partially correct icon from marco
|
2013-02-27 14:36:14 -05:00 |
|
Carlos Andrés Rocha
|
2ca303c95d
|
Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
|
2013-02-27 09:02:07 -08:00 |
|
Arthur Barrett
|
afa7fca15a
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-27 11:58:38 -05:00 |
|
Arthur Barrett
|
e3f12607cd
|
add grading for annotationinput
|
2013-02-27 01:44:07 -05:00 |
|
David Ormsbee
|
51a863bd6b
|
Merge pull request #1557 from MITx/feature/brian/pdfchapter
Feature/brian/pdfchapter
|
2013-02-26 15:00:58 -08:00 |
|
Brian Wilson
|
310073ddef
|
use same images for prev/next as used in image-based textbooks
|
2013-02-26 16:43:48 -05:00 |
|
Brian Talbot
|
cc02b4714c
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-02-26 14:22:50 -05:00 |
|
Brian Wilson
|
fc9ab346e1
|
fix loading of specific pages.
|
2013-02-26 01:03:01 -05:00 |
|
Brian Wilson
|
dde2cd0bd0
|
get chapter links to start working
|
2013-02-25 16:52:32 -05:00 |
|
David Ormsbee
|
f519c4f571
|
Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui
Feature/victor/revert revert of forums ui
|
2013-02-25 09:03:33 -08:00 |
|
Arthur Barrett
|
e736ed34f5
|
added ability to hide/show instructions, if present
|
2013-02-25 11:29:59 -05:00 |
|
Your Name
|
9f58f6890d
|
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
|
2013-02-25 09:31:28 -05:00 |
|
Brian Wilson
|
fa00ea442e
|
add first pass at multi-chapter support.
|
2013-02-25 01:26:34 -05:00 |
|
Victor Shnayder
|
db06efae75
|
Prevent scroll-to-top on clicks in cohorts views
Have to return false from event handlers to avoid href="#"
links from sending the user to the top of the page.
|
2013-02-24 19:44:41 -05:00 |
|
jmclaus
|
cfc8a37aae
|
Fully functional Genex
|
2013-02-24 12:02:06 -05:00 |
|
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 |
|