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

5318 Commits

Author SHA1 Message Date
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
David Ormsbee
7993d5c1fc Merge pull request #348 from edx/bugfix/ichuang/idasbhoard-track-json 
tracking in idashboard should only log json-serializable objects
 2013-07-10 10:17:30 -07:00
Adam
2af1132894 Merge pull request #350 from edx/fix/adam/less-noise 
move setting changes in tests to override_settings
 2013-07-10 09:48:55 -07:00
dcadams
a5f8607c7e Merge pull request #357 from edx/bugfix/dcadams/enroll_emails 
Fix course url link in enrollment emails.
 2013-07-10 09:47:53 -07:00
ihoover
bec731207a Merge pull request #362 from edx/ihoover/login_enrollment_refactor 
refactor login and enrollment test cases to use the mongo modulestore
 2013-07-10 08:06:32 -07:00
ihoover
5a03d93000 refactor login and enrollment test cases to use the mongo modulestore 
added namee to authors file
 2013-07-10 10:34:14 -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
Frances Botsford
3748cae7b8 updated broken transition sass rule 2013-07-10 09:18:00 -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
dcadams
e1a0499678 Added test for email body containing course url and some pep8 fixes. 2013-07-09 14:25:06 -07:00
Adam Palay
e123a5f8ad fix to problems with uploading files 2013-07-09 15:00:53 -04:00
ichuang
a2b552d05f use unicode instead of str for casting track.views args in idashboard 2013-07-09 14:24:23 -04:00
Ned Batchelder
1dbbbb104f Merge pull request #351 from edx/ned/make-tests-quieter 
Provide a null log function for OpenID to keep it from spewing during tests
 2013-07-09 11:17:44 -07:00
dcadams
738ba15322 Fix course url link in enrollment emails. 2013-07-09 11:01:52 -07:00
David Baumgold
7db77dc525 Remove static_template_view tests 2013-07-09 12:54:50 -04:00
David Baumgold
caa2cf0d76 Removed all press releases from repo 
They are on the Drupal site now
 2013-07-09 11:38:15 -04:00
ichuang
6333a9ab29 Merge pull request #344 from edx/ichuang/fix-idashboard-extra-bracket 
remove extra bracket which had crept into instructor dashboard
 2013-07-09 07:52:13 -07:00
ichuang
f136edb469 tracking in idashboard should only log json-serializable objects 2013-07-08 11:52:39 -04:00
Carlos Andrés Rocha
1fbab8e9fa Merge pull request #295 from edx/rocha/celery-virtual-host 
Add setting to set the virtual host of a Celery broker
 2013-07-08 06:58:31 -07:00
ichuang
ec20f568ea remove extra bracket which had crept into instructor dashboard 2013-07-08 08:17:38 -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
759b486586 Provide a null log function for OpenID to keep it from spewing during tests. 2013-07-03 17:58:42 -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
Ned Batchelder
a453de2fca Merge pull request #323 from edx/ned/fix-lms-530 
Fix LMS-530: Reflected XSS in chapter and page numbers
 2013-07-03 12:28:19 -07:00
Ned Batchelder
1d5dfaa131 Add tests for image books, and more tests for the other kinds too. 2013-07-03 14:42:41 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
Ned Batchelder
959274c730 Adapt the tests to the new way of making URLs. 2013-07-02 17:08:37 -04:00
caesar2164
b3723b1a22 Merge pull request #288 from edx/giulio/accessibility-2 
Round 2 Accessibility Changes
 2013-07-02 13:41:50 -07:00
Renzo Lucioni
42efd33cfa Refactor Segment.io integration with sequentials and instructor dashboard pages 2013-07-02 13:49:33 -04:00
Ned Batchelder
27c70ead1b Tests and CHANGELOG for LMS-530 2013-07-02 13:30:00 -04:00
Ned Batchelder
5fad9ccca4 Fix LMS-530, reflected XSS 
Limit the page and chapter numbers to digits, to keep malicious URL
components from being inserted onto the page.
 2013-07-02 13:29:59 -04:00
Giulio Gratta
3c461f7a94 reverts to browser default focus state and reenables the open_close_accordion feature 2013-07-02 09:26:43 -07:00
Giulio Gratta
1bb71a8621 increasing visibility of tab navigation on site by making focus state very obvious 2013-07-02 09:26:42 -07:00
Giulio Gratta
a5c9db0889 increased text contrast to make text more legible 2013-07-02 09:26:42 -07:00
Giulio Gratta
86a1e4263d added alt tags to course cover images and find course page logo 2013-07-02 09:26:41 -07:00
Giulio Gratta
93da389671 Removing selection styling from sass files 
- removed ::selection css from reset.scss
- removed variables from variables.scss
- removed variable calls from course/base/base.scss and base/base.scss
 2013-07-02 09:26:41 -07:00
Giulio Gratta
7452381f1c making sequence titles available to non-sighted users 2013-07-02 09:26:40 -07:00
Giulio Gratta
7af6409dc5 use jquery to focus on alert messages 2013-07-02 09:26:40 -07:00
Ned Batchelder
f6b0ffd01f Make some helpers for the tests. 2013-07-02 11:48:03 -04:00
Ned Batchelder
4ff2de69e7 Pylint fixes 2013-07-02 11:36:47 -04:00
Ned Batchelder
25d0f4d500 Remove unused URL /book-shifted/ 2013-07-02 11:36:47 -04:00
Ned Batchelder
6c3563cc1a Simple refactoring and reformatting of the view code. 2013-07-02 11:36:47 -04:00
Ned Batchelder
b5aebf0e02 Tests for staticbook 2013-07-02 11:36:47 -04:00
Ned Batchelder
c160b39bbd Provide names for the other courseware book URLs. 2013-07-02 11:36:46 -04:00
Adam Palay
c692428fe5 fix pylint violations 2013-07-02 10:22:26 -04:00
Ned Batchelder
4e4c209ae3 Fix LMS-530, reflected XSS 
Limit the page and chapter numbers to digits, to keep malicious URL
components from being inserted onto the page.

Conflicts:
	lms/urls.py
 2013-07-02 10:11:40 -04:00