Rocky Duan
de8c828fb3
changed comment_client module to be imported as cc
2012-08-11 17:42:08 -07:00
Rocky Duan
2848c1fe38
switched to refactored comment_client
2012-08-11 17:36:58 -07:00
ichuang
da64c8f0a1
add xqa interface to staff_problem_info, make staff_debug a modal
...
window, add xqa modal window, add xqa_key to course metadata
2012-08-11 20:12:37 -04:00
Rocky Duan
2d256dfe1d
attempt to fix sort
2012-08-11 16:35:34 -07:00
Rocky Duan
7030d1f1a2
fixed endorse&edit&delete
2012-08-11 14:38:37 -07:00
Rocky Duan
2f469f0f29
Merge branch 'brittany' of github.com:dementrock/mitx into mergedtom
2012-08-10 18:51:18 -07:00
Rocky Duan
39590116f7
make some indentation
2012-08-10 18:51:12 -07:00
Brittany Cheng
78ca885b05
fix comment styles
2012-08-10 18:42:07 -07:00
Rocky Duan
66beb54739
Merge branch 'brittany' of github.com:dementrock/mitx into lol
2012-08-10 17:59:28 -07:00
Rocky Duan
ab6cf914a0
Merge branch 'brittany' of github.com:dementrock/mitx into lol
...
Conflicts:
lms/templates/discussion/_thread.html
2012-08-10 17:59:19 -07:00
Brittany Cheng
5b6e3997af
fixed ul courseware
2012-08-10 17:58:18 -07:00
Rocky Duan
86b53bb248
uh
2012-08-10 17:53:22 -07:00
Brittany Cheng
f44358ab78
merge tom's styles
2012-08-10 17:52:07 -07:00
kimth
d41f709c92
Moved xqueue_callback URLs into the course
2012-08-10 18:51:35 -04:00
Bridger Maxwell
e462fad367
Converted wiki edit page and breadcrumbs.
2012-08-10 18:15:21 -04:00
ichuang
f6e84e84da
SECURE_PROXY_SSL_HEADER for django-1.4 in envs/dev_ike for nginx ssl proxy
2012-08-10 16:24:32 -04:00
ichuang
b159eb4825
add feature flag to disable login button (for systems which autologin)
2012-08-10 15:57:41 -04:00
ichuang
f99eb930ac
new static/admin files for django 1.4 admin
2012-08-10 15:25:42 -04:00
ichuang
dade6dd182
askbot template loader is broken - breaks admin view; disable in dev_ike.py
2012-08-10 15:25:42 -04:00
ichuang
411e77e19d
ModuleSystem should get its DEBUG set from settings.DEBUG in module_render
2012-08-10 15:25:42 -04:00
ichuang
2e4f21ee3b
replace_static_urls should only be run once (currently twice, eg if
...
html is in a veritical)
2012-08-10 15:25:41 -04:00
Victor Shnayder
38a89e9f1a
Make courseware navigation work again.
...
* bodyclass block got accidentally deleted
2012-08-10 14:51:47 -04:00
Bridger Maxwell
3f4c4d7487
Got most of the wiki article page working. It shows the article menu now.
2012-08-10 14:46:53 -04:00
David Ormsbee
b3676cd760
Add replication tests
2012-08-10 14:43:43 -04:00
Calen Pennington
310788ca08
Merge pull request #384 from MITx/feature/tomg/fall-design
...
fixed course name title bar bug
2012-08-10 10:05:59 -07:00
Tom Giannattasio
538185173a
added truncation for super long titles
2012-08-10 11:48:07 -04:00
Victor Shnayder
6882b4b53d
responding to review comments on #383
2012-08-10 11:42:54 -04:00
Tom Giannattasio
c6d5d4aaae
fixed instructor tab active state
2012-08-10 11:42:54 -04:00
Victor Shnayder
a6148856b2
make the tests work around the 404 bug
2012-08-10 11:42:54 -04:00
Victor Shnayder
c3814a81fd
In-progress auth tests
...
* need to actually return 404 codes to clients when DEBUG=False
* add option to make nose more verbose and drop to pdb on error
2012-08-10 11:42:54 -04:00
Victor Shnayder
8e364e6d45
ensure float when computing module score
2012-08-10 11:42:54 -04:00
Victor Shnayder
c9fd7b22a0
Add instructor dashboard
...
* dashboard links to gradebook and dummy grade summary page
2012-08-10 11:42:53 -04:00
Victor Shnayder
43d6948f02
Fix links to student profile pages from gradebook
2012-08-10 11:42:53 -04:00
Victor Shnayder
1903a66bea
Style cleanup in gradebook
...
* don't display thousands of '%' characters
* s/percentage/fraction/, since that's what it is
2012-08-10 11:42:53 -04:00
Victor Shnayder
15a4db1774
Only show enrolled students in course gradebook
...
* also added todo about need for pagination
2012-08-10 11:42:53 -04:00
Victor Shnayder
2005492f7f
Remove noisy debug message
...
* also adds a comment to lms/urls.py
2012-08-10 11:41:05 -04:00
Tom Giannattasio
022c65a6b4
fixed class name header bug
2012-08-10 11:40:16 -04:00
Bridger Maxwell
45baccae85
Added a django template loader that can return Mako templates. Started pulling in new wiki.
2012-08-10 11:31:29 -04:00
Calen Pennington
5f44b08f9c
Merge pull request #382 from MITx/feature/victor/check-access-control
...
Did a quick security scan through views.
2012-08-10 07:59:24 -07:00
Victor Shnayder
8740ba8837
Did a quick security scan through views.
...
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
2012-08-10 10:43:20 -04:00
Calen Pennington
1f1a87d970
Merge pull request #379 from MITx/feature/victor/keep-accordion-state
...
Make accordion remember state
2012-08-10 07:15:57 -07:00
Calen Pennington
e29feb089a
Merge pull request #377 from MITx/feature/tomg/fall-design
...
wayfinding style changes
2012-08-10 05:51:50 -07:00
David Ormsbee
165d5dcfd3
add config files for running different server groups in dev
2012-08-10 02:02:44 -04:00
David Ormsbee
0d824c6c02
Move modx_dispatch URL calls into the course
2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a
Make accordion remember state
...
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
2012-08-09 19:47:08 -04:00
Mike Chen
2a9bf1a115
Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground
2012-08-09 14:46:01 -04:00
Tom Giannattasio
ced521c17d
cleaned up textbook nav styles
2012-08-09 14:44:50 -04:00
Mike Chen
efad5632d8
set invisible instead of remove to preserve space of voting arrows when voting is disabled
2012-08-09 13:03:28 -04:00
David Ormsbee
b78c038bf2
Merge pull request #375 from MITx/dormsbee/new_jobs
...
Dormsbee/new jobs
2012-08-09 10:00:14 -07:00
Mike Chen
3ae1de5ed9
Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground
2012-08-09 12:52:15 -04:00
