Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,200 Commits 1 Branch 0 Tags
869d09220c19ee1dfd11fd58a33cacda53de9798
Commit Graph

1215 Commits

Author SHA1 Message Date
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools 
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
 2013-08-27 16:21:33 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts 
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
 2013-08-27 12:12:20 -04:00
Will Daly
42ac76ce0c Merge branch 'master' into lapentab/fix_network_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
 2013-08-23 11:48:38 -04:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests 
Will/use mixed modulestore in tests
 2013-08-23 08:38:09 -07:00
Will Daly
1cb52df16b Removed unnecessary TestCase 2013-08-22 16:10:24 -04:00
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static 
Enable mongodb to be used as back-end for git-based authoring workflow
 2013-08-22 11:05:02 -07:00
lapentab
d894a065df Stylistic changes 2013-08-22 09:28:37 -04:00
lapentab
1759191370 Remove network calls in tests 2013-08-22 08:43:28 -04:00
Chris Dodge
ef98c54f5b fix some pylint violations 2013-08-21 20:06:10 -04:00
Will Daly
8165a033b1 Pep8/pylint fixes 
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
 2013-08-21 19:42:59 -04:00
JonahStanley
b2480b5f00 Changed way feature flags are interpreted 
Configurations must be defined before hand

Reduced pylint violations

We only support 4 browsers
 2013-08-21 16:05:53 -04:00
JonahStanley
21f75ff250 Various stylistic and pylint fixes / changes 
Version numbers have very different ranges for different browsers so not having a dictionary of those.

Fixed a whitespace issue

Fixed pylint/pep8 violations

Don't need django_url

Spacing issues

Changed how commenting works

Forgot one

Used wrong name

Changed around importing

Remove django_url

Fixed function orderingn

Made logic nicer for getting a new browser

Modifying tests to run in opera

Needed to increase time to account for slow sauce loading

Now safari LMS works

Forgot an assert statement

Skipping a few tests for opera
 2013-08-21 16:05:52 -04:00
JonahStanley
58bb6e1ea3 Changed tags to be lowercase to prevent preprocessing 
Changed to have a default for device since it isn't always needed

Tags are more clear

Fixed stylistic issues
 2013-08-21 16:05:02 -04:00
JonahStanley
3746c654d8 Added a tag for things that will not work on Firefox 
Added tags for tests that will not work on Sauce

Changed build name

Tightened up logic

Conflicts:
	common/djangoapps/terrain/browser.py

Added flag for session name
 2013-08-21 16:05:01 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
Kevin Chugh
2f4665375f Merge pull request #745 from edx/dave/block_forums_for_unenrolled 
Make it so that students who are not enrolled cannot see the forum
 2013-08-21 09:13:10 -07:00
Your Name
25d98778cc Merge branch 'master' into dave/block_forums_for_unenrolled 2013-08-21 12:00:06 -04:00
Your Name
541aa08471 update forum access to include check for valid date range 2013-08-21 11:59:39 -04:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Will Daly
96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py
 2013-08-21 10:12:24 -04:00
Your Name
b317d45ffb add missing imports 2013-08-21 09:49:09 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
Will Daly
48c6daacb8 Removed unnecessary settings wrangling from ModuleStoreTestCase. 
Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore

Updated test_submitting_problems

Updated test_tabs.py

Updated test_view_authentication

Updated test_views

Updated courseware/tests/tests.py

Updated test_masquerade

Updated test_module_render

Pylint fixes

Updated video and word cloud tests

Updated course wiki tests

Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues

Updated staticbook

Updated django_comment_client tests

Updated instructor tests

Updated instructor task tests

Updated external_auth tests

Updated course_groups
 2013-08-21 09:36:45 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
Kevin Chugh
08aafc58ea refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:43:46 -04:00
Kevin Chugh
a2bbb65dcf refactor to add access control to already_existing access control routines in access.py 2013-08-20 19:42:03 -04:00
ichuang
91bf6ad86d remove extra debugging line from courses.py 2013-08-20 18:11:40 -04:00
ichuang
fedfa7cab7 fix tabs.py to properly handle static_asset_path 2013-08-20 18:09:57 -04:00
ichuang
2fe4895e43 more static_asset_path handling in courses.py 2013-08-20 18:09:27 -04:00
ichuang
210fa112f3 modify handling of info/handouts and module_render to honor static_asset_path 2013-08-20 18:08:01 -04:00
Chris Dodge
bc5e27fe17 update some more call sites in LMS to always pass in a course_id 2013-08-19 23:42:26 -04:00
Chris Dodge
a16aee340a get_items should take a course_id 2013-08-19 23:42:26 -04:00
Jonah Stanley
73ad057eff Merge pull request #710 from edx/jonahstanley/help-acceptance-test 
Jonahstanley/help acceptance test
 2013-08-19 14:02:29 -07:00
Diana Huang
9469991f52 Merge pull request #713 from edx/diana/button-updates 
Drupal side Register button updates
 2013-08-19 07:28:45 -07:00
JonahStanley
ce5d9b93b1 Added the full range of help modal options 
Fixed pylint violations
 2013-08-19 09:56:57 -04:00
chrisndodge
7aa4418934 Merge pull request #723 from edx/fix/cdodge/bad-links-can-cause-exception-on-rewrite 
Fix/cdodge/bad links can cause exception on rewrite
 2013-08-19 06:33:55 -07:00
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Anton Stupak
7a68516d12 Fix formatting. 2013-08-19 10:39:52 +03:00
Anton Stupak
a921e44aa3 Fix steps. 2013-08-19 10:39:52 +03:00
Anton Stupak
d848477596 Remove unecessary assert. 2013-08-19 09:10:50 +03:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
chrisndodge
8ba3214cd4 Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore 
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
 2013-08-16 13:02:31 -07:00
JonahStanley
fc899ab116 Stylistic change and factored out method to common 2013-08-16 15:30:35 -04:00
JonahStanley
43bee86074 Tightened up wording 2013-08-16 11:08:05 -04:00
JonahStanley
967fdee6bc Made filling field a bit safer 2013-08-16 10:55:14 -04:00
JonahStanley
97f70e8598 Fixed wording to better reflect BDD specs 2013-08-16 10:52:20 -04:00
JonahStanley
fc67c2ee6b Wrote preliminary help modal acceptance tests 2013-08-16 10:36:12 -04:00
Adam Palay
8aee225136 in grading, if problem cannot be created, return score as none 2013-08-16 10:25:38 -04:00