Commit Graph
970 Commits
Author SHA1 Message Date
Fabien Pinckaers d554f09ca7 [IMP] Logo
bzr revid: fp@openerp.com-20140119122959-etp99cwiuuagws30
2014-01-19 13:29:59 +01:00
Fabien Pinckaers 5c5334ea4c [IMP] CSS logo
bzr revid: fp@tinyerp.com-20140119122503-ngjotynnvtvv0rqd
2014-01-19 13:25:03 +01:00
Fabien Pinckaers 7fb925b095 [IMP] CSS
bzr revid: fp@tinyerp.com-20140119121715-zmo9x5r234wmqvdj
2014-01-19 13:17:15 +01:00
Fabien Pinckaers 49d5c0bf1b [IMP] size of logo
bzr revid: fp@tinyerp.com-20140119121147-frnx3zh9hnayn24z
2014-01-19 13:11:47 +01:00
Fabien Pinckaers 9cc5ca1672 [IMP] CSS for logo
bzr revid: fp@tinyerp.com-20140119120949-8pzoe8kx4y612nav
2014-01-19 13:09:49 +01:00
Fabien Pinckaers 270a25c7f5 [IMP] Allow logo in header
bzr revid: fp@openerp.com-20140119120858-43rgeymrjmt42f11
2014-01-19 13:08:58 +01:00
Fabien Pinckaers a559aca8d1 [IMP] better images for library
bzr revid: fp@tinyerp.com-20140117082813-7wa345r76txiin97
2014-01-17 09:28:13 +01:00
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...)
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
2014-01-16 19:05:35 +01:00
Thibault Delavallée a1748260de [MERGE] Due to some issues with the trunk being merged
in my branch, I merge the legacy website-al branch, in order to perform an fp-style
merge.

Revisions included :
10487 and 10498 from fme that are null (commit and revert)
10488 from xmo: [ADD] dialog for fontawesome glyph manipulation

