Bridger Maxwell
38a9631659
Updated to use django-wiki with significantly less sql queries.
2012-08-19 17:37:58 -04:00
Rocky Duan
6164c87074
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-19 10:08:00 -07:00
Rocky Duan
80ab2d27a0
fixed comment retrieval
2012-08-19 10:07:31 -07:00
Rocky Duan
b4ec109dac
major refactor of templates
2012-08-19 00:59:43 -07:00
Rocky Duan
e49226e9e1
some refactor
2012-08-19 00:16:04 -07:00
Rocky Duan
0dd5428e24
refactored code to render ajax content
2012-08-18 17:54:43 -07:00
Rocky Duan
238adb1a03
Merge branch 'master' into profile
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/templates/course_navigation.html
2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c
Merge branch 'master' of github.com:MITx/mitx into profile
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00
Bridger Maxwell
1e08164db5
Added MathJax to wiki pages.
2012-08-18 13:12:04 -04:00
Bridger Maxwell
0598a471c1
Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience.
2012-08-18 12:22:50 -04:00
Bridger Maxwell
3fc59b3da5
Added javascript groups to wiki preview modal so circuits show up.
2012-08-18 00:17:20 -04:00
Bridger Maxwell
0fbfaf612f
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-17 17:52:22 -04:00
Tom Giannattasio
a2d0ada82c
styled settings page
2012-08-17 17:01:45 -04:00
Tom Giannattasio
1bd790fabb
finished attachment styles
2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297
added modal functionality for attachments page
2012-08-17 15:59:31 -04:00
ichuang
b6e41dc05c
fix view_tracking_log to show proper timezone
2012-08-17 15:46:09 -04:00
Tom Giannattasio
411fcfd0cd
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-17 14:50:44 -04:00
Tom Giannattasio
1411c0e066
started tweaking upload interface
2012-08-17 14:50:40 -04:00
Bridger Maxwell
b05bace12a
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
...
Conflicts:
lms/templates/wiki/base.html
2012-08-17 14:48:06 -04:00
Tom Giannattasio
e96a5fcbee
started attachments rework
2012-08-17 14:44:27 -04:00
Bridger Maxwell
8595cb24b2
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
...
Conflicts:
lms/templates/wiki/base.html
2012-08-17 14:44:25 -04:00
Tom Giannattasio
f67a356466
added additional bootstrap js files
2012-08-17 14:14:07 -04:00
Tom Giannattasio
b5b5978130
started styling attachments page
2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c
added bootstrap js and other dependencies; tweaked settings template
2012-08-17 09:37:42 -04:00
Bridger Maxwell
df79f84c33
Fixed static includes in wiki django templates.
2012-08-16 19:41:04 -04:00
Tom Giannattasio
b0b10aa598
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-16 17:35:56 -04:00
Bridger Maxwell
2de55d074b
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-16 17:34:38 -04:00
Tom Giannattasio
490eb7a32b
styled changes, new article and delete pages
2012-08-16 17:31:05 -04:00
Matthew Mongeau
409477522b
Add jQuery scrollTo to courseware.
2012-08-16 17:07:43 -04:00
Tom Giannattasio
bb6d6d9ac8
edit page styles
2012-08-16 16:41:41 -04:00
Rocky Duan
730d4d9485
add askbot flag back
2012-08-16 13:40:12 -07:00
Calen Pennington
9118e585cc
Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks
...
Feature/halogenandtoast/multiple textbooks
2012-08-16 09:47:53 -07:00
Calen Pennington
3efea9cbb0
Merge pull request #425 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
Matthew Mongeau
ae09598d9a
Display textbooks in course navigation, handle in urls and views.
2012-08-16 10:31:17 -04:00
Bridger Maxwell
d064d29cd8
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-15 23:01:27 -04:00
Bridger Maxwell
2b29c95266
Added template for inline preview.
2012-08-15 21:47:26 -04:00
Bridger Maxwell
48e9dc8031
Added bootstrap-modal for the wiki preview modals.
2012-08-15 20:07:05 -04:00
kimth
3519ea6b2f
Don't display 'None points' on problem rendering
2012-08-15 17:14:27 -04:00
Tom Giannattasio
13c2bb588e
added styles for main article, sidebar and breadcrumb
2012-08-15 15:59:46 -04:00
Rocky Duan
7335c1529e
show all content in a course in the forum view
2012-08-15 11:21:31 -07:00
Tom Giannattasio
8daea9c465
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-15 13:11:00 -04:00
Tom Giannattasio
abf26dced9
started styles
2012-08-15 13:10:47 -04:00
Bridger Maxwell
4bc4e87a4e
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-15 11:15:21 -04:00
Victor Shnayder
9425bbba60
Address other comment on #413
...
- don't call has_access directly from template, pass a staff_access variable instead
2012-08-15 10:28:08 -04:00
Rocky Duan
00ff1b9419
can retrieve all comments
2012-08-15 01:08:42 -07:00
Rocky Duan
e5fe54ca5d
display active threads with only relevant contents
2012-08-15 00:46:28 -07:00
Victor Shnayder
b782e2ff5d
Make start dates work for all modules
...
* error modules now hidden via access control
* get_module() returns None if user doesn't have access
2012-08-14 23:30:37 -04:00
Victor Shnayder
2df3a6ef11
Big access control refactor
...
* All access control logic is now in access.py
* It exports a single method for general use: has_access(user, object, action)
- possible actions depend on object type (e.g. 'see_exists', 'enroll', 'staff')
* Removed DARK_LAUNCH feature flag--it is now the default behavior
* Replaced check_course with three separate more focused functions that use has_access
Minor things:
* note on using pdb in testing
* moved time parsing helper into timeparse.py
* x_modules now have a .start attribute (None if not in metadata)
2012-08-14 23:30:37 -04:00
Rocky Duan
449d665b00
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-14 17:48:08 -07:00
Rocky Duan
308772500e
fixed permalink
2012-08-14 17:45:09 -07:00
