Browse Source

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

Conflicts:
	_web_last_viewed_records/__openerp__.py
	itprojects_sale/__openerp__.py
	itprojects_website/__openerp__.py
	mail_delete_access_link/__openerp__.py
	mail_delete_sent_by_footer/__openerp__.py
	money_for/__openerp__.py
pull/2/head
Ivan Yelizariev 9 years ago
parent
commit
0f093737e9
  1. 1
      __openerp__.py
  2. 4
      static/description/index.html
  3. BIN
      static/description/record1.png
  4. BIN
      static/description/record2.png

1
__openerp__.py

@ -2,6 +2,7 @@
'name' : 'Mail relocation',
'version' : '1.0.2',
'author' : 'IT-Projects LLC, Ivan Yelizariev',
'license': 'LGPL-3',
'category' : 'Social Network',
'website' : 'https://yelizariev.github.io',
'price': 9.00,

4
static/description/index.html

@ -59,13 +59,13 @@
<div class="oe_span12">
<div class="oe_demo oe_picture oe_screenshot">
<img src="record1.png?1"/>
<img src="record1.png?3"/>
</div>
<p class="oe_mt32">
Scroll down... Moved mails are marked by highlighted icon.
</p>
<div class="oe_demo oe_picture oe_screenshot">
<img src="record2.png?1"/>
<img src="record2.png?4"/>
</div>
</div>
</div>

BIN
static/description/record1.png

Before

Width: 1007  |  Height: 537  |  Size: 59 KiB

After

Width: 1007  |  Height: 537  |  Size: 58 KiB

BIN
static/description/record2.png

Before

Width: 750  |  Height: 400  |  Size: 111 KiB

After

Width: 750  |  Height: 400  |  Size: 70 KiB

Loading…
Cancel
Save