Brittany Cheng
|
01ac251c2b
|
styles and staff
|
2012-08-01 17:06:32 -04:00 |
|
Brittany Cheng
|
7bb329d436
|
vote styles
|
2012-08-01 16:45:34 -04:00 |
|
Brittany Cheng
|
845ca43ea1
|
inline and forum styles
|
2012-08-01 16:42:09 -04:00 |
|
Brittany Cheng
|
07ebc83368
|
fixing merge error
|
2012-08-01 14:39:26 -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
|
f204e9888f
|
renamed files
|
2012-08-01 13:09:19 -04:00 |
|
Rocky Duan
|
51772c04f3
|
use separate templates for forum view and inline view
|
2012-08-01 13:02:57 -04:00 |
|
Rocky Duan
|
777c3ee42c
|
Merge branch 'master' of github.com:MITx/mitx
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/profile.html
|
2012-08-01 12:49:00 -04:00 |
|
Rocky Duan
|
7d9d790c5d
|
endorse comments
|
2012-08-01 12:43:57 -04:00 |
|
Rocky Duan
|
75c478771e
|
fixed histogram bug under staff view
|
2012-08-01 12:42:57 -04:00 |
|
Calen Pennington
|
ef8a211b9e
|
Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading
Got profile page working again.
|
2012-08-01 08:37:16 -07:00 |
|
Bridger Maxwell
|
ae3da772d0
|
Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.
|
2012-08-01 11:27:04 -04:00 |
|
Brittany Cheng
|
f637ca5120
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-01 09:44:45 -04:00 |
|
ichuang
|
b9773b5d17
|
Merge pull request #323 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
|
2012-07-31 19:45:55 -07: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 |
|
Victor Shnayder
|
71b9dbbb2e
|
Remove obsolete js references
|
2012-07-31 16:15:33 -04:00 |
|
Rocky Duan
|
84fcb5ef52
|
change watch to follow in front end
|
2012-07-31 16:00:42 -04:00 |
|
Brittany Cheng
|
c69a4728e7
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 15:42:12 -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 |
|
Rocky Duan
|
c46b232e19
|
oops missed a bracket
|
2012-07-31 14:32:00 -04:00 |
|
David Ormsbee
|
fafa86b413
|
Merge pull request #322 from MITx/feature/kfiedler/courseware-style
Added fix for videos start to zero out colors and mit styles
|
2012-07-31 11:31:16 -07: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
|
b3474fbf10
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 14:09:12 -04:00 |
|
Brittany Cheng
|
ff4d0637f5
|
merging styles
|
2012-07-31 14:09:06 -04:00 |
|
Rocky Duan
|
32c76d1351
|
bug fix search bar lol..
|
2012-07-31 14:08:31 -04:00 |
|
kimth
|
2e3c5de1a5
|
Remove hardcoding of LMS callback URL and default queuename
|
2012-07-31 14:08:02 -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 |
|
Rocky Duan
|
799f66b776
|
make search bar configurable
|
2012-07-31 13:26:36 -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 |
|
kimth
|
0879f3e0a8
|
Use build_absolute_uri rather than hardcoded sandbox URL
|
2012-07-31 13:21:45 -04:00 |
|
kimth
|
a773df588a
|
Merge branch 'master' into kimth/lms-coderesponse
|
2012-07-31 13:02:48 -04:00 |
|
kimth
|
27e142dd2f
|
Extra empty line
|
2012-07-31 12:58:32 -04:00 |
|
Brittany Cheng
|
607bc6b50b
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 12:51:17 -04:00 |
|
Calen Pennington
|
b659846e1f
|
Add askbot to lms staticfiles_dirs in test
|
2012-07-31 12:46:47 -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 |
|