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

951 Commits

Author SHA1 Message Date
kimth
5b413aa5da Merge pull request #681 from MITx/bug/kfiedler/empty-subtitle 
fixed empty space below accordion nav items that dont have a subtitle
 2012-09-13 12:45:02 -07:00
David Ormsbee
889dc9959f Merge pull request #675 from MITx/feature/kfiedler/last-press-release 
Added one last press release
 2012-09-13 11:54:10 -07:00
David Ormsbee
4a4b4a5c56 Merge pull request #679 from MITx/feature/bridger/wiki_fixes 
Feature/bridger/wiki fixes
 2012-09-13 11:53:52 -07:00
Kyle Fiedler
c17a9b78f8 fixed empty space below accordion nav items that dont have a subtitle 2012-09-13 13:52:47 -04:00
Tom Giannattasio
021f86a9a8 Merge pull request #669 from MITx/feature/kfiedler/widows 
Added widow fix for subtitles too
 2012-09-13 09:40:03 -07:00
Bridger Maxwell
a3760d484d Added call to load schematics on wiki pages. 2012-09-13 12:38:28 -04:00
Bridger Maxwell
b4142246fe Added ie fixes stylesheet to main_django.html. Cleaned up whitespace to more closely match main.html. 2012-09-13 11:39:32 -04:00
kimth
7f67e9a060 Merge pull request #668 from MITx/bug/kfiedler/ie 
Fix IE bugs including schematic editor text alignment
 2012-09-13 08:20:11 -07:00
Kyle Fiedler
67547e2b09 Added one last press release 2012-09-13 10:19:45 -04:00
Carlos A. Rocha
e0c7cef65f Workaround for swfobject - pipeline problems 2012-09-13 01:38:52 -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
2f8a7d0744 Removes unused widowfix script 2012-09-12 12:37:19 -04: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
Kyle Fiedler
05c3e028c2 Added new press releases 2012-09-12 10:38:17 -04:00
Kyle Fiedler
064b5e7932 Remove widows in accordion header 2012-09-11 11:25:54 -04:00
ichuang
ccbbb5a993 commit_id may be specified for modulestore reload - for multi-worker configs 
also show pid in migration and instructor dashboard views for thread debugging
 2012-09-09 19:39:11 -04:00
ichuang
2045500c6e make external_auth table searchable in django admin; fix 
missed instance of login link which should have been behind DISABLE_LOGIN_BUTTON
 2012-09-08 23:21:34 -04:00
ichuang
ab0a58fb7a add psychometrics - grade histograms, check time diffs, and IRT plots 2012-09-08 22:31:45 -04:00
Lyla Fischer
9ad9359d48 quick wording change 2012-09-07 15:57:43 -04:00
Victor Shnayder
bbd57ef79b don't show empty list if there is no error data 2012-09-07 15:10:26 -04:00
Kyle Fiedler
bce61cd6e5 Revert "Merge pull request #642 from MITx/bug/kfiedler/ie" 
This reverts commit 2b5e8a4944, reversing
changes made to db0549be78.
 2012-09-07 14:18:34 -04:00
Kyle Fiedler
4d4e5824cd Change form style for login and signup modals so it is consistant in every browser and we have no usability problems 2012-09-07 13:29:49 -04:00
Kyle Fiedler
aec8cc42dc Add ie fix for wiki 2012-09-07 12:59:30 -04:00
David Ormsbee
db0549be78 Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors 
Feature/ibrahim/discussion distinguish instructors
 2012-09-07 06:52:15 -07:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position 
Feature/victor/save course position
 2012-09-07 06:42:48 -07:00
Carlos Andrés Rocha
fc793b94fc Added proctored exams news to the frontpage 2012-09-06 16:33:10 -04:00
Carlos Andrés Rocha
11399d6031 Added protored exam press release page 2012-09-06 16:06:57 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator 
Put in calculator in courseware
 2012-09-06 13:00:09 -07:00
John Jarvis
587725ee61 more template updates to rename MITx to edX 2012-09-06 15:12:19 -04:00
David Ormsbee
39a773616b Merge pull request #630 from MITx/jarv/update-email 
Jarv/update email
 2012-09-06 08:10:32 -07:00
John Jarvis
517e6ddeda Contact email address updates 2012-09-06 09:26:52 -04:00
John Jarvis
26ff14172c Email update for module-error template 2012-09-06 09:24:20 -04:00
kimth
d3cd85d81f Merge pull request #627 from MITx/feature/kfiedler/problems 
Style changes to problems
 2012-09-05 16:06:16 -07:00
Victor Shnayder
c354a120d8 Track accordion state: 
- on first visit to courseware, go straight to first section of first chapter
- after, clicking on courseware tab sends you most recent chapter, with a link to the most recent section
  (not to section because that might be confusing, and you might want to do something else (e.g. do homework instead of watch videos)
- Moved course errors into instructor tab.
 2012-09-05 16:15:53 -04:00
Calen Pennington
4088ac5428 Isolate manual git reload behind a feature flag 2012-09-05 15:16:40 -04:00
Kyle Fiedler
7c8838a6b2 Added some different style for the select problems 2012-09-05 15:02:50 -04:00
Kyle Fiedler
f785f6f8a1 Added some nicer styles for dynamic math 2012-09-05 14:24:12 -04:00
Kyle Fiedler
8a5e872c8f Removed a bunch of font tags 2012-09-05 14:24:12 -04:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00
Victor Shnayder
f04cd838e5 Integrate csv export of answer distributions with Ike's sweet dashboard 2012-09-05 13:40:29 -04:00
Calen Pennington
2f3f9e5ce9 Merge pull request #624 from MITx/rocha/master 
Cleanup of 'About Course' page link to its Courseware
 2012-09-05 08:15:33 -07:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade 
Upgrade to instructor dashboard
 2012-09-05 08:03:55 -07:00
Carlos Andrés Rocha
2d42c91b9d Cleanup of 'About Course' page link to its Courseware 2012-09-05 10:22:36 -04:00
David Ormsbee
44722e86e1 Quick fix for prod issue -- making view courseware link from course about page always work. 2012-09-05 08:20:06 -04:00
Carlos Andrés Rocha
0f1db7969d [#35491529] Small corrections to OpenID provider login page 2012-09-04 20:53:51 -04:00
ichuang
566b9694c4 revert inadvertent change to course.html 2012-09-04 19:47:37 -04:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -04:00