Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 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
Ernie Park
e8656c2d9e merge 2012-03-08 14:49:40 -05:00
Ernie Park
513d811aec remove console.log lines 2012-03-08 14:49:28 -05:00
Kyle Fiedler
8944cecd73 Merged with kf-sequence-nav 2012-03-08 14:47:39 -05:00
Kyle Fiedler
0600de354b Merged with default 
--HG--
branch : kf-sequence-nav
 2012-03-08 14:47:10 -05:00
Kyle Fiedler
d9479bd33d Added images for real this time and fixed merge conflicts 2012-03-08 14:36:32 -05:00
Kyle Fiedler
16fdcd5700 Added images and css for social links in footer 2012-03-08 14:35:25 -05:00
Kyle Fiedler
2cd1b35324 Added styles and html for social links 
--HG--
branch : kf-sequence-nav
 2012-03-08 14:34:35 -05:00
David Ormsbee
814f743c37 merge away detritus from static's default 2012-03-08 13:30:02 -05:00
Piotr Mitros
df15b6bd88 Merge 2012-03-08 13:13:21 -05:00
Kyle Fiedler
64a4afe8c0 Added some new styles for edit button and changed some of the wording 2012-03-07 21:28:20 -05:00
Piotr Mitros
c991190c02 Merge 2012-03-07 15:30:48 -05:00
Piotr Mitros
6cbc7c9e7c Merge 2012-03-07 15:28:15 -05:00
Piotr Mitros
5db419d211 Used cookies to store speed 
--HG--
branch : ernie-static-video-fixes
 2012-03-07 15:27:47 -05:00
Piotr Mitros
39c728cb0a Used cookies to store speed 
--HG--
branch : ernie-templates-video-fixes
 2012-03-07 15:27:34 -05:00
Kyle Fiedler
a4ad4a7dec Merged branches 2012-03-07 15:26:20 -05:00
Kyle Fiedler
3f3b349555 Added form and changes button to input so that users could hit enter on language and location 2012-03-07 15:25:41 -05:00
Ernie Park
90a70e661f include kyles changes to bold the video speed 
--HG--
branch : ernie-static-video-fixes
 2012-03-07 14:52:01 -05:00
Reda Lemeden
318a9f2b5e Fixed visual bug in live suggestion dropdown 2012-03-07 11:18:16 -05:00
Ernie Park
40e52cb96e update video player to accommodate remembering video speeds when switching in sequences and fix bug where play button gets out of sync when switching speeds 
--HG--
branch : ernie-static-video-fixes
 2012-03-07 02:25:33 -05:00
Ernie Park
6bbdae6f00 update video_init to use global video_speed variable to cue up same speed and make sure active class added to corrct speed 
--HG--
branch : ernie-templates-video-fixes
 2012-03-07 02:21:21 -05:00
Reda Lemeden
174f50c575 Small visual adjustment for official badges 2012-03-06 17:15:59 -05:00
Reda Lemeden
93a37c45c9 Small visual adjustment for official badges 2012-03-06 17:11:46 -05:00
Reda Lemeden
5baddf5366 Made the official comment style apply to question comments as well 2012-03-06 16:21:26 -05:00
Reda Lemeden
b7e385edd9 Made the official comment style apply to question comments as well 2012-03-06 16:20:56 -05:00
Reda Lemeden
dfc96ba273 Merge and resolve conflict 2012-03-06 16:07:10 -05:00
Reda Lemeden
97b2a05f1b Added official badge styling for Askbot 2012-03-06 16:01:15 -05:00
Reda Lemeden
3c8f64f51c Merge 2012-03-06 16:00:11 -05:00
Reda Lemeden
5772c4ca01 Added official badge styling 2012-03-06 15:59:33 -05:00
Bridger Maxwell
4ce2cfe523 Merge 2012-03-06 15:48:07 -05:00
Bridger Maxwell
7e640e3965 Merge 2012-03-06 15:47:46 -05:00
Bridger Maxwell
84471d176e Added revision feed, which shows latest edits across the wiki. Also brought down wiki queries using select_related and caching article slugs 
--HG--
branch : bridger-dev
 2012-03-06 15:26:34 -05:00
Bridger Maxwell
5209a94200 Added revision feed, which shows latest edits across the wiki 
--HG--
branch : bridger-dev
 2012-03-06 15:25:48 -05:00
Kyle Fiedler
6926bb9309 Merged heads and resolved conflict 2012-03-06 14:44:19 -05:00
Kyle Fiedler
2081680588 Added styles for the admin code in courseware 2012-03-06 14:42:56 -05:00
Kyle Fiedler
d4134b0a9e Added styles for the admin code in the courseware 2012-03-06 14:42:27 -05:00
Kyle Fiedler
8519f03bdb Added styles and js for disablling next and prev buttons 
--HG--
branch : kf-sequence-nav
 2012-03-06 14:22:22 -05:00
Bridger Maxwell
f58f08edbe Changed hoverling labels of profile graph to give real name of homework or lab section 
--HG--
branch : bridger-dev
 2012-03-06 12:53:39 -05:00
Bridger Maxwell
2c5bd99f93 Caught up to default branch 
--HG--
branch : bridger-dev
 2012-03-06 12:35:48 -05:00
David Ormsbee
ccacc90ca7 Don't allow posting before logging in. 2012-03-06 11:44:26 -05:00
David Ormsbee
299e1ae905 fixed it so staff can immediately accept answers 2012-03-06 10:55:45 -05:00
Kyle Fiedler
186fee6bf6 merged in kf-highlight-speed 2012-03-06 08:56:03 -05:00
Kyle Fiedler
e0ad749166 Merged master 
--HG--
branch : kf-highlight-speed
 2012-03-06 08:54:49 -05:00
Reda Lemeden
d4b17006bd Resolve merge conflicts 2012-03-05 17:47:37 -05:00
Reda Lemeden
621943adef Restyled badges view and fixed Firefox button spacing issue in the askbot comments form 2012-03-05 17:45:41 -05:00
Reda Lemeden
129b42a0e0 Restyled badges view and fixed Firefox button spacing issue in the askbot comments form 2012-03-05 17:45:03 -05:00
Kyle Fiedler
7284d43ef6 Made the time look more friendly 2012-03-05 17:27:19 -05:00
Kyle Fiedler
a6ef534adb Merged with head 2012-03-05 17:00:25 -05:00
Kyle Fiedler
6291748bd3 Added red social icons to give them some more promenance 2012-03-05 16:59:03 -05:00
Ernie Park
9d1a2a5c3f add active class to 1.0 speed video when page first loaded. 
--HG--
branch : kf-highlight-speed
 2012-03-05 15:53:07 -05:00
Ernie Park
09a1771bc0 merge 2012-03-05 15:44:58 -05:00