Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
15,889 Commits 1 Branch 0 Tags
724ef2e1e5a8cff9656960f46b6e05dcb3317560
Commit Graph

283 Commits

Author SHA1 Message Date
Giulio Gratta
214a814b94 Adjustment to show sequence tool tips in LMS 2013-07-25 00:48:36 -04:00
Renzo Lucioni
1fc4ac864e Add feature showing current score next to problem title 2013-07-19 16:14:24 -04:00
RobertMarks
46ae2f9c26 Added support for a new problem type: ChoicetextResponse 2013-07-18 10:12:56 -07:00
Frances Botsford
a0962cc3b9 updated sass transitions to use newer bourbon syntax 2013-07-10 09:18:00 -04:00
Brian Talbot
d046fdf743 resolves local Sass warnings/errors around missing mixins referenced in xmodule styling 2013-07-10 09:17:59 -04:00
Frances Botsford
4187090dac removed non-existent sass extends from LMS: .table-wrapper, .dullify, .trans, .problem-set 2013-07-10 09:17:59 -04:00
David Baumgold
27796219c7 Changed @include background-size() to background-size 
Bourbon's background-size mixin has been deprecated, and they recommend to use the
official spec.
 2013-07-10 09:17:58 -04:00
David Baumgold
5bd79a8669 Changed @include box-shadow() to box-shadow 
Bourbon's box-shadow mixin has been deprecated, and they recommend to use the
official spec.
 2013-07-10 09:17:58 -04:00
David Baumgold
41374838cb Changed @include border-radius() to border-radius 
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
 2013-07-10 09:17:58 -04:00
jkarni
ab4dfc248f Merge pull request #217 from edx/feature/jkarni/jsinput 
Feature/jkarni/jsinput
 2013-07-08 12:51:04 -07:00
Carlos Andrés Rocha
06529054de Merge hotfix 2013-07093 into master 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py
 2013-07-03 18:55:21 -04:00
Julian Arni
7fbd1a7221 Merge branch 'master' into HEAD 2013-07-02 14:27:05 -04:00
Giulio Gratta
7452381f1c making sequence titles available to non-sighted users 2013-07-02 09:26:40 -07:00
Carlos Andrés Rocha
d6631e5c3d Improve styling of the crowdsource hinter 2013-07-01 19:05:31 -04:00
Carlos Andrés Rocha
0b25e76194 Improve styling of the crowdsource hinter 2013-07-01 10:34:20 -04:00
Julian Arni
386029bee3 Adding jasmine tests; code cleanup. 2013-07-01 10:18:38 -04:00
Brian Talbot
14100ba14c syncs up font-weight across problem button/input actions 2013-06-12 11:44:00 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Brian Talbot
050846af71 abstracts height rule to apply to the capa check, show, save actions 2013-06-12 11:43:59 -04:00
Brian Talbot
664efb9887 removes HTML elemements from problem action Sass selectors 2013-06-12 11:43:59 -04:00
Brian Talbot
a17bf5e2ce resolves height issue when display the check and show answer actions alongside problems 2013-06-12 11:43:59 -04:00
Brian Talbot
8e30981f6f revises the show/hide answer input to use an HTML button element for accessibility purposes 2013-06-10 16:22:14 -07:00
marco
72e1fab1c4 SASS variable and naming standards sync-up based on @talbs feedback completed 2013-05-31 12:40:40 -04:00
cahrens
17c710af83 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
 2013-05-27 20:08:09 -04:00
Vik Paruchuri
e17276ade8 Fix some pep8 stuff 2013-05-24 16:43:29 -04:00
Vik Paruchuri
9cbb4e090d Swap icons for font awesome 2013-05-24 14:40:33 -04:00
Brian Talbot
1371c8d0da revises alignment of advanced editor and cheatsheet toggle 2013-05-23 13:27:23 -04:00
Vik Paruchuri
39663ce947 Add in newlines at end of files 2013-05-22 17:01:49 -04:00
Vik Paruchuri
1f34561cff Update examples, fix parsing error, avoid collision with capa template 2013-05-21 00:22:33 -04:00
Vik Paruchuri
9a7006473e Do basic work on a simple editor for combinedopenended 2013-05-20 09:07:03 -04:00
marco
ef14155306 cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill 2013-05-16 09:50:16 -04:00
marco
12dae84a07 commented out firefox polyfill ad well as xmodule css editor changes 2013-05-15 16:07:45 -04:00
marco
b3e41d19f6 styling for static pages updated 2013-05-15 13:29:35 -04:00
marco
0422350e8c final changes to codemirror styling, and clean up style for settings button clearing 2013-05-15 12:05:43 -04:00
marco
e157173c11 styling adjustments to codemirror and wrapped polyfill into a function 2013-05-15 10:53:54 -04:00
Anto Stupak
c70fa41d69 word cloud: return percents 2013-05-13 14:44:08 +03:00
Vasyl Nakvasiuk
f1d1a3f606 refactoring after Python code review 2013-05-13 14:44:07 +03:00
Valera Rozuvan
f4b247d2bb Refactoring, documenting, moving all HTML generation to template. 2013-05-13 14:44:07 +03:00
Vasyl Nakvasiuk
dac9b5c038 Word Cloud: add full cycle Python + HTML + JS 2013-05-13 14:44:01 +03:00
Vik Paruchuri
463a88ccfb Display rubric to students after calibration 2013-04-09 16:54:27 -04:00
Victor Shnayder
67fecd3e5e Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes 
Annotation styling fixes
 2013-04-02 18:36:19 -07:00
Valera Rozuvan
0884051b32 Fixed bug where in firefox a marked poll button was not highlighted in blue. 2013-03-19 19:29:09 +02:00
Arthur Barrett
1b08071fdc merged from master and resolved conflict with annotatable module. 2013-03-18 15:51:27 -04:00
Arthur Barrett
7507f91d22 Added TODO and explanation for the top-level scss variables. 2013-03-18 15:43:43 -04:00
Arthur Barrett
d860b167d6 fixed tooltip positioning for non-overlapping spans in studio 2013-03-12 14:09:56 -04:00
Arthur Barrett
946af8e189 Merge branch 'master' into feature/abarrett/annotation-styling-fixes 2013-03-11 16:27:55 -04:00
Victor Shnayder
84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
 2013-03-08 00:40:18 -05:00
Arthur Barrett
60b060263c refactor highlight css to prevent issues with cascade 2013-03-07 16:02:22 -05:00
Arthur Barrett
f5c3775b5d fixed the annotation tooltip line height so it is the same in studio and the lms. 2013-03-07 12:21:47 -05:00
Will Daly
e86ed0db91 Merge branch 'master' into fix/will/mc_checkbox_bug 2013-03-07 12:07:34 -05:00