Browse Source

Merge remote-tracking branch 'origin/8.0' into 9.0-dev

Conflicts:
	im_notif/__openerp__.py
	mail_delete_access_link/__openerp__.py
	mail_delete_sent_by_footer/__openerp__.py
pull/2/head
Ivan Yelizariev 9 years ago
parent
commit
66d66c00e2
  1. 2
      __openerp__.py
  2. 12
      static/description/index.html

2
__openerp__.py

@ -4,7 +4,7 @@
'author' : 'IT-Projects LLC, Ivan Yelizariev', 'author' : 'IT-Projects LLC, Ivan Yelizariev',
'license': 'LGPL-3', 'license': 'LGPL-3',
'category' : 'Social Network', 'category' : 'Social Network',
'website' : 'https://yelizariev.github.io',
'website' : 'https://twitter.com/yelizariev',
'price': 9.00, 'price': 9.00,
'currency': 'EUR', 'currency': 'EUR',
'depends' : ['mail'], 'depends' : ['mail'],

12
static/description/index.html

@ -35,14 +35,12 @@ This menu shows messages in threads (like in other menus), but shows only sent m
<section class="oe_container"> <section class="oe_container">
<div class="oe_row oe_spaced"> <div class="oe_row oe_spaced">
<div class="oe_span12"> <div class="oe_span12">
<h2>News &amp; updates</h2>
<p class="oe_mt32">
To get information about new interesting modules and updates, <a href="https://yelizariev.github.io/feed.xml">subscribe to our website RSS</a> or follow <a href="https://twitter.com/yelizariev" target="_blank">@yelizariev</a> on twitter.
</p>
<h2>Need our service?</h2>
<p class="oe_mt32">Contact us by <a href="mailto:it@it-projects.info">email</a> or fill out <a href="https://www.it-projects.info/page/website.contactus " target="_blank">request form</a></p>
<ul> <ul>
<li><a href="https://yelizariev.github.io" target="_blank">https://yelizariev.github.io <i class="fa fa-rss"></i> </a></li>
<li><a href="https://twitter.com/yelizariev" target="_blank">
https://twitter.com/yelizariev <i class="fa fa-twitter"></i> </a></li>
<li><a href="mailto:it@it-projects.info">it@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">
https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
</ul> </ul>
</div> </div>
</div> </div>

Loading…
Cancel
Save