Arthur Barrett
afa7fca15a
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-27 11:58:38 -05:00
David Ormsbee
c7920f09ad
Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features.
2013-02-27 11:42:06 -05:00
Ned Batchelder
f828049043
Change TorontoX to University of TorontoX
2013-02-27 10:05:58 -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 Wilson
19567cc3d5
update styling of pdfs to be more like textbooks
2013-02-26 15:19:23 -05:00
Arthur Barrett
18233ef0d7
bolded the section titles and added unittest skeleton for module
2013-02-26 12:15:43 -05:00
Brian Wilson
fc9ab346e1
fix loading of specific pages.
2013-02-26 01:03:01 -05:00
Julian Arni
edba0978cf
Included styling and template
2013-02-25 18:18:46 -05:00
Julian Arni
0a47f27fa7
Merge branch 'master' into feature/jkarni/foldit-api
2013-02-25 17:32:30 -05:00
Julian Arni
26eaf8985c
Allow progress without leaderboard and vice-versa
2013-02-25 17:28:22 -05:00
Brian Wilson
dde2cd0bd0
get chapter links to start working
2013-02-25 16:52:32 -05:00
Arthur Barrett
1f160d6ef4
added a box around the instructions text
2013-02-25 16:29:19 -05: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
Arthur Barrett
66ddfa295d
more refactoring and work on annotationinput (should be working now).
2013-02-22 16:33:28 -05:00
Julian Arni
e5294591dc
Foldit leaderboard w/o tests
2013-02-22 11:12:26 -05:00
Vik Paruchuri
d5865e70b8
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-22 10:21:34 -05:00
Brian Wilson
d503fe3d79
Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js
2013-02-21 15:38:28 -05:00
Your Name
ff68853990
Merge branch 'master' into feature/victor/revert-revert-of-forums-ui
2013-02-21 13:30:24 -05:00
Diana Huang
3a8b7156a0
Merge branch 'master' into diana/click-tracking
2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0
Address code review feedback
...
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
2013-02-21 10:17:08 -05:00
Brian Wilson
731f4abd8a
fix bug with nav to a page, and add pdfviewer.css.
2013-02-21 03:15:08 -05:00
Arthur Barrett
cc7f791078
parse xml for annotationinput
2013-02-20 19:19:17 -05:00
John Jarvis
342220f0f4
js syntax
2013-02-20 18:50:16 -05:00
Brian Wilson
50cae69945
define pdfviewer.js, and use from static_pdfbook.html
2013-02-20 18:37:17 -05:00
John Jarvis
4b93ef491b
errors for login and reg
2013-02-20 18:23:41 -05:00
Vik Paruchuri
9bc8dbd7ca
Fix location strings, re-order checkboxes
2013-02-20 18:04:25 -05:00
Diana Huang
3fe6a74e76
Merge pull request #1528 from MITx/press/international-press-release
...
add press release: edX expands internationally
2013-02-20 14:55:58 -08:00
Victor Shnayder
84eaec3666
add press release: edX expands internationally
2013-02-20 17:50:23 -05:00
Arthur Barrett
a982ebbb03
Refactored rendered method and added span ids.
2013-02-20 17:33:11 -05:00
Vik Paruchuri
d5ba5457dc
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:49:59 -05:00
Vik Paruchuri
ad9400a0ef
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-02-20 16:43:04 -05:00
Vik Paruchuri
111ef30f05
Render to string fix, display ETA message when student submits
2013-02-20 16:30:44 -05:00
Arthur Barrett
af2bfa9d4e
Saving work in progress on v2 with capa template for annotation problem.
2013-02-20 16:30:19 -05:00
Victor Shnayder
d2e97d2389
Merge pull request #1518 from MITx/press/international
...
Press/international
2013-02-20 12:07:16 -08:00
Diana Huang
ea13659249
Merge branch 'master' into diana/click-tracking
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
2013-02-20 14:02:04 -05:00
Vik Paruchuri
59e3647692
Add in support for getting and displaying ETA
2013-02-20 13:28:37 -05:00
Diana Huang
13d4cfa4d4
Merge branch 'master' into diana/click-tracking
2013-02-20 11:40:14 -05:00
Diana Huang
b3767fc553
Merge branch 'master' into feature/diana/close-oe-problems
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/peer_grading_module.py
2013-02-20 11:20:10 -05:00
Arthur Barrett
2f68cba24d
merged from master
2013-02-20 11:07:46 -05:00
Brian Talbot
f2abc3c3e5
lms - revised classes and styling mechanics for login/register forms and added necessary screen-reader mixin for other visually hidden text in those pages
2013-02-20 09:15:27 -05:00
Victor Shnayder
2981f532c1
Integrate Brian T's front-page changes, add epfl and delft
...
- removed duplicate logos.
- cover images are still in the 200-350 KB range.
2013-02-19 22:04:20 -05:00
Victor Shnayder
105cbd3bfc
Merge remote-tracking branch 'origin/style/btalbot/homepage-newxunis' into press/international
2013-02-19 21:52:06 -05:00
John Jarvis
2a6fde9db2
javascript to redirect to the course being accessed
2013-02-19 20:42:38 -05:00
John Jarvis
fd36c555a6
Renaming login url for modal-less login
2013-02-19 19:36:32 -05:00
Brian Talbot
074f866b58
resolving some light footer display issues
2013-02-19 17:32:17 -05:00
Brian Talbot
b2839514f2
Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new
2013-02-19 17:22:57 -05:00
Brian Talbot
1f247ceb0c
edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets
2013-02-19 16:40:21 -05:00
