David Ormsbee
|
e253ea25d5
|
added dir structure assumptions to dev.py env config
|
2012-03-22 11:39:04 -04:00 |
|
David Ormsbee
|
2ab562f792
|
moved template related config together, removed some cruft
|
2012-03-22 11:37:49 -04:00 |
|
David Ormsbee
|
18fb637f1b
|
remove redundancy between dev and devplus envs in config
|
2012-03-22 11:36:40 -04:00 |
|
David Ormsbee
|
4bcfaed598
|
update settings2's askbot to reflect new karma limits
|
2012-03-22 11:35:34 -04:00 |
|
David Ormsbee
|
e3e8edcf81
|
Update location of JS assets for local debugging (most envs use S3), remove old link to 3rdParty repo (which is no longer used)
|
2012-03-22 10:48:40 -04:00 |
|
David Ormsbee
|
aea72a62f7
|
matching settings2 to old settings -- fix template lookup
|
2012-03-22 10:43:32 -04:00 |
|
David Ormsbee
|
2eedce0139
|
Allow gunicorn_django to serve static files when DEBUG=True
|
2012-03-21 17:54:58 -04:00 |
|
David Ormsbee
|
f0ac9cae6a
|
remove some outdated comments
|
2012-03-21 10:45:32 -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
|
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
|
317542ad19
|
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
|
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 |
|
David Ormsbee
|
f4625003a7
|
change config to not cache by default, unless overridden by server-specific settings.py
--HG--
branch : cache_separation
|
2012-03-15 15:21:39 -04:00 |
|
David Ormsbee
|
e37eb49065
|
Shift wiki and course.xml caching to use newly defined 'general' cache, separate from sessions left in 'default'
--HG--
branch : cache_separation
|
2012-03-15 14:45:27 -04:00 |
|
Reda Lemeden
|
269334a839
|
Fixed the layout of the graph gradebook
|
2012-03-15 10:58:39 -04:00 |
|
Kyle Fiedler
|
98a4b48e3d
|
Merged css
|
2012-03-14 17:43:20 -04:00 |
|
Kyle Fiedler
|
d2b8a2c8ad
|
New sass generated css
|
2012-03-14 17:42:39 -04:00 |
|
Kyle Fiedler
|
b4f15d7c79
|
Added new styles for pages that are not inside the app or marketing
|
2012-03-14 17:33:01 -04:00 |
|
Kyle Fiedler
|
e09310e9c9
|
added fix for error pages and for password reset page
|
2012-03-14 17:32:05 -04:00 |
|
Piotr Mitros
|
11f4820704
|
Minor change -- disable caching on DEV machines
|
2012-03-13 15:46:57 -04:00 |
|
Kyle Fiedler
|
3966a06888
|
Make warnings show in IE 9
|
2012-03-13 10:00:03 -04:00 |
|
Kyle Fiedler
|
2fc4477e44
|
Merged heads
|
2012-03-13 09:22:13 -04:00 |
|
Kyle Fiedler
|
731ca112bc
|
Added some fixes to bugs in the updates, refactored the cream color to a sass variable and highlighted latest update
|
2012-03-13 09:21:34 -04:00 |
|
Piotr Mitros
|
da8665204b
|
Merged in gradebook
|
2012-03-12 18:52:04 -04:00 |
|