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

4475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bridger Maxwell
6ce69e28ae Moved the wiki 404 page into the django-wiki project. 2012-08-21 15:58:35 -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
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
Bridger Maxwell
fa3734b6fc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	repo-requirements.txt
 2012-08-21 08:24:29 -04:00
Calen Pennington
b29e547d3d Merge pull request #474 from MITx/kimth/progress-hide 
Kimth/progress hide
 2012-08-20 19:31:14 -07:00
Calen Pennington
27c0104bfb Merge pull request #466 from MITx/feature/victor/html-escape-errors 
html escape errors
 2012-08-20 19:11:38 -07:00
Victor Shnayder
ef2bfac32a Merge branch 'master' of github.com:MITx/mitx 2012-08-20 19:11:58 -04:00
Victor Shnayder
c5aef50701 add test database for new toy course. Trying to fix build 2012-08-20 19:11:47 -04:00
kimth
eaef8c70a7 Lowercase 2012-08-20 18:51:34 -04:00
kimth
7e7247d8bf Don't tabulate hidden chapters and sections in the Progress view 2012-08-20 18:47:18 -04:00
jarv
46c3e8a286 Merge pull request #473 from MITx/feature/pystache_custom 
Remove pystache in favor of our custom version
 2012-08-20 15:05:49 -07:00
David Ormsbee
356fac144b Remove pystache in favor of our custom version 2012-08-20 18:04:37 -04:00
Victor Shnayder
868b076ea7 html escape errors 2012-08-20 17:55:59 -04:00
Bridger Maxwell
c0c23baac5 Removed inactive 'view this revision' button from history page. 2012-08-20 17:23:39 -04:00
Bridger Maxwell
8543f25358 Updated django-wiki version. 2012-08-20 16:51:39 -04:00
jarv
e89a7b67c5 Merge pull request #470 from MITx/jarv/dependency-update 
ensuring pystache>=0.5.2
 2012-08-20 13:46:02 -07:00
John Jarvis
bb80c66ed7 ensuring pystache>=0.5.2 2012-08-20 16:41:48 -04:00
David Ormsbee
d7327651eb Merge pull request #469 from MITx/jarv/dependency-update 
updating dependencies for pystache, networkx, graphviz and removing redu...
 2012-08-20 13:37:57 -07:00
John Jarvis
55251039d9 updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles 2012-08-20 16:35:42 -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
thomasxiii
2f2a4cc6e7 Merge pull request #468 from MITx/feature/kfiedler/courseware-style 
Made save buttons blue, finished remaining askbot bugs, and removed all instances of $mit-red
 2012-08-20 12:53:03 -07: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
Kyle Fiedler
7c824f774f Added styles for save button 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
David Ormsbee
9bde5e7a4b Merge pull request #467 from MITx/bridger/feature/clean_up 
Bridger/feature/clean up
 2012-08-20 12:21:35 -07:00
Bridger Maxwell
9bc5aec01a Fixed up courseware-error view. Moved it to templates/courseware too. 2012-08-20 15:03:55 -04:00
jarv
bc2164e2be Merge pull request #465 from MITx/jarv/repo-requirements-update 
moving all requirements that use a repo to repo-requirements.txt includi...
 2012-08-20 11:56:29 -07:00
Bridger Maxwell
0ac5ded095 Moved the course template pages to be templates/courseware/ 2012-08-20 14:54:23 -04:00
John Jarvis
1a2cdea966 removing dupe 2012-08-20 14:24:39 -04: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
John Jarvis
5f72e0c7a0 moving all requirements that use a repo to repo-requirements.txt including github requirements 2012-08-20 14:05:51 -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
Bridger Maxwell
92a293f07e Removed profile info from Profile page and renamed it to Progress. 2012-08-20 13:50:28 -04:00
kimth
9852a581f0 Adjust comments 2012-08-20 13:43:55 -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
Victor Shnayder
55b1a59c40 hack item errors for now 2012-08-20 11:41:56 -04:00
Kyle Fiedler
e61b6842ec removed h2 column 2012-08-20 11:32:29 -04:00