pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
1048 Commits
Author SHA1 Message Date
Christophe Matthieu 0e2b946ff3 [IMP] website snippet: convert column widget into visible snippet (in content category) 
bzr revid: chm@openerp.com-20140122094149-pdnc86o0q0v9aywo
 2014-01-22 10:41:49 +01:00
ddm@openerp.com 1c3a7a8fd3 [IMP] Add support for Google Analytics 
bzr revid: ddm@openerp.com-20140121163456-i3v3a7oh8qejc9oo
 2014-01-21 17:34:56 +01:00
Christophe Matthieu b38d4d8a81 [FIX] website_blog: tour 
bzr revid: chm@openerp.com-20140121152307-kx92ee0za0w0pprr
 2014-01-21 16:23:07 +01:00
Xavier Morel c35ac33cf1 [IMP] don't lose link label/text if crap element with no href 
bzr revid: xmo@openerp.com-20140121151310-va8e20avgvzy0anz
 2014-01-21 16:13:10 +01:00
Xavier Morel bf262a338e [ADD] hover edit button on FA glyphs, rename 'Edit x' to 'Change' 
bzr revid: xmo@openerp.com-20140121150843-fm2uqxctlejlwe5c
 2014-01-21 16:08:43 +01:00
ddm@openerp.com cccdc808f9 [FIX] SEO bug + label 
bzr revid: ddm@openerp.com-20140121142052-3u9dcu995p1tdu6b
 2014-01-21 15:20:52 +01:00
Xavier Morel a6ad36ef89 [ADD] attempt to correctly initialize ckeditor widgets (fontawesome icon things at the moment) within a dropped snippet 
bzr revid: xmo@openerp.com-20140121131841-u0qzlk1ytng3af2h
 2014-01-21 14:18:41 +01:00
ddm@openerp.com 35b8850ecc [IMP] add SEO preview 
bzr revid: ddm@openerp.com-20140121125325-641psvqr4w96lsci
 2014-01-21 13:53:25 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget 
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
 2014-01-21 13:39:12 +01:00
Xavier Morel 51f6977f39 [IMP] icons selection dialog 
remove fixed size checkbox
add fayt for icons (by name)

bzr revid: xmo@openerp.com-20140121100408-64e32iio9r77yx9m
 2014-01-21 11:04:08 +01:00
Xavier Morel ca02581993 [IMP] replace icon size select by selectable multi-size preview 
bzr revid: xmo@openerp.com-20140120162604-yoyg21bf1z306hwg
 2014-01-20 17:26:04 +01:00
Fabien Meghazi c1f0fb5ed1 [MERGE] upstream 
bzr revid: fme@openerp.com-20140120161145-ntxx6y01vekk3tg2
 2014-01-20 17:11:45 +01:00
Xavier Morel 501e88d3eb [IMP] replace select2 by grid for icons selection 
bzr revid: xmo@openerp.com-20140120153610-xktkxjfbpl59xnpz
 2014-01-20 16:36:10 +01:00
Christophe Matthieu 8d48ce0f5a [IMP] website: js test/tour: raise an exception when cycling or time overlaps 
bzr revid: chm@openerp.com-20140121100717-d8foqqz5vmdyowuo
 2014-01-21 11:07:17 +01:00
Christophe Matthieu 3b1fec3220 [FIX] website: double reload in tests process 
bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
 2014-01-21 09:30:38 +01:00
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process 
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
 2014-01-20 19:26:43 +01:00
Christophe Matthieu 46e7638d81 [FIX] website tour: add 'url' triggers 
bzr revid: chm@openerp.com-20140120151637-ac1orinuq49rcqx9
 2014-01-20 16:16:37 +01:00
Christophe Matthieu d175a4fd00 [IMP] website tour: add 'url' triggers; triggers emitter raise an exception if emmitter is undefined 
bzr revid: chm@openerp.com-20140120150614-ra8najdd9hp24y18
 2014-01-20 16:06:14 +01:00
Xavier Morel 620652c420 [FIX] excessive horizontal and vertical offsetting of edition button on images in webkit browsers 
Manually adding margins to offsets was necessary due to
http://bugs.jquery.com/ticket/5445#comment:6 and the original code
using $.fn.position().

When edition buttons were moved to being children of the body (rather
than siblings of the image), $.fn.position() was replaced by
$.fn.offset() (to get the position of the image/link relative to the
body/page toplevel), the adjustment (addition of marginLeft/marginTop)
was left in, even though #5445 does not apply to $.fn.offset().

bzr revid: xmo@openerp.com-20140120144610-nu8q2naemzzhekv2
 2014-01-20 15:46:10 +01:00
Christophe Matthieu 97da0a2e52 [IMP] website tour: add 'reload' triggers 
bzr revid: chm@openerp.com-20140120133919-hvdsqax5h6n8mlp3
 2014-01-20 14:39:19 +01:00
Christophe Matthieu 7651b8f700 [IMP] website snippet: activate margin bottom resizing for colmd snippet 
bzr revid: chm@openerp.com-20140120111042-nn76p9roezqgdehr
 2014-01-20 12:10:42 +01:00
Fabien Pinckaers c8919713bf [IMP] left alignment in navbar logo 
bzr revid: fp@tinyerp.com-20140119194441-ug22bg0n3q89nowr
 2014-01-19 20:44:41 +01:00
Fabien Pinckaers c1b96e7ebf [IMP] better demo data logo 
bzr revid: fp@tinyerp.com-20140119194205-z7vossf1x30yftt8
 2014-01-19 20:42:05 +01:00
Fabien Pinckaers a83f1282fa [IMP] CSS for logo, one pixel better 
bzr revid: fp@tinyerp.com-20140119193527-8e7oc1umebqkqxgx
 2014-01-19 20:35:27 +01:00
Fabien Pinckaers a571dd0849 [IMP] CSS Logo 
bzr revid: fp@tinyerp.com-20140119125357-v5yta1lltm4yo6q4
 2014-01-19 13:53:57 +01:00
Fabien Pinckaers b77b487c4a [IMP] CSS 
bzr revid: fp@tinyerp.com-20140119124958-qz5dsz8m325upphl
 2014-01-19 13:49:58 +01:00
Fabien Pinckaers 71df4bd1db [IMP] CSS logo 
bzr revid: fp@tinyerp.com-20140119123225-f5og62iymz2kacm2
 2014-01-19 13:32:25 +01:00
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
Fabien Meghazi 735c2b501b [IMP] integrate login into the website.layout 
bzr revid: fme@openerp.com-20140116181746-e2z9m4gym5kcdgmr
 2014-01-16 19:17:46 +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