From 7b559daeac59b56adb7e911dad4e692a7e6fa6c4 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Aug 2009 00:20:14 +0800 Subject: remove settings_local.py --- .gitignore | 1 + LICENSE | 28 +++++++++++++-------------- settings.py | 2 +- sql_scripts/update_2009_01_25_001.sql | 2 +- sql_scripts/update_2009_02_26_001.sql | 36 +++++++++++++++++------------------ sql_scripts/update_2009_04_10_001.sql | 4 ++-- templates/content/js/compress.bat | 10 +++++----- templates/content/js/flot-build.bat | 4 ++-- 8 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 4f83efab..bb9e4490 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc *.swp nbproject + diff --git a/LICENSE b/LICENSE index cb24f678..803781c5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,14 @@ -Copyright (C) 2009. Chen Gang - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . +Copyright (C) 2009. Chen Gang + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff --git a/settings.py b/settings.py index fac3c0d5..5eb7ceda 100644 --- a/settings.py +++ b/settings.py @@ -91,7 +91,7 @@ INSTALLED_APPS = ( 'django.contrib.humanize', 'forum', 'django_authopenid', - 'debug_toolbar' , + #'debug_toolbar' , ) # User settings diff --git a/sql_scripts/update_2009_01_25_001.sql b/sql_scripts/update_2009_01_25_001.sql index 1f1942e3..f6f3bed2 100644 --- a/sql_scripts/update_2009_01_25_001.sql +++ b/sql_scripts/update_2009_01_25_001.sql @@ -1,2 +1,2 @@ -ALTER TABLE `award` ADD `content_type_id` INT NULL +ALTER TABLE `award` ADD `content_type_id` INT NULL ALTER TABLE `award` ADD `object_id` INT NULL \ No newline at end of file diff --git a/sql_scripts/update_2009_02_26_001.sql b/sql_scripts/update_2009_02_26_001.sql index 9cc80974..4113d8f5 100644 --- a/sql_scripts/update_2009_02_26_001.sql +++ b/sql_scripts/update_2009_02_26_001.sql @@ -1,19 +1,19 @@ -ALTER TABLE answer ADD COLUMN `accepted_at` datetime default null; - -/* Update accepted_at column with answer added datetime for existing data */ -UPDATE answer -SET accepted_at = added_at -WHERE accepted = 1 AND accepted_at IS NULL; - -/* workround for c# url problem on bluehost server */ -UPDATE tag -SET name = 'csharp' -WHERE name = 'c#' - -UPDATE question -SET tagnames = replace(tagnames, 'c#', 'csharp') -WHERE tagnames like '%c#%' - -UPDATE question_revision -SET tagnames = replace(tagnames, 'c#', 'csharp') +ALTER TABLE answer ADD COLUMN `accepted_at` datetime default null; + +/* Update accepted_at column with answer added datetime for existing data */ +UPDATE answer +SET accepted_at = added_at +WHERE accepted = 1 AND accepted_at IS NULL; + +/* workround for c# url problem on bluehost server */ +UPDATE tag +SET name = 'csharp' +WHERE name = 'c#' + +UPDATE question +SET tagnames = replace(tagnames, 'c#', 'csharp') +WHERE tagnames like '%c#%' + +UPDATE question_revision +SET tagnames = replace(tagnames, 'c#', 'csharp') WHERE tagnames like '%c#%' \ No newline at end of file diff --git a/sql_scripts/update_2009_04_10_001.sql b/sql_scripts/update_2009_04_10_001.sql index b0d05ac7..e1ceb3bc 100644 --- a/sql_scripts/update_2009_04_10_001.sql +++ b/sql_scripts/update_2009_04_10_001.sql @@ -1,3 +1,3 @@ -ALTER TABLE Tag ADD COLUMN deleted_at datetime default null; -ALTER TABLE Tag ADD COLUMN deleted_by_id INTEGER NULL; +ALTER TABLE Tag ADD COLUMN deleted_at datetime default null; +ALTER TABLE Tag ADD COLUMN deleted_by_id INTEGER NULL; ALTER TABLE Tag ADD COLUMN deleted TINYINT NOT NULL; \ No newline at end of file diff --git a/templates/content/js/compress.bat b/templates/content/js/compress.bat index aa31271c..41e1882a 100644 --- a/templates/content/js/compress.bat +++ b/templates/content/js/compress.bat @@ -1,6 +1,6 @@ -#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\wmd.js -o wmd\wmd-min.js -#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js -#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js -java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 se_hilite_src.js -o se_hilite.js - +#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\wmd.js -o wmd\wmd-min.js +#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 wmd\showdown.js -o wmd\showdown-min.js +#java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 com.cnprog.post.js -o com.cnprog.post.pack.js +java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 se_hilite_src.js -o se_hilite.js + pause \ No newline at end of file diff --git a/templates/content/js/flot-build.bat b/templates/content/js/flot-build.bat index 28304966..fc715e3a 100644 --- a/templates/content/js/flot-build.bat +++ b/templates/content/js/flot-build.bat @@ -1,3 +1,3 @@ -java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 jquery.flot.js -o jquery.flot.pack.js - +java -jar yuicompressor-2.4.2.jar --type js --charset utf-8 jquery.flot.js -o jquery.flot.pack.js + pause \ No newline at end of file -- cgit v1.2.3-1-g7c22