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
|
0bfcefd214
|
Merge pull request #327 from MITx/fix-beautifulsoup4
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
|
2012-08-01 08:39:38 -07: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 |
|
Brittany Cheng
|
c107d109c9
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-01 11:29:26 -04: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 |
|
jarv
|
a2e1409dbb
|
Merge pull request #328 from MITx/jarv/dev-script-updates
Jarv/dev script updates
|
2012-08-01 08:13:34 -07:00 |
|
John Jarvis
|
94c19059b5
|
trailing whitespace
|
2012-08-01 11:08:41 -04:00 |
|
John Jarvis
|
71898e4869
|
removing matplotlib from requirements.txt
|
2012-08-01 10:54:50 -04:00 |
|
John Jarvis
|
8c1bb0cab2
|
sanity checking /usr/local, updating coffee script install location, old location no longer works
|
2012-08-01 10:54:32 -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 |
|
ichuang
|
381d247589
|
djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
|
2012-07-31 21:43:29 -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 |
|
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 |
|