Christophe Simonis
31bf30d2d0
[MERGE] forward port of branch 8.0 up to ed1c173
2014-09-05 15:28:22 +02:00
Fabien Meghazi
ec22e9b0cf
[IMP] Make translation todo's readable when hovered
2014-09-01 10:21:31 +02:00
Christophe Matthieu
1b0031c524
[IMP] website.snippet: create automatically the thumbnail; data-option became data-js; add data-eval method; rename check_class into toggle_class
2014-08-27 12:20:14 +02:00
Christophe Matthieu
239b6bc0b5
[IMP] website snippet new option, gallery
...
website.snippet: The methods described in javascript will be called automatically from the data-method_name = value on li snippets options. The methods are called in the order relative to children of xml (eg: <li data-method1=value1> ... <li data-method2=value2> ... </ li>, the method1 is then called method2). Methods receive two arguments: type (over, click, reset) and value. data-snippet-id-option becomes data-snippet-id. Several xml options can use the same data-snippet-id.
add a new gallery snippet
convert website_sale to the new option system
2014-08-21 18:02:14 +02:00
Christophe Matthieu
777a082bfc
[IMP] website: create customize theme application and color-picker; Create theme_bootswatch and use less files.
2014-08-08 11:58:40 +02:00
Denis Ledoux
1bb219907f
[MERGE] forward port of branch saas-5 up to 655a5b9
2014-08-04 16:56:10 +02:00
Christophe Matthieu
8d53c357ba
Merge pull request #1428 from odoo-dev/sass-5-fixes-chm
...
[FIX] website_sale and point_of_sale fixes
2014-08-04 14:43:54 +02:00
Christophe Matthieu
9bf1203c33
[FIX] website: the media video create by the media editor is not display in firefox. change the css to display the video and add z-index to the div for edit mode
2014-08-01 11:54:39 +02:00
Christophe Simonis
4946327eac
[MERGE] forward port of branch 8.0 up to fd4fd35
2014-07-30 20:52:43 +02:00
Christophe Simonis
e4cb5202a0
[MERGE] forward port of branch saas-4 up to fa07bc8
2014-07-30 20:30:14 +02:00
Denis Ledoux
88c022dfc8
[MERGE] forward port of branch 7.0 up to bbb8d8f25a
2014-07-29 11:42:10 +02:00
Christophe Matthieu
0a13d8f1db
[FIX] website.snippet: display snippet editor button inline insead of 2 lines for the small boxes
2014-07-23 16:21:53 +02:00
Christophe Simonis
b7ba49825a
[MERGE] forward port of branch 8.0 up to a5419ca
2014-07-15 11:23:47 +02:00
Christophe Matthieu
1eee1d2c51
[IMP] website: replace the select box into dropdown for link editor to have a preview
2014-07-11 11:09:24 +02:00
Christophe Matthieu
67e15d8d86
[FIX] web: update bootstrap to version 3.2.0; add bootstrap less files
2014-07-10 16:59:31 +02:00
Fabien Meghazi
d137b0aec0
[ADD] Option to list asset bundles in templates editor
2014-07-10 14:01:03 +02:00
Simon Lejeune
195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Christophe Simonis
1eaa69d342
[MERGE] forward port of branch saas-5 up to 9e8e365
2014-06-25 12:44:13 +02:00
Christophe Simonis
9e8e3653f2
[MERGE] forward port of branch saas-4 up to f68c835
2014-06-25 12:43:41 +02:00
Simon Lejeune
478a763cac
[MERGE] manual merge of latest bootswatch minified stylesheets
2014-06-24 11:48:49 +02:00
Christophe Matthieu
5165b52b43
merge upstream
2014-06-19 18:46:49 +02:00
Christophe Matthieu
2d686988a4
[FIX] tour.js: forgotten backdrop and orphan css
2014-06-19 17:52:32 +02:00
Xavier Morel
00c2644783
[IMP] display view's XID *below* the selection
...
* Looks better
* Allows for a label
* Allows for longer template names and ids without cutting off
* Room to grow more info bits
2014-06-17 16:22:28 +02:00
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
d3beae2921
[FIX] website: make sure the hidden properties on website will not be overwritten by other properties
2014-05-16 12:19:32 +02:00
ee7ff4bd07
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
Christophe Simonis
12beacda08
[MERGE] backport of trunk revisions:
...
9362 fp@tinyerp.com-20140421205739-rki3bctinjy3amzy [MERGE] new module: website_forum_doc + small fixes (close) in forum
9363 fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3 [IMP] improved form view for posts
bzr revid: chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
2014-04-22 16:32:49 +02:00
Fabien Pinckaers
cbf071a62c
[IMP] better layout for documentation
...
bzr revid: fp@tinyerp.com-20140421144510-9qo1whru5u5ec721
2014-04-21 16:45:10 +02:00
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
1b6585e614
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00
Fabien Pinckaers
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
Kersten Jeremy
afc2685cee
[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width
...
bzr revid: jke@openerp.com-20140414142631-k78shkqjqdtcnp83
2014-04-14 16:26:31 +02:00
15c035631d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140409154520-eddr2h21bei95xxu
2014-04-09 17:45:20 +02:00
f090689984
[FIX] website: The separator block is not working (no drop zone)
...
bzr revid: chm@openerp.com-20140409140733-ne0frg4o7b3c1lr0
2014-04-09 16:07:33 +02:00
88eaa5f26f
[IMP] website: remove transform in modile view and change order menu
...
bzr revid: chm@openerp.com-20140409124321-cwu86whebzuwtz1e
2014-04-09 14:43:21 +02:00
Kersten Jeremy
f3e405fbe1
[FIX] Website snippet - Update carousel to use bootstrap position and size without CSS. Fix bug with slide-to which doesn't work.
...
bzr revid: jke@openerp.com-20140408115424-irsmuhibasonhv7p
2014-04-08 13:54:24 +02:00
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
d65b2cff23
[IMP] website: snippet editor, move resize button
...
bzr revid: chm@openerp.com-20140407112330-6cj02vlmcs9gwxst
2014-04-07 13:23:30 +02:00
cdf4636dce
[IMP] website: media editor: remove previous and next button for picto
...
bzr revid: chm@openerp.com-20140407081751-upxilacnt4szk4s6
2014-04-07 10:17:51 +02:00
e81c205b18
[FIX] website: snippet: link carousel-control
...
bzr revid: chm@openerp.com-20140331130304-v1winnhp41agb030
2014-03-31 15:03:04 +02:00
880ac90e1b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140331121654-jsdotezdyi9qwmeb
2014-03-31 14:16:54 +02:00
4281a3f89f
[FIX] website: snippet typo of resize button
...
bzr revid: chm@openerp.com-20140331101043-0mf3c6pndz133huy
2014-03-31 12:10:43 +02:00
e94c9eea4e
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331081027-v1eikz3ei78xjjqz
2014-03-31 10:10:27 +02:00
ajay javiya (OpenERP)
c4896f801c
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq
2014-03-31 09:49:56 +05:30
Fabien Pinckaers
f1131d547b
[IMP] flat design, even for darken
...
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01:00
31269ba52f
[IMP] website: media editor doubleclick for video and begin to use snippet builder
...
bzr revid: chm@openerp.com-20140328141619-x9okgixai2v5dekr
2014-03-28 15:16:19 +01:00
b0625b1191
[IMP] website: add video media editor
...
bzr revid: chm@openerp.com-20140328104453-2faynhhc1wi5598l
2014-03-28 11:44:53 +01:00
ajay javiya (OpenERP)
e63646130e
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
2014-03-28 09:58:15 +05:30
e289e23298
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge
2014-03-27 18:14:17 +01:00
Christophe Simonis