Commit Graph

1406 Commits

Author SHA1 Message Date
Bridger Maxwell
2f15424acc Merged in master branch 2012-03-25 15:05:37 -04:00
Bridger Maxwell
2aca626440 Changed gradebook to be a table. 2012-03-24 15:32:11 -04:00
Calen Pennington
a8a4b49d0b Correctly grab the build number from the environment when packaging 2012-03-23 14:35:36 -04:00
Calen Pennington
b5652552df Switching to rake for build management 2012-03-23 14:30:05 -04:00
Reda Lemeden
8fe162a2b5 Merge pull request #3 from MITx/kf-calculator
Added some styles so that the hints for the calculator pop up
2012-03-22 14:05:58 -07:00
Kyle Fiedler
e81bc425cb Added return false on clicks for calculator 2012-03-22 16:37:36 -04:00
Kyle Fiedler
3512df424e Added image for info 2012-03-22 16:37:36 -04:00
Kyle Fiedler
813fc488c6 Spead up animation and added diferent wording 2012-03-22 16:37:36 -04:00
Kyle Fiedler
6627153e1c Added styles for the calc hint 2012-03-22 16:37:36 -04:00
Calen Pennington
8c893ab384 Adding pip requirement files. Pre-requirements must be run first, because scipy needs numpy already installed when executing the scipy installer 2012-03-22 12:37:07 -04:00
Calen Pennington
009f951483 Don't execute the site-specific settings file if it doesn't exist 2012-03-22 12:37:07 -04:00
Calen Pennington
8593d45e90 Add dependencies to build .deb 2012-03-22 12:37:07 -04:00
Calen Pennington
1a248aabca Switch to fpm to build installable package 2012-03-22 12:37:07 -04:00
David Ormsbee
4758ed10b3 raise karma limits on certain actions, disable askbot-wiki 2012-03-20 17:32:52 -04:00
Calen Pennington
6a744c8283 Merge pull request #1 from MITx/kf-calculator
Added styles for new calc and updated bourbon
2012-03-20 11:47:38 -07:00
Kyle Fiedler
3fadf0e16c Added styles for new calc and updated bourbon 2012-03-20 14:11:25 -04:00
Calen Pennington
f1aea3d5e7 Don't list all the contents of the tar file 2012-03-20 09:30:13 -04:00
Calen Pennington
d468e7c679 Make build commands verbose and fail-fast 2012-03-20 09:30:03 -04:00
Kyle Fiedler
a3eb345bb1 added fixes for info updates 2012-03-19 16:19:15 -04:00
Kyle Fiedler
9bd5fbab2d removed the sass cache 2012-03-19 14:51:39 -04:00
Calen Pennington
086b1bf08b Forcing bash for ci build 2012-03-19 13:15:25 -04:00
Calen Pennington
ca50fe027e Remove origin/ and replace '/' in branch names in tar file 2012-03-19 13:11:06 -04:00
Calen Pennington
7541737c15 Fix how the tar is built 2012-03-19 13:05:01 -04:00
Calen Pennington
faa34e2683 Make build script executable 2012-03-19 12:20:00 -04:00
Calen Pennington
8fe8bb6604 Adding folder for ci scripts, and initial script for packaging repo 2012-03-19 12:19:29 -04:00
Calen Pennington
71cc49184b Merge remote-tracking branch '3rdParty/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
a445c2cc2b Merge remote-tracking branch 'templates/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
8b620c32d5 Merge remote-tracking branch 'static/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
562418504a Merge remote-tracking branch '3rdParty/master' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
d862cb2232 Merge remote-tracking branch 'templates/bridger-grades' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
c04d49385c Merge remote-tracking branch 'static/master' into bridger-grades 2012-03-19 11:10:48 -04:00
Calen Pennington
fdc5cd94a9 Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
522ee0584b Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
fc68777119 Fix up the symlinks to point to the right place 2012-03-19 11:10:44 -04:00
Calen Pennington
98dd48f9da Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
efb96251f8 Copying hgignore to gitignore 2012-03-19 11:10:44 -04:00
Calen Pennington
317542ad19 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
ceffe4a875 Updating pointers to new merged repo locations 2012-03-19 11:10:44 -04:00
Calen Pennington
1bc3835fe6 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
a20b01c081 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00
Calen Pennington
4f65c6e67a Remove file in 3rdParty 2012-03-19 11:10:43 -04:00
Calen Pennington
799816a31d Move to subdirectory in preparation for merge 2012-03-19 11:10:43 -04:00
Calen Pennington
70832c7db3 Import from hg 2012-03-19 11:05:25 -04:00
Kyle Fiedler
5ceb79df9c Merged kf-titles 2012-03-15 16:48:31 -04:00
Kyle Fiedler
ea7e006a38 merged default
--HG--
branch : kf-titles
2012-03-15 16:47:59 -04:00
Kyle Fiedler
3a84bafa48 merged in kf-links 2012-03-15 16:33:30 -04:00
Kyle Fiedler
057185f69e Merged in default
--HG--
branch : kf-links
2012-03-15 16:32:55 -04:00
Kyle Fiedler
3da8b8133f Added minor ui changes 2012-03-15 16:28:36 -04:00
David Ormsbee
8949c5e6bf merged in session cache separation 2012-03-15 15:30:41 -04:00
David Ormsbee
d9253a0c0f remove unnecessary settings import
--HG--
branch : cache_separation
2012-03-15 15:25:39 -04:00