Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,345 Commits 1 Branch 0 Tags
1bd790fabb1805e5969a3f2e4ca4cb8f2e468686
Commit Graph

1119 Commits

Author SHA1 Message Date
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
e47f3ccf35 added CodeMirror styles for the circuit editor 2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb added Code Mirror styles 2012-08-17 15:10:24 -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
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -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
Tom Giannattasio
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04: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
Kyle Fiedler
24ed4a4dae MAnage images 2012-08-16 12:06:20 -04:00
Calen Pennington
919b3e2137 Merge pull request #429 from MITx/feature/victor/strip-metadata 
Feature/victor/strip metadata
 2012-08-16 08:52:23 -07:00
Victor Shnayder
691744e359 Use .display_name instead of metadata['display_name'] 
* the former does a fallback if metadata['display_name'] isn't set.
 2012-08-16 11:37:54 -04:00
Kyle Fiedler
7f72004b50 Fix conflicts 2012-08-16 11:33:05 -04:00
Kyle Fiedler
ad7061e41f Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav 2012-08-16 11:33:05 -04:00
kimth
909a368f4a Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 11:27:56 -04:00
kimth
1bb8d9366d Xqueue URL is https not http 2012-08-16 11:27:29 -04:00
Calen Pennington
a3b144045c Merge pull request #427 from MITx/feature/bridger/new_wiki 
New wiki installed from pip
 2012-08-16 08:01:39 -07:00
Bridger Maxwell
c4b362ca71 Removed old path include for django-wiki. 2012-08-16 10:56:33 -04:00
Bridger Maxwell
337f109af7 Moved django-wiki submodule to be a pip install from git. 2012-08-16 10:54:34 -04: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
Calen Pennington
e60f2e3d3d Merge pull request #422 from MITx/kimth/sjsu 
Don't display 'None points' on problem rendering
 2012-08-16 07:14:28 -07:00
thomasxiii
1a8e5485eb Merge pull request #416 from MITx/feature/kfiedler/askbot 
Fix all of askbots style
 2012-08-16 07:02:39 -07:00
kimth
da9a4710ce Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 09:38:25 -04:00
Bridger Maxwell
326a0f61c1 Updated django-wiki submodule. 2012-08-15 23:43:05 -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
8fb83ee33c Added django-wiki as a submodule. 2012-08-15 23:01:06 -04:00
Bridger Maxwell
2b29c95266 Added template for inline preview. 2012-08-15 21:47:26 -04:00
Bridger Maxwell
262a49a6da Permissions on root article no longer allow students to edit it. 2012-08-15 21:47:08 -04:00
Bridger Maxwell
48e9dc8031 Added bootstrap-modal for the wiki preview modals. 2012-08-15 20:07:05 -04:00
Bridger Maxwell
a163b486ac Fixed up course_nav to swizzle url reversing too. 2012-08-15 19:34:42 -04:00
Bridger Maxwell
e76be095e9 Middleware for changing redirects to stay in course wiki. 2012-08-15 18:54:22 -04:00
Bridger Maxwell
0d28d286e2 Added creation of Site() object on wiki load. 2012-08-15 18:54:01 -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
kimth
58932bb2f7 Drop import of re 2012-08-15 15:23:14 -04:00
kimth
3c1e67e339 Merge master 2012-08-15 15:19:08 -04:00
Calen Pennington
13b9e58f8f Merge pull request #419 from MITx/feature/url_based_course_lists 
URL based course lists
 2012-08-15 12:07:02 -07:00
Calen Pennington
213e3cdc7c Merge pull request #418 from MITx/feature/victor/strip-metadata 
Feature/victor/strip metadata
 2012-08-15 12:01:58 -07:00
kimth
02d970c31e Map '/course/' urls to the course's root in the multicourse hierarchy 2012-08-15 14:45:12 -04:00