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
|
f3567ddd66
|
Change absolute paths to relative in scss
* makes collectstatic happy
|
2012-07-31 16:15:49 -04:00 |
|
Victor Shnayder
|
71b9dbbb2e
|
Remove obsolete js references
|
2012-07-31 16:15:33 -04:00 |
|
John Jarvis
|
e08cb5067e
|
always pip install virtualenv
|
2012-07-31 16:09:11 -04:00 |
|
John Jarvis
|
0919963119
|
adding option back for --system-site-packages, will ensure virtualenv > 1.7
|
2012-07-31 16:07:00 -04:00 |
|
Rocky Duan
|
84fcb5ef52
|
change watch to follow in front end
|
2012-07-31 16:00:42 -04:00 |
|
John Jarvis
|
50dc4e80a3
|
adding askbot as a submodule of mitx
|
2012-07-31 15:49:11 -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 |
|
John Jarvis
|
5e8d132aad
|
removing askbot-devel
|
2012-07-31 15:15:49 -04:00 |
|
Brittany Cheng
|
3d389c099e
|
new post control button and link styles
|
2012-07-31 15:05:07 -04:00 |
|
John Jarvis
|
aaeb0446d1
|
version is required http://gembundler.com/man/gemfile.5.html, this was causing rvm to return non-zero and thus causing the create-dev-env.sh script to fail
|
2012-07-31 14:58:07 -04:00 |
|
John Jarvis
|
1279c86097
|
by default now stdout and stdin will appear on console, both are logged
|
2012-07-31 14:56:39 -04:00 |
|
John Jarvis
|
202b18a3e0
|
Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates
|
2012-07-31 14:54:27 -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 |
|
Rocky Duan
|
e301be4a80
|
modify anonymity handling; display comments count
|
2012-07-31 11:54:02 -04:00 |
|
Brittany Cheng
|
32cf7c6f66
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-31 11:26:17 -04:00 |
|
David Ormsbee
|
7bfd21732a
|
Merge pull request #321 from MITx/feature/kfiedler/courseware-style
Fixed jquery ui image problem and added a base style sheet for lms to ov...
|
2012-07-31 08:22:46 -07: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
|
9bd1aa94d8
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 10:48:18 -04:00 |
|
Rocky Duan
|
a08d4b808b
|
fix raw tag data bug
|
2012-07-31 10:47:42 -04:00 |
|
kimth
|
3968e117e1
|
Simplify dict load in xqueue_callback
|
2012-07-31 10:42:32 -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
|
ada66adff6
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-31 10:12:06 -04:00 |
|
Rocky Duan
|
6f44001813
|
basic editing functionality
|
2012-07-31 10:11:51 -04:00 |
|