diff --git a/.idea/workspace.xml b/.idea/workspace.xml index cbf7262..22d8872 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,17 +2,8 @@ - - - - - - - - - - - + + @@ -100,7 +91,7 @@ - + @@ -110,6 +101,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -141,6 +152,7 @@ @@ -410,18 +422,18 @@ 1480428196914 - + - - + - + @@ -590,6 +602,22 @@ + + + + + + + + + + + + + + + + diff --git a/Makefile b/Makefile index 39d1531..84c13a9 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,2 @@ default: - ant deploy; cp -r /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/contactimporter /usr/share/kopano-webapp/plugins/ + rm -rf /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/contactimporter; ant deploy; cp -r /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/contactimporter /usr/share/kopano-webapp/plugins/ diff --git a/build.xml b/build.xml index dba3f1c..e499f01 100644 --- a/build.xml +++ b/build.xml @@ -1,200 +1,246 @@ - - - - - + + + + + + - + - - - - - + + + + + - - - - - + + + + + - - + + - - - - + + + + - - - + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - var Ext = {}; - var Zarafa = {}; - var container = {}; - var _ = function(key, domain) {}; - var dgettext = function(domain, msgid) {}; - var dngettext = function(domain, msgid, msgid_plural, count) {}; - var dnpgettext = function(domain, msgctxt, msgid, msgid_plural, count) {}; - var dpgettext = function(domain, msgctxt, msgid) {}; - var ngettext = function(msgid, msgid_plural, count) {}; - var npgettext = function(msgctxt, msgid, msgid_plural, count) {}; - var pgettext = function(msgctxt, msgid) {}; - - - - - + + + + + + + + + var Ext = {}; + var Zarafa = {}; + var container = {}; + var _ = function(key, domain) {}; + var dgettext = function(domain, msgid) {}; + var dngettext = function(domain, msgid, msgid_plural, count) {}; + var dnpgettext = function(domain, msgctxt, msgid, msgid_plural, count) {}; + var dpgettext = function(domain, msgctxt, msgid) {}; + var ngettext = function(msgid, msgid_plural, count) {}; + var npgettext = function(msgctxt, msgid, msgid_plural, count) {}; + var pgettext = function(msgctxt, msgid) {}; + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file