[fedocal] master: pep8 on default_config (17eda11)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 17eda11346450cca4b2eb15af68321dde0b50753
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Jan 10 23:35:57 2013 +0100
pep8 on default_config
>---------------------------------------------------------------
fedocal/default_config.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fedocal/default_config.py b/fedocal/default_config.py
index e8d867b..dbf5678 100644
--- a/fedocal/default_config.py
+++ b/fedocal/default_config.py
@@ -43,5 +43,5 @@ SMTP_SERVER = 'localhost'
CRON_FREQUENCY = 30
# Path to the alembic configuration file
-PATH_ALEMBIC_INI=os.path.join(os.path.dirname(os.path.abspath(__file__)),
- '..','alembic.ini')
+PATH_ALEMBIC_INI = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ '..', 'alembic.ini')
11 years, 2 months
[fedocal] master: Add a default pathto the alembic configuration file (62df8df)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 62df8dfa46dc3d41b784221d8033ec6ac9801989
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Jan 10 22:00:11 2013 +0100
Add a default pathto the alembic configuration file
>---------------------------------------------------------------
fedocal/default_config.py | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/fedocal/default_config.py b/fedocal/default_config.py
index 8203285..e8d867b 100644
--- a/fedocal/default_config.py
+++ b/fedocal/default_config.py
@@ -23,6 +23,8 @@
MA 02110-1301, USA.
"""
+import os
+
# url to the database server:
DB_URL = 'sqlite:////var/tmp/fedocal_dev.sqlite'
@@ -39,3 +41,7 @@ SMTP_SERVER = 'localhost'
# The cron job can be set with any frequency but fedocal_cron
CRON_FREQUENCY = 30
+
+# Path to the alembic configuration file
+PATH_ALEMBIC_INI=os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ '..','alembic.ini')
11 years, 2 months
[fedocal] master: Fix Admin menu section, which fixes CSS bug (60ed365)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 60ed3654656a1e09dd953c3895d66533eb4ac278
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Jan 10 21:39:07 2013 +0100
Fix Admin menu section, which fixes CSS bug
>---------------------------------------------------------------
fedocal/templates/master.html | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html
index 5ec1459..9a7f2c0 100644
--- a/fedocal/templates/master.html
+++ b/fedocal/templates/master.html
@@ -103,7 +103,8 @@
</div>
{% if admin %}
<h4> Admin </h4>
- <ul>
+ <div>
+ <ul class="checkmark-list">
<li>
<a href="{{ url_for('add_calendar') }}"> Add a calendar </a>
</li>
@@ -118,6 +119,7 @@
</li>
{% endif %}
</ul>
+ </div>
{% endif %}
</div>
</aside>
11 years, 2 months
[fedocal] master: Fix location of the default development database (c1804b1)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit c1804b14c8c2b5f9c03d0575a144cf8ec922789d
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Jan 10 21:38:32 2013 +0100
Fix location of the default development database
>---------------------------------------------------------------
fedocal.cfg.sample | 2 +-
fedocal/default_config.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fedocal.cfg.sample b/fedocal.cfg.sample
index 7d3cc39..cf084b6 100644
--- a/fedocal.cfg.sample
+++ b/fedocal.cfg.sample
@@ -6,7 +6,7 @@ SECRET_KEY='<The web application secret key>'
### url to the database server:
#DB_URL=mysql://user:pass@host/db_name
#DB_URL=postgres://user:pass@host/db_name
-DB_URL='sqlite:////tmp/fedocal_dev.sqlite'
+DB_URL='sqlite:////var/tmp/fedocal_dev.sqlite'
### The FAS group in which the admin of fedocal are
ADMIN_GROUP='fedocal_admin'
diff --git a/fedocal/default_config.py b/fedocal/default_config.py
index b05fc92..8203285 100644
--- a/fedocal/default_config.py
+++ b/fedocal/default_config.py
@@ -25,7 +25,7 @@
# url to the database server:
-DB_URL = 'sqlite:////tmp/fedocal_dev.sqlite'
+DB_URL = 'sqlite:////var/tmp/fedocal_dev.sqlite'
# The FAS group in which the admin of fedocal are
11 years, 2 months
[fedocal] master: Add import pkg_resources to be able to run fedocal on EL6 (c4425a2)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit c4425a28d182e3eb46ff7a7dbfa5ae1cb3437a12
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Jan 10 21:37:21 2013 +0100
Add import pkg_resources to be able to run fedocal on EL6
>---------------------------------------------------------------
createdb.py | 4 ++++
runserver.py | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/createdb.py b/createdb.py
index 482e4e0..baf10ee 100644
--- a/createdb.py
+++ b/createdb.py
@@ -1,5 +1,9 @@
#!/usr/bin/python
+## These two lines are needed to run on EL6
+__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4']
+import pkg_resources
+
from fedocal import APP
from fedocal.fedocallib import model
diff --git a/runserver.py b/runserver.py
index 2802474..5fc50d6 100644
--- a/runserver.py
+++ b/runserver.py
@@ -1,5 +1,9 @@
#!/usr/bin/python
+## These two lines are needed to run on EL6
+__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4']
+import pkg_resources
+
from fedocal import APP
APP.debug=True
APP.run()
11 years, 2 months