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

16546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Kryklia
26565f565e adds changes to changelog 2013-06-20 13:07:41 +03:00
Alexander Kryklia
0eaa7cccb5 adds test for doc generation 2013-06-20 12:58:34 +03:00
Alexander Kryklia
1da7bcf8b7 Fixes bugs in documentation (rst format) 2013-06-20 12:58:33 +03:00
Alexander Kryklia
a3a2412c88 fixes pep8 and pylint errors 2013-06-20 12:58:33 +03:00
Alexander Kryklia
f152668e12 Fixes bugs in documentation and improves it. 2013-06-20 12:58:33 +03:00
Alexander Kryklia
37cad5dc0c fixes launcy not working with Dir.chdir 2013-06-20 12:58:33 +03:00
Alexander Kryklia
e7f1baad62 Fixes broken imports in checker.py 2013-06-20 12:58:33 +03:00
Alexander Kryklia
5d0f905961 fixes pep8 and pylint errors and rename mitx->edx 2013-06-20 12:58:33 +03:00
Ned Batchelder
e775852ee4 Make lms and cms more similar. 2013-06-19 22:44:55 -04:00
Ned Batchelder
bc2f7b96ec Remove a redundant pylint suppression. 2013-06-19 22:31:05 -04:00
Brian Talbot
4ddca36bbe Studio - adds minor UI/content changes to settings notices 2013-06-19 18:13:54 -04:00
Brian Talbot
7904464975 studio - revises notice headings to use icons 2013-06-19 18:09:09 -04:00
Brian Talbot
d2f0d85085 studio - adds in basic rules for notices UI 2013-06-19 18:09:09 -04:00
Brian Talbot
2c72fa9e8b studio - revises markup/content for course about mgmt notices 2013-06-19 18:09:09 -04:00
Julian Arni
49fba9e84d Remove obnoxious pip file 2013-06-19 17:54:28 -04:00
Julian Arni
3c55a1e95d Add sphinx documentation for jsinput 2013-06-19 17:43:09 -04:00
Julian Arni
e08215e62a JSinput input type 2013-06-19 17:42:55 -04:00
Renzo Lucioni
dc5362e6c0 Merge pull request #215 from edx/renzo/segment-io-acceptance-fix 
Fix for the failing acceptance tests
 2013-06-19 14:02:09 -07:00
Renzo Lucioni
acd6620078 Re-enable the Jasmine test 2013-06-19 17:00:10 -04:00
Ned Batchelder
645d847bb1 Remove unused imports from cms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Ned Batchelder
df6d3f9b2f Fix strings that should be raw. 2013-06-19 16:56:34 -04:00
Ned Batchelder
181b1e979b Remove unused imports from common, as reported by pylint. 2013-06-19 16:56:34 -04:00
Ned Batchelder
c53fff9ff4 Tell pylint to shut up about us telling it to shut up. 2013-06-19 16:56:34 -04:00
Ned Batchelder
142762c137 Rearrange pylintrc a little bit. 2013-06-19 16:56:34 -04:00
Renzo Lucioni
0bf02cabff Fix for the failing acceptance tests 2013-06-19 16:48:25 -04:00
Calen Pennington
b021d9cc12 Merge pull request #209 from edx/cale/pep8-fixes 
Cleanup pep8 violations in test_correctmap.py
 2013-06-19 13:36:18 -07:00
cahrens
29d93aff89 pep8 fixes. 2013-06-19 16:34:23 -04:00
cahrens
51fc6280b6 Don't concatenate together multiple strings. 2013-06-19 16:23:00 -04:00
David Ormsbee
7b074424b5 Initialize MakoMiddleware manually during certificate grading runs. 
Without this, problems fail to load because they can't find how to
render themselves, and the certificate generation grading run will
get an inaccurately low count of the possible points a user could
get (anything they didn't see will be omitted), inflating their
grade during certificate calculation and making it inconsistent
with their Progress page.
 2013-06-19 15:53:51 -04:00
David Ormsbee
dda21b3b17 Merge pull request #213 from edx/dave/fix_inflated_cert_grades 
Initialize MakoMiddleware manually during certificate grading runs.
 2013-06-19 12:13:16 -07:00
David Ormsbee
e1b071be30 Initialize MakoMiddleware manually during certificate grading runs. 
Without this, problems fail to load because they can't find how to
render themselves, and the certificate generation grading run will
get an inaccurately low count of the possible points a user could
get (anything they didn't see will be omitted), inflating their
grade during certificate calculation and making it inconsistent
with their Progress page.
 2013-06-19 14:39:02 -04:00
cahrens
6643994348 Add an optional success lambda to css_click. 2013-06-19 13:51:40 -04:00
David Baumgold
b1daf0b3a6 Merge pull request #211 from edx/db/fix-assets-page-notifications 
Clean up assets page notifications
 2013-06-19 09:04:34 -07:00
David Baumgold
687779ba34 Clean up assets page notifications 
Remove hack to work around multiple notification click issues -- and actually resolve
the issue so that the hack isn't necessary
 2013-06-19 12:01:44 -04:00
lapentab
24bee17da5 Merge pull request #156 from edx/blapenta/fix-test-coverage 
Fix test_system looking like a test to nosetest. Fix class inheritance causing double counting of coverage.
 2013-06-19 08:50:54 -07:00
JonahStanley
0524ff53cc Merge branch 'master' into jonahstanley/add-courseteam-tests 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
 2013-06-19 11:29:43 -04:00
cahrens
6e96b88518 On marketing site, disable course settings options that do not work. 
When on the marketing site (edx.org) disable portions of the course settings page in Studio that do not actually work in that environment.
 2013-06-19 11:28:16 -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
David Baumgold
cb3d46d815 Merge pull request #199 from edx/db/notifications-refactor 
Refactor Backbone notifications
 2013-06-19 08:04:18 -07:00
Don Mitchell
86344417ff Merge pull request #207 from edx/dhm/pep8 
pep8 changes made during long refactoring
 2013-06-19 08:00:04 -07:00
Calen Pennington
4cc30aab00 Cleanup pep8 violations in test_correctmap.py 2013-06-19 10:04:32 -04:00
lapentab
dece800888 Renames self.get_test_system to test_system, removes duplicate function. 2013-06-19 09:57:16 -04:00
Calen Pennington
fc6043876a Install python and node prerequisites before trying to run django-admin 2013-06-19 09:01:52 -04:00
Calen Pennington
2de645599a Remove trailing whitespace 2013-06-19 09:01:30 -04:00
Calen Pennington
03605ab686 Don't print error messages if log/db/data directories already exist 2013-06-19 09:01:20 -04:00
Jason Bau
084160c1c9 Finishing up tests/modifications per @ormsbee feedback 2013-06-19 00:48:18 -07:00
Jason Bau
ca649d3c33 Turn off Agreement to Terms of Service for Stanford shib 
As stipulated by Stanford's office of general counsel
 2013-06-19 00:48:18 -07:00
Jason Bau
a39a384ed2 Handle the case where an existing user has email returned by shib 
By linking the users
 2013-06-19 00:48:18 -07:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00