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 Talbot
6f2e6116f9
LMS - adding back in a Sass mixin that seems to still have dependencies
2013-02-21 09:16:06 -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
Vik Paruchuri
051b7fd21d
Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages
2013-02-20 17:50:09 -05:00
Arthur Barrett
a982ebbb03
Refactored rendered method and added span ids.
2013-02-20 17:33:11 -05:00
Victor Shnayder
bf454382d0
Merge pull request #1525 from MITx/press/international
...
Press/international
2013-02-20 14:14:11 -08:00
Victor Shnayder
4d643d36cc
Merge branch 'press/international' of github.com:MITx/mitx into press/international
2013-02-20 16:53:39 -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
Vik Paruchuri
59b2f2ccd7
Move controller query service to xmodule side to prepare for ETA message displays
2013-02-20 16:19:17 -05:00
Brian Talbot
d0fca477a8
edx.org - university pages' main banner images are now centered when window resizes
2013-02-20 16:12:36 -05:00
VikParuchuri
fbce67a883
Merge pull request #1519 from MITx/diana/fix-self-assessment-test
...
Fix test so we don't have to skip it anymore.
2013-02-20 13:02:02 -08:00
Victor Shnayder
d2e97d2389
Merge pull request #1518 from MITx/press/international
...
Press/international
2013-02-20 12:07:16 -08:00
Victor Shnayder
1ae06a45bb
Add lower case urls for universities.
...
- Dan sent out a press release with those urls.
- Using a redirect instead of making it case-insensitive
because the proper urls are prettier
2013-02-20 14:59:28 -05: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
Diana Huang
a789d6c363
Merge branch 'master' into diana/fix-self-assessment-test
2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b
Clean up and fix some peer grading tests.
2013-02-20 13:36:09 -05:00
Vik Paruchuri
3db3d7b740
Fix eta message slightly
2013-02-20 13:31:06 -05:00
Vik Paruchuri
59e3647692
Add in support for getting and displaying ETA
2013-02-20 13:28:37 -05:00
Vik Paruchuri
dbe93502f1
Fix tests
2013-02-20 12:44:12 -05:00
Vik Paruchuri
2302c3244b
Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed
2013-02-20 12:01:42 -05:00
Diana Huang
13d4cfa4d4
Merge branch 'master' into diana/click-tracking
2013-02-20 11:40:14 -05:00
Arthur Barrett
33c12647cb
Merge branch 'master' into feature/abarrett/annotatable_xmodule
2013-02-20 11:31:53 -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
Diana Huang
03a4deb847
Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule
...
Feature/vik/settings to xmodule
2013-02-20 08:06:20 -08:00
Jay Zoldak
30edc380e1
Change coverage report config to reflect refactoring of terrain files
2013-02-20 09:31:50 -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
John Jarvis
bfbd7de042
Adding baseFontColor to _variables.scss
2013-02-19 19:36:15 -05:00
Brian Talbot
6f922570ff
made flex-grid references consistent within different page element Sass files
2013-02-19 17:36:28 -05:00
Brian Talbot
d14c8e2585
Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new
2013-02-19 17:32:25 -05:00
Brian Talbot
074f866b58
resolving some light footer display issues
2013-02-19 17:32:17 -05:00
John Jarvis
4596fa417f
Changing login and signin view names
2013-02-19 17:31:22 -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
Jay Zoldak
db6fa9a3aa
Pep8fix lettuce test code
2013-02-19 16:46:32 -05:00
Jay Zoldak
040f840c9d
Remove portal (fake) app, move tests to courseware.
...
Comment out tests that don't run correctly without prerequisites.
2013-02-19 16:46:32 -05:00
