Victor Shnayder
d9219c6086
Custom tabs
...
* specify in tabs list in course policy
- active page tracking now done in tabs.py
- properly handle the fact that there may be multiple textbooks
* Still need:
- wiki pages
- (if that's delayed, special-case syllabus support)
2012-09-18 08:45:09 -04:00
Arjun Singh
46d830df13
Merge branch 'master' into feature/arjun/new-discussions
2012-09-14 15:15:21 -07:00
kimth
a40e8eaefb
Clean up widow prevention logic
2012-09-13 18:10:11 -04:00
kimth
5dbc0b7e7a
Fix widow prevent logic
2012-09-13 18:02:46 -04:00
kimth
cf9130a811
Widow prevention should be active when there are actual words
2012-09-13 17:51:25 -04:00
kimth
a9b03483aa
Fix widow js
2012-09-13 17:38:20 -04:00
Kyle Fiedler
c17a9b78f8
fixed empty space below accordion nav items that dont have a subtitle
2012-09-13 13:52:47 -04:00
Tom Giannattasio
021f86a9a8
Merge pull request #669 from MITx/feature/kfiedler/widows
...
Added widow fix for subtitles too
2012-09-13 09:40:03 -07:00
Kyle Fiedler
2b9268ad48
Added widow fix for subtitles too
2012-09-12 16:35:21 -04:00
Kyle Fiedler
2f8a7d0744
Removes unused widowfix script
2012-09-12 12:37:19 -04:00
Tom Giannattasio
841cb9b504
Merge pull request #659 from MITx/feature/kfiedler/widows
...
Remove widows in accordion header
2012-09-12 08:52:32 -07:00
Kyle Fiedler
064b5e7932
Remove widows in accordion header
2012-09-11 11:25:54 -04:00
Arjun Singh
7ad9b39b98
Merge master
2012-09-10 15:33:59 -07:00
ichuang
ccbbb5a993
commit_id may be specified for modulestore reload - for multi-worker configs
...
also show pid in migration and instructor dashboard views for thread debugging
2012-09-09 19:39:11 -04:00
ichuang
ab0a58fb7a
add psychometrics - grade histograms, check time diffs, and IRT plots
2012-09-08 22:31:45 -04:00
Lyla Fischer
9ad9359d48
quick wording change
2012-09-07 15:57:43 -04:00
Victor Shnayder
bbd57ef79b
don't show empty list if there is no error data
2012-09-07 15:10:26 -04:00
David Ormsbee
8312ddf01d
Merge pull request #629 from MITx/feature/victor/save-course-position
...
Feature/victor/save course position
2012-09-07 06:42:48 -07:00
David Ormsbee
bea6db620a
Merge pull request #533 from MITx/feature/halogenandtoast/calculator
...
Put in calculator in courseware
2012-09-06 13:00:09 -07:00
David Ormsbee
39a773616b
Merge pull request #630 from MITx/jarv/update-email
...
Jarv/update email
2012-09-06 08:10:32 -07:00
John Jarvis
517e6ddeda
Contact email address updates
2012-09-06 09:26:52 -04:00
Victor Shnayder
c354a120d8
Track accordion state:
...
- on first visit to courseware, go straight to first section of first chapter
- after, clicking on courseware tab sends you most recent chapter, with a link to the most recent section
(not to section because that might be confusing, and you might want to do something else (e.g. do homework instead of watch videos)
- Moved course errors into instructor tab.
2012-09-05 16:15:53 -04:00
Calen Pennington
4088ac5428
Isolate manual git reload behind a feature flag
2012-09-05 15:16:40 -04:00
David Ormsbee
5e9fce5cae
Merge branch 'master' into feature/halogenandtoast/calculator
2012-09-05 13:58:12 -04:00
Victor Shnayder
f04cd838e5
Integrate csv export of answer distributions with Ike's sweet dashboard
2012-09-05 13:40:29 -04:00
Calen Pennington
54e8819fb1
Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade
...
Upgrade to instructor dashboard
2012-09-05 08:03:55 -07:00
Victor Shnayder
f926925ca6
Add a hide_progress_tab course policy flag
...
- for internal cs50 until we have grade integration set up (only really needed for external version)
2012-09-03 14:12:43 -04:00
ichuang
91dcef7fd0
add gitreload to instructor dashboard
2012-09-02 22:41:27 -04:00
David Ormsbee
5194dc3177
Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums
2012-09-02 22:22:01 -04:00
ichuang
2efe481237
move instructor dashboard into its own lms djangoapp; add new
...
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
David Ormsbee
1a1c5edab4
Completely cosmetic fix to make the indentation clearer.
2012-09-02 16:56:17 -04:00
Ibrahim Awwal
1405cf97fd
Create a new template that inherits from course_navigation.html to avoid repeating the course navigation template and augment it with the new post button.
2012-09-01 21:17:23 -07:00
Matthew Mongeau
8d747e4423
Conditionally show calculator
2012-08-27 10:15:30 -04:00
Matthew Mongeau
80b31f46df
Wip
2012-08-27 09:43:37 -04:00
Rocky Duan
233f817f0b
include discussion js group in coursewar & removed unnecessary code
2012-08-23 01:51:51 -07:00
Arjun Singh
cd1bc95efe
adding the ability to override the sidebar name
2012-08-22 20:40:59 -07:00
Rocky Duan
05d28200ef
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-22 15:51:08 -07:00
kimth
0d689b3164
Quick workaround on syllabus_present that broke staging
2012-08-22 17:50:21 -04:00
Rocky Duan
908a5c5d59
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-22 14:11:44 -07:00
Rocky Duan
3b76fe16d8
make inline page working
2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/envs/dev.py
2012-08-22 14:04:34 -07:00
kimth
f46607710f
Merge master
2012-08-22 15:25:07 -04:00
kimth
960cf5792b
Dynamically disable syllabus per-course
2012-08-22 15:12:49 -04:00
Calen Pennington
2eb0de99eb
Merge pull request #494 from MITx/feature/arjun/course_specific_css
...
Feature/arjun/course specific css
2012-08-22 11:55:20 -07:00
Tom Giannattasio
fb1d9ca06c
Merge branch 'master' into feature/tomg/fall-design
2012-08-22 11:41:19 -04:00
Tom Giannattasio
7d903c4089
sidebar hover and firefox bug fixes
2012-08-22 11:40:59 -04:00
Arjun Singh
a9126aa276
Fixed syllabus to look good with new courseware styling
2012-08-22 05:25:48 -07:00
Arjun Singh
0b6bf77373
Adding a course-specific css class to body so that we can have course-targeted styles as a last resort
2012-08-22 05:00:39 -07:00
Rocky Duan
fd0eff46e7
Merge branch 'feature/rocky/discussion_api_key' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
Tom Giannattasio
bd536f8aec
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 18:13:40 -04:00
