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

5366 Commits

Author SHA1 Message Date
Frances Botsford
b1653f0561 layout cleanup on LMS PDF Textbook viewer 2013-07-11 11:19:39 -04:00
David Baumgold
cb62797306 Merge pull request #347 from edx/update-sass 
Update SASS and Bourbon, add Neat
 2013-07-10 11:09:11 -07:00
chrisndodge
9824ba43cf Merge pull request #364 from edx/fix/cdodge/change-log-level-on-course-delete 
change log levels on the delete course utility. Otherwise they get filte...
 2013-07-10 10:52:06 -07:00
Chris Dodge
1b377260cc change log levels on the delete course utility. Otherwise they get filtered out in production environments (min set to WARN level) 2013-07-10 12:34:39 -04:00
Adam Palay
d056c8a8f2 replace test setting changes with test-specific mock.patch.dicts 2013-07-10 10:18:58 -04: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
Brian Talbot
41d9fa3785 Studio: syncs up syntax, ordering, and timing for all Sass transition mixins 2013-07-10 09:17:59 -04:00
David Baumgold
40585b2bbb Added neat grid framework 
http://neat.bourbon.io/
 2013-07-10 09:17:58 -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
David Baumgold
1388684194 Sass 3.2.9, Bourbon 3.1.8 2013-07-10 09:17:58 -04:00
Calen Pennington
dcaed88cb2 Merge pull request #313 from edx/cale/use-super-for-calling-parent-__init__-methods 
Use super for calling parent __init__ methods
 2013-07-10 06:17:41 -07:00
Frances Botsford
6814163a45 cleanup and tweaks from feeback to PDF Textbooks FED and Sass 2013-07-09 19:16:44 -04:00
David Baumgold
359cbbb4d9 Fixing up ui_helpers based on feedback from Christina 2013-07-09 19:16:44 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -04:00
David Baumgold
dd39ebec03 If success_condition fails, raise an exception 2013-07-09 19:16:43 -04:00
David Baumgold
84bbd84a54 Ease Christina's pain 
But only slightly. Sorry Christina.
 2013-07-09 19:16:10 -04:00
David Baumgold
e1ed5c3d2d docstrings 2013-07-09 19:16:10 -04:00
David Baumgold
2a92a14054 Wrote simple lettuce tests for pdf textbooks 2013-07-09 19:16:09 -04:00
David Baumgold
5e0767ccd0 logging is unused 2013-07-09 19:16:09 -04:00
Frances Botsford
2321a2c563 more updates to PDF textbook UI 2013-07-09 19:16:09 -04:00
David Baumgold
ef81556cc5 Use JsonResponse when it makes sense 2013-07-09 19:16:08 -04:00
David Baumgold
090d0d4464 Fix up unit tests 2013-07-09 19:16:08 -04:00
David Baumgold
27e895393c Added generic JsonResponse class 
Based on http://djangosnippets.org/snippets/154/
 2013-07-09 19:16:07 -04:00
David Baumgold
33a78eaeb7 Fix missing } from bad rebase 2013-07-09 19:16:05 -04:00
David Baumgold
6c313339e1 Updated Backbone-Associations to v0.5.0 2013-07-09 19:16:05 -04:00
David Baumgold
5fa05a50b9 Make gettext perform sanely in test 2013-07-09 19:16:03 -04:00
David Baumgold
3f0efe70cf Added jasmine-stealth library, v0.0.12 2013-07-09 19:16:03 -04:00
David Baumgold
00f76f3cda Added Backbone Associations v0.4.2 2013-07-09 19:16:01 -04:00
Frances Botsford
e237cdca84 round 2 on html and sass for textbook upload 2013-07-09 19:15:59 -04:00
Frances Botsford
9d59a1313c initial html and sass for textbook upload 2013-07-09 19:15:59 -04:00
Chris Dodge
6642cdddae support uploading and referencing assets as streams rather than having to read everything into memory first 2013-07-09 19:15:58 -04:00
Chris Dodge
7d7eee7d0d inital work to use streams/chunks when handling uploaded assets 2013-07-09 19:15:58 -04:00
Felix Sun
bc315c1149 Merge pull request #328 from edx/felix/hinter2 
Felix/hinter2
 2013-07-09 15:29:14 -07:00
Christina Roberts
bd96632139 Merge pull request #345 from edx/christina/course-creator-table 
Admin table for course creators.
 2013-07-09 13:18:35 -07:00
Felix Sun
6c55726134 Fixed naming error in crowdsource_hinter. (Introduced in git merge.) 2013-07-09 14:34:21 -04:00
Felix Sun
596e1ead29 Merge branch 'felix/hinter2' of https://github.com/edx/edx-platform into felix/hinter2 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
 2013-07-09 13:28:27 -04:00
Felix Sun
3418feba52 Added error logging for unparsable answers. 2013-07-09 13:26:02 -04:00
jkarni
ab4dfc248f Merge pull request #217 from edx/feature/jkarni/jsinput 
Feature/jkarni/jsinput
 2013-07-08 12:51:04 -07:00
Julian Arni
fd6abc88e2 Incorporate review comments 2013-07-08 14:32:02 -04:00
cahrens
2cceda948c Disable test point when run under CMS. 
The template exists when django admin is enabled, but the mappings in CMS' urls.py do not exist.
 2013-07-08 13:12:44 -04:00
chrisndodge
57d82dea10 Merge pull request #330 from edx/fix/cdodge/delete-course-delete-drafts 
[STUD-380] Fix/cdodge/delete course delete drafts
 2013-07-08 07:24:24 -07:00
Carlos Andrés Rocha
dd8f1f5385 Rename get to data in crowdsourced hinter module 2013-07-08 09:55:06 -04:00
Felix Sun
bc1dea3de1 Fixed bug: When student submits empty string, hinter returns a 500 error. 
Added tests to catch said bug.

Fixed some pylint violations.
 2013-07-08 09:55:06 -04:00
Felix Sun
b68c117854 Fixed bug: When student submits empty string, hinter returns a 500 error. 
Added tests to catch said bug.

Fixed some pylint violations.
 2013-07-08 09:05:29 -04: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
Ned Batchelder
31a72093e0 Fix broken tests by simplifying the CourseFactory 
The data argument was being treated specially, but that was just
because we didn't have **kwargs support.  Now we do.  There are
two uses of data=, one we convert to kwargs, the other was actually
unused, so remove it completely.
 2013-07-03 17:04:18 -04:00