Brittany Cheng
7d414346d6
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-08-02 14:21:15 -04:00
Brittany Cheng
b47edaa9c9
styles
2012-08-02 14:21:09 -04:00
ichuang
dff380e807
cleanup lms urls (remove cruft from debugging openid)
2012-08-02 14:19:56 -04:00
Victor Shnayder
95e139f39b
Merge pull request #336 from MITx/feature/victor/xml-verify
...
Feature/victor/xml verify
2012-08-02 11:12:43 -07:00
ichuang
10b2c212b6
fix javascript for signup modal .click() in index.html for safari
2012-08-02 13:52:25 -04:00
ichuang
46bc7bc499
remove unnecessary hidden fields
2012-08-02 13:44:37 -04:00
Victor Shnayder
26ae88faac
Factor out get_item_error() into a new ModuleStoreBase class
...
* may be temporary if we move errors into the items themselves.
2012-08-02 13:41:54 -04:00
ichuang
a7103ff893
switch to PascalCase, remove unnecessary assignment
2012-08-02 13:39:12 -04:00
Calen Pennington
477b7062d4
Merge pull request #335 from MITx/feature/cale/cms-no-roundtrip
...
Only import from github when changes are made, rather than exporting. Th...
2012-08-02 10:39:01 -07:00
ichuang
3eff9ffecd
match external_domain as well when retrieving ExternalAuthMap objects
2012-08-02 13:28:52 -04:00
Rocky Duan
de2f48b3bf
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-02 12:55:09 -04:00
Rocky Duan
0f3f5de66f
Merge branch 'master' into discussion2
2012-08-02 12:54:38 -04:00
Rocky Duan
f1b3f69656
retrieve threads by ajax
2012-08-02 12:54:09 -04:00
Brittany Cheng
2d54aa07f3
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-02 11:55:28 -04:00
Brittany Cheng
907e763606
sort styles
2012-08-02 11:55:21 -04:00
David Ormsbee
73fb8f5464
Merge branch 'hotfix/1.0.3'
...
Conflicts:
lms/urls.py
2012-08-02 11:51:50 -04:00
David Ormsbee
8148b01680
Merge branch 'hotfix/1.0.3' into stable
2012-08-02 11:38:46 -04:00
Victor Shnayder
64346d727b
todos and comments
2012-08-02 11:33:53 -04:00
Victor Shnayder
fd796478d8
add a handy supertrace script
2012-08-02 11:33:04 -04:00
Rocky Duan
aa29b77715
Merge branch 'master' of github.com:MITx/mitx
2012-08-02 11:05:58 -04:00
Victor Shnayder
31b8270cfb
remove too-clever lazy dictionary
2012-08-02 10:14:35 -04:00
Victor Shnayder
41eca8a0a5
Move files into xmodule module per comment on #326
...
* move html_checker.py
* move stringify.py
* move tests into module
* remove duplicate progress.py
* fix module imports
2012-08-02 10:13:58 -04:00
Brittany Cheng
8febbf249f
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-02 10:06:43 -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
Calen Pennington
a7ae7905ea
Merge pull request #334 from MITx/feature/victor/metadata-inherit
...
Feature/victor/metadata inherit
2012-08-02 06:25:09 -07:00
Calen Pennington
052ae88111
Only import from github when changes are made, rather than exporting. This prevents bugs in the cms from preventing changes via git
2012-08-02 09:19:25 -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
102d4906d0
fix problem with add_histogram (expects module as second argument)
2012-08-01 22:41:27 -04:00
Rocky Duan
efc0cc7ca7
oops
2012-08-01 21:31:06 -04:00
Rocky Duan
e05faef88a
fixed tag url
2012-08-01 21:26:14 -04:00
ichuang
ec78e1a126
add missing trailing slash
2012-08-01 20:19:33 -04:00
Rocky Duan
a8e23dcc53
Merge branch 'master' into discussion2
...
Conflicts:
lms/templates/discussion/_forum.html
lms/templates/discussion/_inline.html
2012-08-01 19:46:52 -04:00
Rocky Duan
9a31d7a9b4
basic sorting
2012-08-01 19:44:07 -04:00
Victor Shnayder
e2ce54612c
remove debugging assert from test
2012-08-01 19:25:47 -04:00
Victor Shnayder
652e2aa24c
fix for inheriting metadata bug
...
* problem was on import to json--got all the metadata,
but didn't preserve the _inherited_metadata
* added own_metadata property, use it instead
2012-08-01 19:25:47 -04:00
Victor Shnayder
b63f05b651
update clean_xml script to use error trackers properly
2012-08-01 19:25:47 -04:00
Victor Shnayder
82899323e8
Add metadata inherit test
...
* also make a placeholder roundtrip export test
2012-08-01 19:25:47 -04:00
Victor Shnayder
2f4bf5f606
Minor fixes to cms
...
* make logging work properly in cms, dev
* fix a comment
2012-08-01 19:25:47 -04:00
Brittany Cheng
b2ddef99be
padding and margins of discussion containers
2012-08-01 18:14:59 -04:00
Brittany Cheng
03d9b7a928
merge kyle's style fixes
2012-08-01 18:09:27 -04:00
Brittany Cheng
ae89aac6ce
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-08-01 18:07:52 -04:00
Brittany Cheng
6c214fc4bd
basic paginator styles
2012-08-01 18:03:36 -04:00
David Ormsbee
eedf62a1a9
Merge pull request #333 from MITx/feature/kfiedler/courseware-style
...
Strip down sequence nav, start to use ems for font size instead of pixels and started to strip down the info page
2012-08-01 14:58:02 -07:00
