Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

10188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Fiedler
da87af5351 Fix missplaced k 2012-09-12 16:37:41 -04:00
Kyle Fiedler
2b9268ad48 Added widow fix for subtitles too 2012-09-12 16:35:21 -04:00
Kyle Fiedler
9837acd68f Remove ie sass from wiki 2012-09-12 16:01:39 -04:00
Kyle Fiedler
b6e03c60b6 Added back the ie fixes from before 2012-09-12 16:01:39 -04:00
Kyle Fiedler
1dceff78b5 Fix alignment in tables for ie 2012-09-12 16:01:38 -04:00
David Ormsbee
53d0a6add8 Merge pull request #654 from MITx/feature/victor/fix-trailing-location-url 
make the test ajax_url format consistent with real code
 2012-09-12 12:19:53 -07:00
Sarina
b6b9b15912 Make clear where to specify display_name in xml 2012-09-12 14:58:23 -03:00
Tom Giannattasio
1d71a2cfbd tweaked usernames so they were more prominent throughout 2012-09-12 13:40:11 -04:00
kimth
e3c6477826 Merge branch 'master' into kimth/fix-dynamath-6002x 2012-09-12 13:34:01 -04:00
Victor Shnayder
e47134bd10 turn off psychometrics in dev.py--the necessary migration is not present 2012-09-12 13:20:15 -04:00
Carlos Andrés Rocha
18b5a1f5a2 Temporary fix to get the discussion profile page rendering 2012-09-12 13:20:04 -04:00
kimth
87750f3140 Merge pull request #666 from MITx/bug/kfiedler/tutorial-list-bullets 
removed list bullets from tutorials
 2012-09-12 10:04:08 -07:00
Kyle Fiedler
ec9521a9f5 removed list bullets from tutorials 2012-09-12 13:01:10 -04:00
Kyle Fiedler
2f8a7d0744 Removes unused widowfix script 2012-09-12 12:37:19 -04:00
Tom Giannattasio
032610e801 Merge pull request #660 from MITx/feature/kfiedler/cms-edits 
Added fixes to some style and one Cale fix to get things working properl...
 2012-09-12 08:53:45 -07:00
Tom Giannattasio
ba52523d6d Merge pull request #657 from MITx/bug/kfiedler/histogram 
Removed display none for histogram
 2012-09-12 08:53:07 -07:00
Tom Giannattasio
40eba7f792 Merge pull request #664 from MITx/feature/kfiedler/pressrelease 
Add new press releases
 2012-09-12 08:52:49 -07:00
Tom Giannattasio
841cb9b504 Merge pull request #659 from MITx/feature/kfiedler/widows 
Remove widows in accordion header
 2012-09-12 08:52:32 -07:00
kimth
1f4384265f Merge pull request #658 from MITx/bug/kfiedler/info-title 
info-title margin fixed
 2012-09-12 08:29:04 -07:00
kimth
98ba1ef564 Merge pull request #665 from MITx/bug/kfiedler/sequnce-over-video 
Added fix so that sequnce nave doesn't go over full screen videos
 2012-09-12 08:26:00 -07:00
