Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

65 Commits

Author SHA1 Message Date
Bridger Maxwell
a3760d484d Added call to load schematics on wiki pages. 2012-09-13 12:38:28 -04:00
Carlos Andrés Rocha
8b0d1f09e0 Refactored wiki cheatsheet code. 2012-08-27 18:30:38 -04:00
Tom Giannattasio
7b3098edc0 fixed cheatsheet bug on new article page 2012-08-27 11:48:54 -04:00
Tom Giannattasio
9b5285ad8a Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 09:08:48 -04:00
Tom Giannattasio
d1760f9a22 styled markdown modal and link 2012-08-24 16:14:04 -04:00
Bridger Maxwell
8e9211d2dd Re-enabling link to wiki 'see all children'. The bug for which this was disabled is already fixed. 2012-08-24 14:04:17 -04:00
Carlos Andrés Rocha
d94ef54549 Added cheatsheet popup to wiki editor. 2012-08-23 16:30:58 -04:00
Victor Shnayder
c0372c2529 fix (aka de-feature) the "see all children" link on the wiki 2012-08-23 00:40:23 -04:00
Bridger Maxwell
9cd69e6ccd Added ability for staff users to moderate an article. 2012-08-22 20:03:30 -04:00
Kyle Fiedler
cca5fe2f04 Delete page 2012-08-22 15:40:56 -04:00
Kyle Fiedler
f4f8b7bf73 Added delete page and padding and hid th on overflow 2012-08-22 15:39:24 -04:00
Kyle Fiedler
7464332180 added fix for error styles and swapped some the button order 2012-08-22 15:09:20 -04:00
Kyle Fiedler
d0c92aa159 Added styles for the wiki directory 2012-08-22 14:43:03 -04:00
Bridger Maxwell
14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/settings.html
 2012-08-22 13:09:42 -04:00
Bridger Maxwell
723519ee74 Removed wiki/settings.html so the default one will be used. 2012-08-22 00:55:03 -04:00
Bridger Maxwell
a285d1a60e Updated wiki preview template and django-wiki version. 2012-08-22 00:07:37 -04:00
Bridger Maxwell
82d414690b Updated to latest version of django-wiki with lots of deletion fixes. Removed child article list until it can be styled. 2012-08-21 22:23:40 -04:00
Bridger Maxwell
41831654ee Added link to see wiki attachment history. 2012-08-21 17:44:38 -04:00
Bridger Maxwell
954ee6ab1f Added link to list children of an article. Upgraded django-wiki version. 2012-08-21 17:09:24 -04:00
Bridger Maxwell
6ce69e28ae Moved the wiki 404 page into the django-wiki project. 2012-08-21 15:58:35 -04:00
Tom Giannattasio
557975458c Merge branch 'master' into feature/tomg/fall-design 2012-08-21 14:50:15 -04:00
Kyle Fiedler
57586caaff Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-21 13:55:14 -04:00
Kyle Fiedler
f68a97a63f Added changes to wiki 404 and fixed CMS Sass 2012-08-21 13:54:58 -04:00
Tom Giannattasio
4e6d7babcc fixed wiki bugs; started sequence nav bugs 2012-08-21 12:51:33 -04:00
Bridger Maxwell
cb5e277422 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-21 12:00:13 -04:00
Bridger Maxwell
cfe553304c Removed link to wiki settings until we have a better integration with notifications. 2012-08-21 12:00:05 -04:00
Kyle Fiedler
63900ef425 Added new wiki 404 page 2012-08-21 11:55:30 -04:00
Tom Giannattasio
fafb443484 fixed wiki styles 2012-08-21 09:24:55 -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
Bridger Maxwell
0ac5ded095 Moved the course template pages to be templates/courseware/ 2012-08-20 14:54:23 -04:00
Bridger Maxwell
cdfeeb0cf1 Hid wiki search bar, because it isn't implemented yet. 2012-08-19 19:41:49 -04:00
Bridger Maxwell
03288193bb Wiki create button now creates article in class wiki (never in a child of a class wiki). 2012-08-19 19:40:42 -04:00
Bridger Maxwell
38a9631659 Updated to use django-wiki with significantly less sql queries. 2012-08-19 17:37:58 -04: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
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
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