Rocky Duan
|
75c478771e
|
fixed histogram bug under staff view
|
2012-08-01 12:42:57 -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 |
|
jarv
|
f099928150
|
Merge pull request #324 from MITx/jarv/dev-script-updates
Jarv/dev script updates
|
2012-07-31 14:59:51 -07:00 |
|
John Jarvis
|
b08ea47bf3
|
Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates
|
2012-07-31 17:24:09 -04:00 |
|
John Jarvis
|
0642af0147
|
submodules are not on a branch, no need to pull
|
2012-07-31 17:17:33 -04:00 |
|
John Jarvis
|
ecab194e47
|
removing unnecessary chdir
|
2012-07-31 17:14:22 -04:00 |
|
John Jarvis
|
5c73a6f2ca
|
betting rvmrc handling
|
2012-07-31 17:04:58 -04:00 |
|
David Ormsbee
|
61fa118427
|
Merge pull request #325 from MITx/feature/kfiedler/courseware-style
Navigation style and make askbot have style
|
2012-07-31 13:58:18 -07:00 |
|
John Jarvis
|
9c31715da5
|
removing virtualenv install lines that arent needed
|
2012-07-31 16:55:07 -04:00 |
|
John Jarvis
|
4d1bf53027
|
Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates
|
2012-07-31 16:53:29 -04:00 |
|
John Jarvis
|
37ba0395e0
|
do not install virtualenv unless it needs to be upgraded (<1.7)
|
2012-07-31 16:49:18 -04:00 |
|
Brittany Cheng
|
72bd3e6db0
|
edit tag styles
|
2012-07-31 16:44:55 -04:00 |
|
kimth
|
11495563fa
|
Tweaks to CodeMirror: fix indentation, textarea is vertically resizable
|
2012-07-31 16:42:17 -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
|
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 |
|