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

5167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
f4e75f5c39 Add subdomain_branding key to aws settings 2012-08-23 06:30:43 -04:00
David Ormsbee
e347c98e12 Merge pull request #517 from MITx/feature/fix_discussions_with_dashes 
change url regexp to handle discussions in coursenames with dashes
 2012-08-22 22:18:24 -07:00
David Ormsbee
e3cdad0d2b change url regexp to handle discussions in coursenames with dashes 2012-08-23 01:17:49 -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
David Ormsbee
79b0ff62a5 Merge pull request #512 from MITx/feature/rocky/discussion 
fixed recent threads & tags links
 2012-08-22 21:33:07 -07:00
David Ormsbee
53c3d60ef1 Do JS fix for collectstatic that we had on main for discussion's index.html 2012-08-23 00:32:45 -04:00
David Ormsbee
2d67a4c0f4 Merge branch 'master' into feature/rocky/discussion 2012-08-23 00:28:04 -04:00
David Ormsbee
daf33dbcd9 Merge pull request #514 from MITx/feature/arjun/customize_info_sidebar 
adding the ability to override the sidebar name
 2012-08-22 21:23:14 -07:00
David Ormsbee
972837a954 Merge pull request #510 from MITx/kimth/blog-link-fix 
Blog link fix
 2012-08-22 21:22:29 -07:00
David Ormsbee
8e560688ae Merge pull request #516 from MITx/feature/fix_backbone_js 
Feature/fix backbone js
 2012-08-22 21:21:59 -07:00
David Ormsbee
32403fb2a2 Put dev.py's DEBUG back to True (cough) 2012-08-23 00:21:35 -04:00
David Ormsbee
af079a9362 Fix coffee includes for discussion forum. 2012-08-23 00:19:55 -04:00
Arjun Singh
cd1bc95efe adding the ability to override the sidebar name 2012-08-22 20:40:59 -07:00
David Ormsbee
cdc8e02aeb Add discussion coffee scripts to courseware js so we don't add a dependency on Backbone to non-courseware JS 2012-08-22 23:34:03 -04:00
David Ormsbee
4e7ba6e651 Merge pull request #513 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-22 20:18:36 -07:00
Rocky Duan
0e21ed030c removed new post button & added recent threads to single thread page 2012-08-22 19:22:35 -07:00
Rocky Duan
43ef4f6482 fixed recent threads & tags links 2012-08-22 19:09:58 -07:00
Bridger Maxwell
82ebc14bd6 Fixed inline circuit editing to only work if 'circuit-schematic' is at the beginning of a line. 2012-08-22 21:15:52 -04:00
Bridger Maxwell
e7732bf32f Wiki directory links now go to the article, with a smaller link for viewing sub-listings. 2012-08-22 21:05:17 -04:00
David Ormsbee
99614ea302 Merge pull request #511 from MITx/feature/dave/forum_fixes 
Forum refactoring/fixes
 2012-08-22 17:55:07 -07:00
kimth
3105ff3c41 Blog link fix 2012-08-22 20:33:51 -04:00
David Ormsbee
baa6eadfb5 Merge branch 'master' into feature/dave/forum_fixes 2012-08-22 20:30:49 -04:00
David Ormsbee
3fa5205780 Merge pull request #509 from MITx/feature/victor/better-courseware-errors 
Feature/victor/better courseware errors
 2012-08-22 17:22:32 -07:00
Victor Shnayder
1b25433a39 Allow error-template-rendering errors to propagate to top-level 500 handler 
* hopefully won't come up, but if they do, our 500 page
  should be better than  HttpResponse("There was an unrecoverable error")
 2012-08-22 20:21:10 -04:00
Victor Shnayder
44ee0200a5 Fix undefined variables if LMS_MIGRATION was off 2012-08-22 20:19:58 -04:00
Bridger Maxwell
a792c5a83a Fixed wiki bug with 500 errors for empty dir listing. 2012-08-22 20:16:35 -04:00
Bridger Maxwell
9cd69e6ccd Added ability for staff users to moderate an article. 2012-08-22 20:03:30 -04:00
David Ormsbee
aeee2791ea Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes 
Conflicts:
	lms/lib/comment_client/utils.py
	lms/templates/discussion/mustache/_content.mustache
 2012-08-22 20:00:06 -04:00
David Ormsbee
2e39131b31 Tiny fix to handle when data_or_params isn't passed in 2012-08-22 19:16:28 -04:00
Rocky Duan
952c9d56cf moved some stuff 2012-08-22 15:57:04 -07:00
Rocky Duan
ee21751848 Merge branch 'merge' 2012-08-22 15:52:00 -07:00
Rocky Duan
631aaaf5ba removed unnecessary file 2012-08-22 15:51:45 -07:00
Rocky Duan
05d28200ef Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 15:51:08 -07:00
David Ormsbee
ebf971fad3 Profiles and permalinks both appear to be broken, so disabling both for now 2012-08-22 18:22:50 -04:00
David Ormsbee
3913427c6a Merge pull request #507 from MITx/kimth/fix_syllabus 
Quick workaround on syllabus_present that broke staging
 2012-08-22 14:51:31 -07:00
kimth
0d689b3164 Quick workaround on syllabus_present that broke staging 2012-08-22 17:50:21 -04:00
Rocky Duan
908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 14:11:44 -07:00
David Ormsbee
ca36fb6792 Merge pull request #506 from MITx/feature/tomg/fall-design 
additional firefox bug
 2012-08-22 14:11:31 -07:00
Rocky Duan
3cbaba1961 fixed autosubscribe 2012-08-22 14:11:19 -07:00
Tom Giannattasio
c1befd5fd4 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 17:06:03 -04:00
Tom Giannattasio
1a7b5b8564 fixed tutorial sequence nav bug 2012-08-22 17:05:42 -04:00
Rocky Duan
3b76fe16d8 make inline page working 2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/envs/dev.py
 2012-08-22 14:04:34 -07:00
David Ormsbee
fafbe41644 Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack 
Enrollment hack for allowing Berkeley to add their students.
 2012-08-22 13:59:07 -07:00
Calen Pennington
e206bf2ffc Merge pull request #505 from MITx/feature/tomg/fall-design 
Feature/tomg/fall design
 2012-08-22 13:34:39 -07:00
Piotr Mitros
69a3ea63bc Fixed minor issues (removed two unnecessary lines) 2012-08-22 16:32:14 -04:00
David Ormsbee
3b24ae1068 Merge pull request #501 from MITx/kimth/autodisable-syllabus 
Dynamically disable syllabus per-course
 2012-08-22 13:15:24 -07:00
Piotr Mitros
3777cd2f5e Added missing file 2012-08-22 16:15:24 -04:00
David Ormsbee
c86ee73bd8 Merge pull request #504 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-22 13:13:33 -07:00
Tom Giannattasio
a05cf05462 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 16:09:30 -04:00