Permalink
Browse files

Merge branch 'dev' of github.com:Eugeny/ajenti into dev

  • Loading branch information...
2 parents f99af29 + a7b7043 commit 4805450ff05640affeeb47045cd393164681978b @Eugeny Eugeny committed May 26, 2011
View
@@ -1,4 +1,4 @@
-ajenti (0.5-4) UNRELEASED; urgency=low
+ajenti (0.5-5) UNRELEASED; urgency=low
* Initial release.
View
@@ -1,7 +1,7 @@
import subprocess
def version():
- release = '0.5-4'
+ release = '0.5-5'
p = subprocess.Popen('git describe 2> /dev/null',
shell=True,
stdout=subprocess.PIPE)
@@ -16,6 +16,6 @@
NAME = 'Apache'
PLATFORMS = ['any']
DESCRIPTION = 'Apache webserver control plugin'
-VERSION = '0:1.0'
+VERSION = '0:2'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
View
@@ -10,6 +10,6 @@
NAME = 'Cron'
PLATFORMS = ['any']
DESCRIPTION = 'Edit crontabs easily'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
View
@@ -5,6 +5,6 @@
NAME = 'DNS Servers'
PLATFORMS = ['any']
DESCRIPTION = 'Edit nameserver options'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -5,6 +5,6 @@
NAME = 'Filesystems'
PLATFORMS = ['any']
DESCRIPTION = 'Edit fstab'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
View
@@ -5,6 +5,6 @@
NAME = 'File manager'
PLATFORMS = ['any']
DESCRIPTION = 'Simple remote file manager'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -5,6 +5,6 @@
NAME = 'Hosts'
PLATFORMS = ['any']
DESCRIPTION = 'Edit hosts file'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -10,6 +10,6 @@
NAME = 'IP tables'
PLATFORMS = ['debian', 'arch', 'centos', 'fedora']
DESCRIPTION = 'Netfilter rules control plugin'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
View
@@ -26,7 +26,7 @@ def on_session_start(self):
self._editing_table = None
self._editing_chain = None
self._editing_rule = None
- self._error = ''
+ self._error = None
def get_ui(self):
ui = self.app.inflate('iptables:main')
@@ -60,8 +60,10 @@ def get_ui(self):
vc.append(uic)
vc.append(UI.Button(text='Add new chain to '+t.name, id='addchain/'+t.name))
tc.add(t.name, vc)
-
-#!!!!! put_message('err', self._error)
+
+ if self._error is not None and len(self._error) > 0:
+ self.put_message('warn', self._error)
+ self._error = None
if self._shuffling != None:
ui.append('root', self.get_ui_shuffler())
@@ -11,6 +11,6 @@
NAME = 'lighttpd'
PLATFORMS = ['any']
DESCRIPTION = 'lighttpd webserver control plugin'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
View
@@ -5,6 +5,6 @@
NAME = 'Logs'
PLATFORMS = ['any']
DESCRIPTION = 'Read system logs'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -24,6 +24,6 @@
NAME = 'Network'
PLATFORMS = ['arch', 'centos', 'debian', 'fedora', 'freebsd']
DESCRIPTION = 'Network interfaces management'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -11,6 +11,6 @@
NAME = 'nginx'
PLATFORMS = ['any']
DESCRIPTION = 'nginx webserver control plugin'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -5,6 +5,6 @@
NAME = 'Notepad'
PLATFORMS = ['any']
DESCRIPTION = 'Configuration files editor'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -18,6 +18,6 @@
NAME = 'Package manager'
PLATFORMS = ['debian', 'arch', 'freebsd', 'centos', 'fedora']
DESCRIPTION = 'Manage software packages'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -10,6 +10,6 @@
NAME = 'Samba'
PLATFORMS = ['any']
DESCRIPTION = 'Control Samba server'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -11,6 +11,6 @@
NAME = 'Squid'
PLATFORMS = ['any']
DESCRIPTION = 'Control Squid caching proxy server'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -11,6 +11,6 @@
NAME = 'SARG'
PLATFORMS = ['any']
DESCRIPTION = 'Control Squid report generator'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
@@ -5,6 +5,6 @@
NAME = 'Users'
PLATFORMS = ['any']
DESCRIPTION = 'Manage user accounts'
-VERSION = '0:1.0'
+VERSION = '0:1.1'
AUTHOR = 'Ajenti team'
HOMEPAGE = 'http://ajenti.org'
View
@@ -5,7 +5,7 @@
setup(
name='Ajenti',
- version='0.5-4',
+ version='0.5-5',
description='The server administration panel',
author='Eugeny Pankov',
author_email='e@ajenti.org',

0 comments on commit 4805450

Please sign in to comment.