David Ormsbee
8d9297ea04
Some refactoring of how user info is copied over when enrollments are created.
2012-08-10 02:02:44 -04:00
David Ormsbee
731e04e013
Add an explanation of replication
2012-08-10 02:02:44 -04:00
David Ormsbee
b597b17db1
Add support for replicating course enrollment/unenrollment to course databases
2012-08-10 02:02:44 -04:00
Calen Pennington
6abc2d733f
Merge pull request #370 from MITx/feature/bridger/django1.4
...
Feature/bridger/django1.4
2012-08-08 12:52:33 -07:00
Bridger Maxwell
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
Mike Chen
5e6261ebb1
courseware still not working..
2012-08-08 11:30:11 -04:00
Calen Pennington
80b8529f2f
Merge branch 'hotfix/1.0.4'
...
Conflicts:
common/djangoapps/util/middleware.py
2012-08-08 11:05:26 -04:00
Victor Shnayder
b4e400ba56
Make tests pass again again
...
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
2012-08-07 11:08:56 -04:00
Victor Shnayder
932a9be747
Make tests pass again
...
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
2012-08-07 11:06:47 -04:00
Rocky Duan
0ae68e7324
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-06 22:38:31 -04:00
Bridger Maxwell
69ba80bf63
Merge branch 'master' into MITx/feature/bridger/fast_course_grading
2012-08-06 18:51:59 -04:00
ichuang
f47ab30c3f
small fix to xmodule_modifiers to fix case when filename missing
2012-08-06 18:34:54 -04:00
Bridger Maxwell
4fedca5bf9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
2012-08-06 16:49:05 -04:00
ichuang
9805ed8962
cleanup syntax, split long if into two lines
2012-08-06 14:37:17 -04:00
ichuang
a46a37d1c0
log.debug -> log.exception; revert log change in xml_module
2012-08-06 13:58:42 -04:00
Bridger Maxwell
ba42c0225d
Moved the generation of the 'grading context' to a lazy property in course descriptor.
2012-08-06 13:57:41 -04:00
Calen Pennington
8059008bde
Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors
2012-08-06 10:13:12 -04:00
ichuang
553f7046b4
suggested username for ssl auth is conjoined name with no spaces
2012-08-05 21:12:56 -04:00
ichuang
c42960c172
add feature ENABLE_SQL_TRACKING_LOGS and url view /event_logs
2012-08-05 16:32:58 -04:00
ichuang
3c23235885
fix for some broken github edit links - avoids symlinks
2012-08-05 11:39:56 -04:00
ichuang
ebe6bf4888
remove some unnecessary debugging lines in xmodule_modifiers
2012-08-04 21:10:50 -04:00
Rocky Duan
7c58fd27a1
Merge branch 'master' of github.com:MITx/mitx
...
Conflicts:
lms/templates/profile.html
2012-08-04 18:07:27 -04:00
Rocky Duan
09baabee0b
added command: run rake django-admin[sync_user_info] to sync info to discussion
2012-08-04 18:00:57 -04:00
Rocky Duan
69e28e3966
callback to sync user info
2012-08-04 17:59:44 -04:00
ichuang
7fe75030cc
fix staff edit link in module content display (goes to github)
2012-08-04 17:52:14 -04:00
ichuang
3f83904c12
if AUTH_REQUIRE_STAFF_FOR_COURSE then course list = those accessible
2012-08-04 10:19:54 -04:00
ichuang
30922fb449
add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check
2012-08-03 21:39:23 -04:00
Calen Pennington
b1494da02c
Merge pull request #330 from MITx/ExternalAuth
...
External auth
2012-08-03 13:18:55 -07:00
ichuang
a7103ff893
switch to PascalCase, remove unnecessary assignment
2012-08-02 13:39:12 -04:00
ichuang
3eff9ffecd
match external_domain as well when retrieving ExternalAuthMap objects
2012-08-02 13:28:52 -04:00
ichuang
613c53a710
slight cleanup, no need to import all of django_openid_auth
2012-08-02 10:05:26 -04:00
ichuang
f2a9110bda
change model to have external_id and external_domain be unique_together
2012-08-02 09:56:33 -04:00
Victor Shnayder
fc0f938eae
Responding to comments on pull #326
...
* cleaned up error module:
- only one template
- save error message in xml and reload
* better display of problem definition and metadata to staff
* save error messages as string, not exception objects.
2012-08-02 09:56:01 -04:00
ichuang
b2e9d980ff
don't overwrite oid_backend
2012-08-02 09:42:26 -04:00
ichuang
23c3c5a652
print -> log.debug, rename function from camel case
2012-08-02 09:37:24 -04:00
ichuang
727e51411f
small change so that ssl authenticated user can logout to see main screen
2012-08-02 08:59:02 -04:00
ichuang
4a0d0a08db
minor change so that SSL code doesn't interfere with non-nginx instances
2012-08-01 23:37:35 -04:00
ichuang
938871571b
Merge branch 'master' of github.com:MITx/mitx into ExternalAuth
2012-08-01 23:01:29 -04:00
ichuang
a759850e3e
add SSL / MIT certificates auth; clean up external_auth.views
2012-08-01 22:42:06 -04:00
ichuang
7b725a075c
external_auth djangoapps files
2012-08-01 17:57:21 -04:00
ichuang
4874fa51ef
remove cruft from student.views
2012-08-01 15:00:27 -04:00
ichuang
10ebcefd54
add openid authentication
2012-08-01 14:59:55 -04:00
Victor Shnayder
58543bd84b
definition and metadata no longer lazy-loaded
...
* get rid of dump to json
* formatting
2012-08-01 11:48:18 -04:00
ichuang
381d247589
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
2012-07-31 21:43:29 -04:00
Victor Shnayder
3cc601b398
Clean up course_info views
...
* catch exceptions and return a 404 if course not found
* add Location.is_valid(), tests
* stub of jumpto/ view.
2012-07-27 16:08:23 -04:00
Matthew Mongeau
8e2ced916f
Add field-error class to field with issues.
2012-07-26 14:06:29 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
Matthew Mongeau
bd9da89fe9
Move press articles to json.
2012-07-25 17:31:34 -04:00
Calen Pennington
8a0270ea2b
Allow for modular css from XModules, and split capa module css out as a test
2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678
Standardize how JS XModules are instantiated
2012-07-24 16:14:04 -04:00
