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 |
|
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 |
|
ichuang
|
b9773b5d17
|
Merge pull request #323 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
|
2012-07-31 19:45:55 -07: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 |
|
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 |
|
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 |
|
John Jarvis
|
50dc4e80a3
|
adding askbot as a submodule of mitx
|
2012-07-31 15:49:11 -04:00 |
|
John Jarvis
|
5e8d132aad
|
removing askbot-devel
|
2012-07-31 15:15:49 -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 |
|
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 |
|
kimth
|
2e3c5de1a5
|
Remove hardcoding of LMS callback URL and default queuename
|
2012-07-31 14:08:02 -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 |
|
Calen Pennington
|
b659846e1f
|
Add askbot to lms staticfiles_dirs in test
|
2012-07-31 12:46:47 -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 |
|
kimth
|
3968e117e1
|
Simplify dict load in xqueue_callback
|
2012-07-31 10:42:32 -04:00 |
|
kimth
|
22af531b0b
|
Hardcoded URL moved to LMS for now
|
2012-07-31 10:09:47 -04:00 |
|
Calen Pennington
|
2f95a8e1d0
|
Re-add __init__.py for contentstore that was accidentally deleted in 05add5818b
|
2012-07-31 09:29:14 -04:00 |
|
kimth
|
e2f4995bc9
|
LMS provides fully qualified callback URL
|
2012-07-31 08:57:28 -04:00 |
|
ichuang
|
94e73936fc
|
Merge pull request #319 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
|
2012-07-30 18:51:16 -07:00 |
|
kimth
|
6d600ecf2c
|
Merge branch 'master' into kimth/lms-coderesponse
|
2012-07-30 20:42:10 -04:00 |
|
kimth
|
b9e5e9f0ee
|
Read XML for queuename
|
2012-07-30 20:18:25 -04:00 |
|
kimth
|
6244412c28
|
Simplify default linenumbers behavior
|
2012-07-30 18:59:11 -04:00 |
|
David Ormsbee
|
e5fd92630d
|
Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors
Added styles for errors
|
2012-07-30 15:24:12 -07:00 |
|
David Ormsbee
|
1baa306cfa
|
Merge pull request #320 from MITx/feature/kfiedler/courseware-style
Start to whip out a bunch of the styles and get courseware working
|
2012-07-30 15:23:52 -07:00 |
|
Kyle Fiedler
|
c611bd9228
|
added treeview
|
2012-07-30 17:39:44 -04:00 |
|
Kyle Fiedler
|
257ce0430f
|
Moved vendor sass files to css folder and included them in
|
2012-07-30 17:39:19 -04:00 |
|
Kyle Fiedler
|
7ab5bbfaef
|
Moved files and removed files
|
2012-07-30 17:37:53 -04:00 |
|