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
Jay Zoldak
8b1579e490
Merge pull request #1527 from MITx/feature/vik/check-if-submission-allowed
...
Feature/vik/check if submission allowed
2013-02-21 06:37:50 -08: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
Calen Pennington
3d36736cf3
Limit remembered logins to 7 days, so that old cookies will eventually expire
2013-02-21 09:05:19 -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
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
John Jarvis
4b93ef491b
errors for login and reg
2013-02-20 18:23:41 -05:00
Vik Paruchuri
9d5a08fc6d
Fix location string
2013-02-20 18:07:24 -05:00
Vik Paruchuri
9bc8dbd7ca
Fix location strings, re-order checkboxes
2013-02-20 18:04:25 -05:00
Vik Paruchuri
7b604aa026
Fix an import statement
2013-02-20 17:57:09 -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
Vik Paruchuri
43158de9bb
Merge branch 'feature/vik/check-if-submission-allowed' into feature/vik/oe-messages
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
2013-02-20 17:50:00 -05:00
Arthur Barrett
07f64abb11
Refactored init method.
2013-02-20 17:38:47 -05:00
Vik Paruchuri
c55f997086
Fix self assessment tests
2013-02-20 17:34:51 -05:00
Arthur Barrett
a982ebbb03
Refactored rendered method and added span ids.
2013-02-20 17:33:11 -05:00
Vik Paruchuri
912800cabf
Fix location string object problems
2013-02-20 17:27:37 -05:00
Vik Paruchuri
a8fadb0ecc
Remove render to string import
2013-02-20 17:16:38 -05:00
Victor Shnayder
bf454382d0
Merge pull request #1525 from MITx/press/international
...
Press/international
2013-02-20 14:14:11 -08:00
Vik Paruchuri
19a80c6268
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 17:12:53 -05:00
cahrens
cc63f9c2db
Unique IDs, other cleanup.
2013-02-20 17:11:34 -05:00
Diana Huang
cf7a34ae74
Merge pull request #1524 from MITx/feature/vik/check-if-submission-allowed
...
Feature/vik/check if submission allowed
2013-02-20 14:03:39 -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
Christina Roberts
1f0c84ed05
Merge pull request #1523 from MITx/style/btalbot/studio-newsection
...
studio - fixed alignment of new section field and controls
2013-02-20 13:44:49 -08:00
Brian Talbot
8b5f088eb9
studio - fixed alignment of new section field and controls
2013-02-20 16:43:13 -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
26a2e059c8
Actually display ETA message
2013-02-20 16:36:40 -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
Chris Dodge
67f97c2c56
update Victor's metadata inheritance comment
2013-02-20 16:26:09 -05:00
Brian Talbot
4b850f4da9
studio - notifications: made icon/copy area more bulletproof for longer lines of text
2013-02-20 16:24:50 -05:00
Vik Paruchuri
2f29d85efc
Finish function to get eta value
2013-02-20 16:22:22 -05:00
Chris Dodge
bd188f92ef
put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case
2013-02-20 16:20:39 -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
cahrens
c572ba862a
Delete unused method.
2013-02-20 15:47:07 -05:00
cahrens
d9fb067355
Test point for formatting of JSON entry.
2013-02-20 15:34:53 -05:00
Victor Shnayder
d2e97d2389
Merge pull request #1518 from MITx/press/international
...
Press/international
2013-02-20 12:07:16 -08:00
cahrens
dd959d1123
Longer warning got merged out.
2013-02-20 15:01:41 -05: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
Brian Talbot
7b60ec380a
Merge branch 'master' into feature/cas/manual-policy-merged
2013-02-20 14:58:50 -05:00
Brian Talbot
e157fd26c8
studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields
2013-02-20 14:58:19 -05:00
Brian Talbot
ef3492aa40
studio - resolving local merge
2013-02-20 14:48:21 -05:00
Brian Talbot
c7f5b74225
studio - manual policy editor: converting to new page layout and styling
2013-02-20 14:46:54 -05:00
