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

5210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Giannattasio
a2372e659c Merge branch 'master' into feature/tomg/fall-design 2012-08-23 10:04:17 -04:00
David Ormsbee
7d7b5be95a Merge pull request #531 from MITx/feature/arjun/fix_discussion_sync 
Feature/arjun/fix discussion sync
 2012-08-23 07:04:02 -07:00
Tom Giannattasio
2c1571d66c applied line height to course content wrapper to avoid strange line heights with improper markup 2012-08-23 10:04:00 -04:00
Arjun Singh
a075cc79fd remove stray import 2012-08-23 06:50:16 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
David Ormsbee
0a6f5567e1 Merge pull request #530 from MITx/rocha/fix-for-https-video-player 
Retrieving video information from YouTube using https instead of http.
 2012-08-23 06:30:41 -07:00
jarv
ba3df747cc Merge pull request #529 from MITx/feature/cale/heartbeat-waits-for-courses 
Make heartbeat url wait for courses to be loaded
 2012-08-23 06:25:31 -07:00
Carlos Andrés Rocha
ad2fff2900 Retrieving video information from YouTube using https instead of http. 2012-08-23 09:24:51 -04:00
Calen Pennington
5af67c1bf2 Put course location urls in heartbeat page, rather than lists 2012-08-23 09:19:26 -04:00
Calen Pennington
57444bdd25 Make heartbeat url wait for courses to be loaded 2012-08-23 09:16:40 -04:00
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