Matthew Mongeau
1a402f7fda Mark responses and comments as staff 2012-09-12 11:09:36 -04:00
Kyle Fiedler
596d926eac Added fix so that sequnce nave doesn't go over full screen videos 2012-09-12 11:06:01 -04:00
Tom Giannattasio
d1292949be fixed spinner positioning on inline discussions 2012-09-12 11:03:18 -04:00
Kyle Fiedler
05c3e028c2 Added new press releases 2012-09-12 10:38:17 -04:00
Tom Giannattasio
9ef83b0ca5 edit post style clean up 2012-09-12 10:19:25 -04:00
Tom Giannattasio
7098b2e658 cleaned up loading animation in post-list 2012-09-12 10:07:16 -04:00
Tom Giannattasio
87dcd07112 delayed appearance of spinner in thread so things are less jumpy 2012-09-12 10:07:16 -04:00
Tom Giannattasio
d88de52181 fixed jump to top on browse buttons 2012-09-12 09:41:34 -04:00
Tom Giannattasio
ff94541e40 tweaked inline hide/show and new post buttons 2012-09-12 09:41:34 -04:00
Arjun Singh
452414da37 Kill requests for loading responses when selecting another thread. This ensures that the thread you're viewing has the right responses loaded. 2012-09-12 06:13:46 -07:00
Arjun Singh
a900998145 Fix anonymity leak; fix editing when rendering from main page. 2012-09-12 04:32:32 -07:00
Ibrahim Awwal
3bc9c7496c Update discussion setup instructions to clarify that you need to specify a 
course id for seed_permissions_roles, and also the script itself to tell you that.
 2012-09-11 19:15:18 -07:00
Calen Pennington
cb66946175 Merge pull request #663 from MITx/feature/arjun/js_seeds 
make seeds consistent with other responsetypes
 2012-09-11 18:12:11 -07:00
Arjun Singh
bd5fc64462 make seeds consistent with other responsetypes 2012-09-11 18:08:27 -07:00
arjun810
b0e4bebc63 Merge pull request #661 from MITx/kimth/fix-firefox-cktsim 
Fix circuit simulator js for Firefox
 2012-09-11 16:15:55 -07:00
kimth
88e138bfaa Merge pull request #662 from MITx/feature/arjun/fix_seed 
Provide a reasonable seeding mechanism for jsresponses
 2012-09-11 16:15:14 -07:00
kimth
474b5377b9 Consolidate class names 2012-09-11 18:25:08 -04:00
pmitros
025eb4f64c Merge pull request #648 from MITx/feature/ichuang/psychometrics 
Interrim psychometrics with real-time IRT plots and histograms (see note)

Ike is committing to implement the SOA API which discussed in person, in which a separate djangoapp would receive the tracking logs from the LMS, and also be queried by the LMS to perform psychometrics analyses.  Initially this psychometrics djangoapp might share some tables like StudentModule with the LMS, but the plan would be to separate them when possible.  

Ike will implement this for edX by November.
 2012-09-11 15:16:07 -07:00
Arjun Singh
5e4a498cfe Provide a reasonable seeding mechanism for jsresponses 2012-09-11 15:09:49 -07:00
Ibrahim Awwal
1be378e697 Render comment replies properly, and update them after receiving a response. 2012-09-11 14:31:03 -07:00
Ibrahim Awwal
a91a5df499 Use regular javascript attributes for parent reference rather than setting 
Backbone.Model attributes because Model attributes get serialized into
JSON which is wasteful.
 2012-09-11 13:57:51 -07:00
Ibrahim Awwal
f97d4fe983 Add @login_required to forum views so that they redirect to a login page if you're not logged in. 2012-09-11 13:41:30 -07:00
kimth
f35412f3f4 Don't bind update_schematics to global window.onload 2012-09-11 16:29:17 -04:00
Ibrahim Awwal
2c6c64d533 Sort comment replies in chronological order, keeping the parent references. 2012-09-11 13:12:01 -07:00
Carlos Andrés Rocha
2900c169cc Load inline comments templates at render time and not during page load 2012-09-11 15:58:16 -04:00
Kyle Fiedler
7a248f0154 Added fixes to some style and one Cale fix to get things working properly 2012-09-11 14:05:07 -04:00
Bridger Maxwell
5df381e728 Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading 2012-09-11 13:37:54 -04:00
Matthew Mongeau
f4ba65c5d5 Show and hide search correctly. Added loading icon. 2012-09-11 13:30:00 -04:00
Kyle Fiedler
4732e39cb4 info-title margin fixed 2012-09-11 12:09:42 -04:00
Kyle Fiedler
064b5e7932 Remove widows in accordion header 2012-09-11 11:25:54 -04:00