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

5185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
a24fd328d9 Fix error when unicode string is in message viewed in single-thread template 2012-08-23 07:40:18 -04:00
David Ormsbee
dc13ff81b7 Merge pull request #521 from MITx/feature/rocky/loading 
added a loading icon when retrieving ajax
 2012-08-23 04:31:11 -07:00
David Ormsbee
2653690205 Merge pull request #520 from MITx/feature/rocky/discussion 
add user profile and fixed edit
 2012-08-23 04:28:51 -07:00
David Ormsbee
6de0599731 Merge branch 'master' into feature/rocky/discussion 2012-08-23 07:22:49 -04:00
Calen Pennington
22cbc1bdf8 Merge pull request #523 from MITx/feature/cale/aws-subdomain-branding 
Add subdomain_branding key to aws settings
 2012-08-23 03:31:53 -07:00
Calen Pennington
f4e75f5c39 Add subdomain_branding key to aws settings 2012-08-23 06:30:43 -04:00
Rocky Duan
e4890a8bff fixed pluralize 2012-08-23 02:52:51 -07:00
Rocky Duan
f2507d7c52 hide similar post wrapper when no results 2012-08-23 02:51:46 -07:00
Rocky Duan
5d90366917 fixed file uploading 2012-08-23 02:50:26 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
5fb2bbbd7f make similar posts go away when submitted post 2012-08-23 02:03:50 -07:00
Rocky Duan
2b6a0928ca fixed loading for discussion module 2012-08-23 01:55:31 -07:00
Rocky Duan
16ca13f203 Merge branch 'feature/rocky/discussion' into feature/rocky/loading 2012-08-23 01:52:07 -07:00
Rocky Duan
233f817f0b include discussion js group in coursewar & removed unnecessary code 2012-08-23 01:51:51 -07:00
Rocky Duan
abe12ddd7c display loading status 2012-08-23 01:47:47 -07:00
Rocky Duan
74bc232946 fixed discussion title and edit 2012-08-23 00:07:57 -07:00
Rocky Duan
007de179e1 add user profile page back 2012-08-22 23:44:50 -07:00
Rocky Duan
4dae36cd8e only execude code when backbone is defined 2012-08-22 23:44:50 -07:00
Rocky Duan
45431ae789 scroll to top after reloading threads 2012-08-22 23:44:50 -07: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