Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

534 Commits

Author SHA1 Message Date
marco
79c78cbccd made firefox input number increment objects positioned as % to respond to page size accordingly 2013-05-20 15:22:21 -04:00
Brian Talbot
31b5c4ab61 studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet 2013-05-20 15:20:17 -04:00
cahrens
4d7c7f866a Merge branch 'master' into feature/christina/metadata-ui 2013-05-20 15:06:40 -04:00
marco
c0cff81e5e styled firefox number buttons 2013-05-20 14:39:37 -04:00
marco
c356904027 css styles for firefox input number fields 2013-05-20 12:06:30 -04:00
marco
32f7691040 minor style changes for increment and decrement buttons on firefox number fields 2013-05-20 11:39:13 -04:00
cahrens
3229aaf503 Call polyfill at right time. 2013-05-20 11:16:20 -04:00
marco
aa41aed9d1 prototype for polyfill on number input fields, minimal styling to up down buttons 2013-05-20 09:45:33 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing 
Feature/zoldak/forum testing
 2013-05-17 10:10:55 -07:00
Your Name
6fb8adaa50 add flagging and unflagging tests to response show view 2013-05-17 09:52:02 -04:00
Your Name
ad5b71deae format content view test for readability 2013-05-17 09:34:41 -04:00
Your Name
296a878169 add flagging tests to DiscussionContentView 2013-05-17 09:31:12 -04:00
Your Name
ce2308b5bb add flagging tests to DiscussionContentView 2013-05-17 09:28:12 -04:00
Arthur Barrett
52e5fe223c update annotator.js library and fix the annotator-adder button hover state in courseware. 2013-05-16 14:27:21 -04:00
Your Name
82d2b78b96 update jasmine tests 2013-05-16 10:56:58 -04:00
Your Name
90892450b7 failed jasmine tests still failing 2013-05-16 10:56:57 -04:00
Jay Zoldak
cc2cc469fe more work on jasmine tests for forums 2013-05-16 10:56:57 -04:00
Jay Zoldak
cbdf93473b start to get the jasmine tests working for comment service 2013-05-16 10:56:57 -04:00
Jay Zoldak
ed3df10638 Set up rake task for jasmine tests for discussion forums code. 2013-05-16 10:56:57 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict"" 
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
 2013-05-16 10:29:33 -04:00
Your Name
4b806768ec more server trial and error 2013-05-16 10:29:33 -04:00
Your Name
8568ce7ad0 server django version generating 1 instead of True so test for both 2013-05-16 10:29:33 -04:00
Kevin Chugh
ab08fa94e4 coffeescript fixes 2013-05-16 10:29:32 -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
bbb6a3c60d resolved metadata-edit conflict, adding in latex item into settings 2013-05-15 16:27:04 -04:00
marco
12dae84a07 commented out firefox polyfill ad well as xmodule css editor changes 2013-05-15 16:07:45 -04:00
cahrens
d72b6b05bf Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/static/sass/views/_static-pages.scss
 2013-05-15 15:29:27 -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
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
marco
e157173c11 styling adjustments to codemirror and wrapped polyfill into a function 2013-05-15 10:53:54 -04:00
marco
47a4d6b6a1 initial polyfill implementation and metadata number entry javascript validation 2013-05-14 23:55:34 -04:00
Brian Talbot
8b77111d58 Studio: more styling changes 
typography, SASS, imports
 2013-05-14 17:16:53 -04:00
Brian Talbot
f069c1a1a1 Studio: style reorg 
typography, SASS import, mixins/extends
 2013-05-14 17:15:07 -04:00
marco
8d8c8d83df updated unit styling, added polyfill js library, updated javascript handling for modes swap 2013-05-14 12:38:52 -04:00
marco
0aaaf84f62 added number metadata template, cleaned up editor theme ui bordering and settings styles 2013-05-14 08:22:36 -04:00
cahrens
5edbf3d8f7 Merge branch 'master' into feature/christina/metadata-ui 2013-05-13 10:55:32 -04:00
marco
97de97cc18 minimal mce editor style changes to borders 2013-05-13 09:27:13 -04:00
Arthur Barrett
dd583ce4f9 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-09 14:32:05 -04:00
David Baumgold
ec79ebd4a7 Updated Backbone.js and Underscore.js 
Backbone 1.0.0, Underscore 1.4.4
 2013-05-08 09:29:15 -04:00
Arthur Barrett
04e75485ba merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html. 2013-05-06 13:40:38 -04:00
Jay Zoldak
f2fd90bc61 Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests 
Fix/cale/lms jasmine tests
 2013-05-01 08:23:41 -07:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo 
Fix/btalbot/studio courseinfo
 2013-04-30 13:34:52 -07:00
Jay Zoldak
aa4e29d2f1 Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs 2013-04-30 15:22:08 -04:00
Christina Roberts
4c97f92245 Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images 
add more images to support templates
 2013-04-30 09:50:41 -07:00
Chris Dodge
c5d520574d also move the MIT dome image in Latex to be in our source pack 2013-04-30 12:02:58 -04:00
Chris Dodge
1f1a6e3ec5 add more images to support templates 2013-04-30 11:46:49 -04:00
Chris Dodge
02ed9f26c4 add dependent image for the image response template 2013-04-30 10:07:42 -04:00
Brian Talbot
a861c8b310 revised placeholder course and faculty images - more opacity to reinforce placeholderness 2013-04-29 16:03:00 -04:00
Brian Talbot
4e251a3b19 adding in placeholder images for a course and its faculty 2013-04-29 15:38:55 -04:00