David Ormsbee
|
73fb8f5464
|
Merge branch 'hotfix/1.0.3'
Conflicts:
lms/urls.py
|
2012-08-02 11:51:50 -04:00 |
|
Brittany Cheng
|
b2ddef99be
|
padding and margins of discussion containers
|
2012-08-01 18:14:59 -04:00 |
|
Brittany Cheng
|
03d9b7a928
|
merge kyle's style fixes
|
2012-08-01 18:09:27 -04:00 |
|
Brittany Cheng
|
ae89aac6ce
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-01 18:07:52 -04:00 |
|
Brittany Cheng
|
6c214fc4bd
|
basic paginator styles
|
2012-08-01 18:03:36 -04:00 |
|
Kyle Fiedler
|
b90aa2e2db
|
Added more styles for the info page and added headers for the updates and handouts so they will be consistant for every class
|
2012-08-01 17:36:11 -04:00 |
|
Kyle Fiedler
|
6c3ec99f9e
|
Start to change to ems and remove all of cream
|
2012-08-01 17:36:10 -04:00 |
|
Kyle Fiedler
|
cdd37eeb92
|
Strip down sequence navigaiton and more stripping of the courseware nav
|
2012-08-01 17:36:10 -04:00 |
|
Brittany Cheng
|
dac66a998e
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-01 17:06:37 -04:00 |
|
Brittany Cheng
|
01ac251c2b
|
styles and staff
|
2012-08-01 17:06:32 -04:00 |
|
Rocky Duan
|
ce15faf6a0
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
|
2012-08-01 16:52:06 -04:00 |
|
Rocky Duan
|
fc31885d2e
|
Merge branch 'master' into discussion2
|
2012-08-01 16:51:54 -04:00 |
|
Brittany Cheng
|
7bb329d436
|
vote styles
|
2012-08-01 16:45:34 -04:00 |
|
Rocky Duan
|
17d11a6391
|
pagination
|
2012-08-01 16:45:08 -04:00 |
|
Brittany Cheng
|
845ca43ea1
|
inline and forum styles
|
2012-08-01 16:42:09 -04:00 |
|
Calen Pennington
|
aa215bc316
|
Merge remote-tracking branch 'origin/hotfix/1.0.1' into hotfix/1.0.3
|
2012-08-01 15:59:06 -04:00 |
|
Brittany Cheng
|
bdab90190f
|
trying to fix merge conflicts
|
2012-08-01 14:29:00 -04:00 |
|
Brittany Cheng
|
01623ddbfb
|
merge with origin master
|
2012-08-01 14:24:46 -04:00 |
|
Rocky Duan
|
7d9d790c5d
|
endorse comments
|
2012-08-01 12:43:57 -04:00 |
|
Brittany Cheng
|
8023d2b70a
|
pulled from origin master
|
2012-07-31 18:48:39 -04:00 |
|
Brittany Cheng
|
f1e07024d4
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-31 18:43:21 -04:00 |
|
Brittany Cheng
|
33c7336f1d
|
styles again
|
2012-07-31 18:17:35 -04:00 |
|
Brittany Cheng
|
72bd3e6db0
|
edit tag styles
|
2012-07-31 16:44:55 -04:00 |
|
Kyle Fiedler
|
b5b0d08621
|
Sorta fix askbot
|
2012-07-31 16:29:01 -04:00 |
|
Kyle Fiedler
|
9d14033f6b
|
Added some styles for the top navigation and for the sidebar navigation
|
2012-07-31 16:29:01 -04:00 |
|
Brittany Cheng
|
29d75057f2
|
fix font inheritance, update post control styles
|
2012-07-31 16:25:27 -04:00 |
|
Rocky Duan
|
84fcb5ef52
|
change watch to follow in front end
|
2012-07-31 16:00:42 -04:00 |
|
Brittany Cheng
|
b12d887309
|
font sizing
|
2012-07-31 15:41:03 -04:00 |
|
Brittany Cheng
|
3d389c099e
|
new post control button and link styles
|
2012-07-31 15:05:07 -04:00 |
|
Kyle Fiedler
|
d30ae5389e
|
Added fix for videos start to zero out colors and mit styles
|
2012-07-31 14:18:42 -04:00 |
|
Brittany Cheng
|
ff4d0637f5
|
merging styles
|
2012-07-31 14:09:06 -04:00 |
|
Brittany Cheng
|
643316a10b
|
tag styles
|
2012-07-31 14:05:11 -04:00 |
|
Rocky Duan
|
20f958e6be
|
bug fix: resize input for defaulttext (tagsinput)
|
2012-07-31 14:03:55 -04:00 |
|
Rocky Duan
|
c43d5d236a
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
Conflicts:
lms/static/coffee/src/discussion.coffee
|
2012-07-31 13:43:53 -04:00 |
|
Brittany Cheng
|
836242706f
|
buttons
|
2012-07-31 13:41:21 -04:00 |
|
Rocky Duan
|
401f57b81a
|
show new post form after clicking button
|
2012-07-31 13:40:26 -04:00 |
|
Brittany Cheng
|
ddce6d8cb6
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 13:39:13 -04:00 |
|
Brittany Cheng
|
48674d6fa5
|
search button style
|
2012-07-31 13:23:35 -04:00 |
|
Rocky Duan
|
c39b2db678
|
retrieve inline discussion by ajax
|
2012-07-31 13:22:25 -04:00 |
|
Brittany Cheng
|
607bc6b50b
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 12:51:17 -04:00 |
|
Rocky Duan
|
701f8716f7
|
only show edit button when user can edit
|
2012-07-31 12:31:59 -04:00 |
|
Brittany Cheng
|
cf92f356c0
|
edit styles for tags, discussion votes, etc
|
2012-07-31 12:03:45 -04:00 |
|
Brittany Cheng
|
32cf7c6f66
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-31 11:26:17 -04:00 |
|
Kyle Fiedler
|
2bbb19790d
|
Fixed jquery ui image problem and added a base style sheet for lms to override fonts
|
2012-07-31 11:06:39 -04:00 |
|
Brittany Cheng
|
278483371b
|
fix merge conflicts
|
2012-07-31 10:30:26 -04:00 |
|
Brittany Cheng
|
6285f2a2be
|
discussion styles
|
2012-07-31 10:27:14 -04:00 |
|
Rocky Duan
|
6f44001813
|
basic editing functionality
|
2012-07-31 10:11:51 -04:00 |
|
Brittany Cheng
|
bba8e29733
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-30 18:36:23 -04:00 |
|
Brittany Cheng
|
a98c505ba8
|
fix merge conflicts
|
2012-07-30 18:36:06 -04:00 |
|
Rocky Duan
|
cef347226b
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-30 18:35:11 -04:00 |
|