bzr revid: tde@openerp.com-20140116120949-27dnoa9n2pz0ms6q
2014-01-16 13:09:49 +01:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Xavier Morel e2fede3fe7 [ADD] dialog for fontawesome glyph manipulation
bzr revid: xmo@openerp.com-20140116094747-w1uey27l39fy66zc
2014-01-16 10:47:47 +01:00
Fabien Pinckaers 8bfed06459 [IMP] Small bootstrap fix for nested containers
bzr revid: fp@tinyerp.com-20140116083653-z3hk2w8ol6xrvgln
2014-01-16 09:36:53 +01:00
Christophe Matthieu cd12832f9e [IMP] product: Service (product.product_product_consultant) is sale_ok=False by default and overwrite in hr_timesheet to True
bzr revid: chm@openerp.com-20140115152526-dptyljv7yxdkmis0
2014-01-15 16:25:26 +01:00
Christophe Matthieu 3487d36fc2 [FIX] website_sale: fix boostrap row
bzr revid: chm@openerp.com-20140115143139-dieh48j9t1tbh4w3
2014-01-15 15:31:39 +01:00
Christophe Matthieu bcef910f84 [FIX] website editor: add attributeEditable attribute to edit an editing host
bzr revid: chm@openerp.com-20140115141756-4ixq240p5z1snt9h
2014-01-15 15:17:56 +01:00
Christophe Matthieu 2d659d5102 [IMP] website: clean editor.css
bzr revid: chm@openerp.com-20140115130213-r55f246btqus6dzj
2014-01-15 14:02:13 +01:00
Christophe Matthieu fd14481dd3 [IMP] website snippet: create snippets.sass, imrpove css and resizing layout
bzr revid: chm@openerp.com-20140115125923-eggv51bsvokc7a06
2014-01-15 13:59:23 +01:00
Thibault Delavallée 006ffd00ad [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140115091759-fdupd1vral3z3ng8
2014-01-15 10:17:59 +01:00
Fabien Pinckaers 8d8c382582 [FIX] CSS bug
bzr revid: fp@tinyerp.com-20140114232046-56x0o2jnq93pi0wc
2014-01-15 00:20:46 +01:00
Fabien Pinckaers 097f9074b9 [IMP] more snippets
bzr revid: fp@tinyerp.com-20140114231054-am7au91oxjv66ntn
2014-01-15 00:10:54 +01:00
Fabien Pinckaers 942497350e [IMP] Features snippets
bzr revid: fp@tinyerp.com-20140114223158-0nlv75aavf0zrntp
2014-01-14 23:31:58 +01:00
Fabien Pinckaers a14745d53e [IMP] Clean flat colors
bzr revid: fp@tinyerp.com-20140114220548-c2bda6k3fn8weqqn
2014-01-14 23:05:48 +01:00
Fabien Pinckaers d73c8f15b6 [IMP] cleaned CSS, removed CSS
bzr revid: fp@tinyerp.com-20140114212533-iz4oleo0opads01l
2014-01-14 22:25:33 +01:00
Thibault Delavallée 5be1dfda6e [MERGE] Sync with website-al
bzr revid: tde@openerp.com-20140114171738-zz4apq7nk5dcov0i
2014-01-14 18:17:38 +01:00
Christophe Matthieu 45feba1f86 [IMP]website_sale: no product message for public users
bzr revid: chm@openerp.com-20140114162925-z1gcl5h2rkxb7crx
2014-01-14 17:29:25 +01:00
Christophe Matthieu dac3058100 [IMP] website: This page is under construction
bzr revid: chm@openerp.com-20140114160434-wukbj48ope1twhja
2014-01-14 17:04:34 +01:00
Christophe Matthieu f51b91c345 [FIX] website: mobile snippets height
bzr revid: chm@openerp.com-20140114151243-u1rjzw0exhskukbx
2014-01-14 16:12:43 +01:00
Thibault Delavallée cbbe82a4a1 [MERGE] Sync with main website-al branch
bzr revid: tde@openerp.com-20140113134937-kijvjjne6grov61c
2014-01-13 14:49:37 +01:00
Thibault Delavallée b97727701c [IMP] [ADD] website: added base for template designer.
[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
2014-01-13 13:55:34 +01:00
ddm@openerp.com f319a68196 [IMP] requestd by fp: load correct HTML template
bzr revid: ddm@openerp.com-20140113112514-qg43scqeryaha4nf
2014-01-13 12:25:14 +01:00
ddm@openerp.com 44adcd9f2d [FIX] ugly race condition hack
bzr revid: ddm@openerp.com-20140110132734-n0ip9wyinw19c76e
2014-01-10 14:27:34 +01:00
ddm@openerp.com 98d008cfb1 [IMP] UI tests: click only on visible buttons
bzr revid: ddm@openerp.com-20140109164214-3s280i00mbath8ep
2014-01-09 17:42:14 +01:00
ddm@openerp.com 43ff1781d6 [IMP] UI tests: click only on visible buttons
bzr revid: ddm@openerp.com-20140109164145-b0z9ctzqmypppiaq
2014-01-09 17:41:45 +01:00
ddm@openerp.com 0c3ebb92d0 [FIX] fix blog ui test
bzr revid: ddm@openerp.com-20140108180954-1l2lbm6tasi4tuzb
2014-01-08 19:09:54 +01:00
ddm@openerp.com 078570278d [FIX] old instance was blacklisted by google
bzr revid: ddm@openerp.com-20140108171431-gfprqiycsg3ryfax
2014-01-08 18:14:31 +01:00
ddm@openerp.com 38ffa6f93e [IMP] event UI tests
bzr revid: ddm@openerp.com-20140108171225-tzarqg6xy8a7sez3
2014-01-08 18:12:25 +01:00
Christophe Matthieu 01cae7cf52 [IMP] website snippet: auto hide snippet top bar when the user click outside
bzr revid: chm@openerp.com-20140108145046-dz4iuuve0daz7hwg
2014-01-08 15:50:46 +01:00
Christophe Matthieu d5bcb3b947 [FIX] website/payment_acquirer: payment/adyen/return: Add pspReference attribute in the route method to force to have this arguments and hide this url from the sitemap
bzr revid: chm@openerp.com-20140108142315-nyaleejvpugfygew
2014-01-08 15:23:15 +01:00
Christophe Matthieu 3d96b4c2a3 [IMP] website: snippets: add resize bar on snippet overlay; resising % 8px; remove size class
bzr revid: chm@openerp.com-20140108122113-d2zcyaobkahixlpa
2014-01-08 13:21:13 +01:00
ddm@openerp.com 56e5fc3c05 [FIX] UI blog tests
bzr revid: ddm@openerp.com-20140107171841-ysj0qzb9g3hqbvad
2014-01-07 18:18:41 +01:00
ddm a408924315 [FIX] Snippets placed below editor bar
bzr revid: ddm@openerp.com-20140102171825-208jw33qlmwj05fd
2014-01-02 18:18:25 +01:00
ddm 0e430008bd [IMP] Added blog UI test
bzr revid: ddm@openerp.com-20140102151115-16mlisduee7zav6g
2014-01-02 16:11:15 +01:00
ddm 14cc067b4a [IMP] Mini code cleanup
bzr revid: ddm@openerp.com-20131231131842-pzaqildephzp69xj
2013-12-31 14:18:42 +01:00
ddm 7b5f713c93 [FIX] Fixed popovers in banner tour
bzr revid: ddm@openerp.com-20131231101338-91q7yt5d62joldwd
2013-12-31 11:13:38 +01:00
ddm 5ceabe49db [FIX] Last hope?
bzr revid: ddm@openerp.com-20131230170628-kg6j67rc6v5za7ln
2013-12-30 18:06:28 +01:00
ddm 02e944cb8a [FIX] UI tests should not fail on runbot
bzr revid: ddm@openerp.com-20131227100939-dadzuyexl0anrese
2013-12-27 11:09:39 +01:00
ddm dbe5c06d95 [IMP] PhantomJS UI tests code cleanup
bzr revid: ddm@openerp.com-20131223144100-h8eui7szdj40e2mo
2013-12-23 15:41:00 +01:00
ddm 54224e4f3c [FIX] Remove debugging code
bzr revid: ddm@openerp.com-20131223135644-8ri2jbco8khjtlyq
2013-12-23 14:56:44 +01:00
ddm 8fd5fb82a7 [IMP] Added simple DOM UI test as example
bzr revid: ddm@openerp.com-20131223135425-9hxb4nmvdr0rrb3t
2013-12-23 14:54:25 +01:00
Fabien Meghazi af1e65ffdb [IMP] Use cursor: text for editable .btn's
bzr revid: fme@openerp.com-20131219093410-lgr1f54nehaz9fk0
2013-12-19 10:34:10 +01:00