kimth
7e7247d8bf
Don't tabulate hidden chapters and sections in the Progress view
2012-08-20 18:47:18 -04:00
ichuang
e3ecd22fa0
github IPs in lms.envs.common; made create_user, create_groups,
...
manage_course_groups management commands (in lms_migration)
2012-08-20 18:38:05 -04:00
Rocky Duan
0b3e9909a4
Merge branch 'master' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/static/coffee/src/discussion/content.coffee
requirements.txt
2012-08-20 15:35:31 -07:00
Rocky Duan
8684ae29b2
Merge branch 'master' of github.com:MITx/mitx into refactor
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 15:31:51 -07:00
Rocky Duan
dc599c469f
fixed test
2012-08-20 15:26:07 -07:00
Rocky Duan
f82c2e00d1
simplified mustache helper loading
2012-08-20 15:24:19 -07:00
Tom Giannattasio
88d514e28d
fixed merge conflict in extends
2012-08-20 18:15:09 -04:00
Tom Giannattasio
3ffcb2615f
fix merge conflicts
2012-08-20 18:07:32 -04:00
Tom Giannattasio
a1ff34571e
sequence nav changes were lost?! temporary fix
2012-08-20 18:01:57 -04:00
Tom Giannattasio
ee92ba0752
new sequence nav; new courseware sidebar; new textbook styling; fixed gradebook glitch
2012-08-20 17:56:51 -04:00
Victor Shnayder
868b076ea7
html escape errors
2012-08-20 17:55:59 -04:00
David Ormsbee
b6dfa50a73
Adjust settings so we can change the comments service URL from Django config
2012-08-20 17:33:45 -04:00
Bridger Maxwell
c0c23baac5
Removed inactive 'view this revision' button from history page.
2012-08-20 17:23:39 -04:00
Bridger Maxwell
46d2e71ac1
Fixed bug in breadcrumbs.
2012-08-20 16:24:12 -04:00
Bridger Maxwell
d31f0c9f06
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
...
Conflicts:
requirements.txt
2012-08-20 16:10:17 -04:00
Victor Shnayder
cc1dd65eb0
Merge branch 'master' of github.com:MITx/mitx
2012-08-20 16:04:41 -04:00
Victor Shnayder
5f612c7819
Oops. Make modx_dispatch and xqueue callback work again.
...
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
2012-08-20 16:04:16 -04:00
Rocky Duan
af17ba7a79
removed dependency on datehelper
2012-08-20 12:57:23 -07:00
Tom Giannattasio
0f6c31b4bd
started courseware sidebar styling
2012-08-20 15:51:10 -04:00
Kyle Fiedler
20d9e6e86d
Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red
2012-08-20 15:45:05 -04:00
Calen Pennington
de4abe300b
Merge pull request #464 from MITx/kimth/textbook
...
Kimth/textbook
2012-08-20 12:38:14 -07:00
Calen Pennington
259e21364f
Merge pull request #461 from MITx/feature/victor/multi-run-policy
...
Keep each course's descriptors separate
2012-08-20 12:35:55 -07:00
Rocky Duan
7b5e66b68f
python code for time_ago_in_words is unnecessary now
2012-08-20 12:05:02 -07:00
Rocky Duan
348a7b6eb7
render time ago in front end
2012-08-20 12:04:25 -07:00
Bridger Maxwell
9bc5aec01a
Fixed up courseware-error view. Moved it to templates/courseware too.
2012-08-20 15:03:55 -04:00
Rocky Duan
71df263ff9
disable all course db related signals
2012-08-20 11:57:58 -07:00
Bridger Maxwell
0ac5ded095
Moved the course template pages to be templates/courseware/
2012-08-20 14:54:23 -04:00
Rocky Duan
1f50da8814
fixed discussion permission test
2012-08-20 11:41:36 -07:00
Rocky Duan
b4039fe89d
Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int
...
Conflicts:
requirements.txt
2012-08-20 11:41:19 -07:00
Bridger Maxwell
ee3f46fd30
Changed titles on course pages.
2012-08-20 14:19:47 -04:00
Bridger Maxwell
5b38f9d4ac
Removed empty sidebar from Progress page.
2012-08-20 14:15:41 -04:00
Bridger Maxwell
1159b14b0d
Merge branch 'master' of github.com:MITx/mitx
2012-08-20 14:08:48 -04:00
Bridger Maxwell
70c7ee42ed
Fixed tests from profile->progress rename.
2012-08-20 14:08:42 -04:00
thomasxiii
38f96b72a1
Merge pull request #463 from MITx/feature/kfiedler/courseware-style
...
Feature/kfiedler/courseware style
2012-08-20 10:58:46 -07:00
Tom Giannattasio
16190843e7
started reworking sidebar styles
2012-08-20 13:56:51 -04:00
Bridger Maxwell
92a293f07e
Removed profile info from Profile page and renamed it to Progress.
2012-08-20 13:50:28 -04:00
kimth
c084745290
Textbook TOC from S3
2012-08-20 13:32:13 -04:00
Kyle Fiedler
ab28e08591
Added new button classes
2012-08-20 13:22:21 -04:00
Bridger Maxwell
6d30a98f0f
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-20 13:08:35 -04:00
kimth
987d7bcc29
book_url doesn't come from settings
2012-08-20 12:40:34 -04:00
Tom Giannattasio
e9e6b1828e
new header styles
2012-08-20 10:41:34 -04:00
Tom Giannattasio
8b4b1fddb5
added new wrapper styles
2012-08-20 10:15:28 -04:00
Victor Shnayder
f2197227c1
add out-of-date message to check_course
2012-08-20 09:26:16 -04:00
Victor Shnayder
c6c95c63ac
Keep each course's descriptors separate
...
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
change the same module in different ways, it works. Such edits will need to
merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
Update all the call sites
* tests, including a 2nd toy course with same course and org.
2012-08-20 09:26:16 -04:00
Tom Giannattasio
3b02e6a1ee
started new nav styles
2012-08-20 09:02:18 -04:00
Rocky Duan
ff41338cad
refactor attempt
2012-08-19 21:58:36 -07:00
Rocky Duan
d5c2b04c5c
modified mustache template working
2012-08-19 20:43:46 -07:00
David Ormsbee
c7d2e252e2
Fix errors that were preventing collectstatic from running
2012-08-19 22:31:05 -04:00
Bridger Maxwell
3cb677f0e6
Changed default title and content of course wiki page.
2012-08-19 21:19:08 -04:00
David Ormsbee
9fceae7a71
Merge branch 'master' into feature/bk_forum_int
2012-08-19 21:14:17 -04:00
