Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
410335edb8 Merge pull request #528 from MITx/jarv/maintenance 
adding maintenance static data
 2012-08-23 05:40:01 -07:00
John Jarvis
f0b60fed10 adding maintenance static data 2012-08-23 08:30:04 -04:00
Tom Giannattasio
cf2f5d2af2 Merge branch 'master' into feature/tomg/fall-design 2012-08-23 08:24:58 -04:00
Tom Giannattasio
163eb9d49f fixed bottom sequence nav buttons and firefox outling bug 2012-08-23 08:24:54 -04:00
David Ormsbee
d084506d38 Merge pull request #525 from MITx/feature/arjun/comment_depth 
Limiting depth of comments
 2012-08-23 05:21:02 -07:00
arjun810
ec94d75106 Merge pull request #526 from MITx/feature/forum_config 
Feature/forum config
 2012-08-23 05:07:11 -07:00
David Ormsbee
ec4858801e read the comment service shared key from django config 2012-08-23 08:02:19 -04:00
David Ormsbee
c52dd5faea another unicode fix for forums 2012-08-23 07:59:53 -04:00
Victor Shnayder
d8342255be Merge pull request #519 from MITx/feature/arjun/cs188_css 
cs188 styling
 2012-08-23 04:58:24 -07:00
kimth
b0e418a390 Merge pull request #518 from MITx/feature/arjun/fix_choicegroup 
Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup.
 2012-08-23 04:56:59 -07:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
David Ormsbee
27347fbc87 Merge pull request #524 from MITx/feature/forum_unicode 
Fix error when unicode string is in message viewed in single-thread
 2012-08-23 04:40:59 -07:00
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
Tom Giannattasio
bc005e5f46 adjusted dashboard sidebar to accommodate long emails 2012-08-23 07:29:35 -04: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
Arjun Singh
0757712e4b Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup. This should be done via CSS. This change only affects radiogroup and checkboxgroup as far as changing the behavior goes 2012-08-22 23:11:51 -07:00
Arjun Singh
1c9029c163 cs188 styling 2012-08-22 22:57:14 -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