Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,939 Commits 1 Branch 0 Tags
2cd18dfad3bcda0bbca0ee4ea81eaef026c975f9
Commit Graph

404 Commits

Author SHA1 Message Date
Renzo Lucioni
881d63dae7 Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary 2013-06-25 16:04:00 -04:00
Renzo Lucioni
84f4361d52 Avoid changing format of data sent to our logs, and prevent problem_check event from firing twice 2013-06-25 15:33:16 -04:00
Renzo Lucioni
bcbce3eff0 Add handful of events to the Segment.io whitelist 2013-06-25 15:33:16 -04:00
Brian Talbot
b7b2f91e79 studio - revising the visual design of UI well pattern 2013-06-20 12:30:25 -04:00
cahrens
d601cee8e5 Merge branch 'master' into christina/course-settings-drupal 2013-06-20 11:00:12 -04:00
Brian Talbot
d2f0d85085 studio - adds in basic rules for notices UI 2013-06-19 18:09:09 -04:00
Renzo Lucioni
7c048fb243 Merge pull request #181 from edx/renzo/segment-io-sequentials 
Instrument sequentials with segment-io
 2013-06-19 08:07:37 -07:00
Renzo Lucioni
841ff4765f Abridge tests in light of learning how Segment.io works 2013-06-18 17:58:10 -04:00
Renzo Lucioni
305e9315ef Write Jasmine tests to prove Segment.io works in Logger 2013-06-18 14:27:43 -04:00
David Baumgold
aa24508024 Add underscore.string library 
http://epeli.github.io/underscore.string/
 2013-06-18 10:23:18 -04:00
Renzo Lucioni
f528f61ec1 Add new Jasmine test to ensure Segment.io is called when appropriate 2013-06-17 16:18:07 -04:00
Renzo Lucioni
c30d2d2f52 Incorporate Segment.io into Logger.log with whitelist 2013-06-17 13:48:50 -04:00
cahrens
e6dfa8e81c Merge branch 'master' into feature/christina/metadata-ui 2013-05-31 09:46:17 -04:00
David Baumgold
bdc9570cd1 Removed Symbolset font files 2013-05-30 16:09:17 -04:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-05-23 11:41:12 -04:00
David Baumgold
350c5460af Revert "Update jasmine-jquery to 1.5.1" 
This reverts commit 90a9c386eb.
 2013-05-22 17:29:52 -04:00
David Baumgold
525fe2d581 Expose a dummy gettext function in the Jasmine test env 2013-05-22 15:55:53 -04:00
David Baumgold
90a9c386eb Update jasmine-jquery to 1.5.1 2013-05-22 15:55:52 -04:00
David Baumgold
d10e644c6e Added sinon.js to project 2013-05-22 15:55:52 -04:00
marco
3cf915005b Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-20 15:22:31 -04:00
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