ajay javiya (OpenERP)
a9ee5d0a79
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140401084327-daftkqduvknsa0rp
2014-04-01 14:13:27 +05:30
Quentin (OpenERP)
0a2a118ba3
[MERGE] website_gengo branch merged, offering the possiblity to translate the website using Gengo
...
bzr revid: qdp-launchpad@openerp.com-20140401073953-p46kottwmk9buhor
2014-04-01 09:39:53 +02:00
ajay javiya (OpenERP)
138f5d7f32
[MERGE] : with trunk and resolve conflicts
...
bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn
2014-04-01 10:58:01 +05:30
b6ba6d9a9c
[FIX] website: create new page redirect to error 404
...
bzr revid: chm@openerp.com-20140331144123-p3unfkbqm5c0y1sx
2014-03-31 16:41:23 +02:00
Parth Gajjar (Open ERP)
8bde127659
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140331122509-vkpy077tp216molq
2014-03-31 17:55:09 +05:30
Parth Gajjar (Open ERP)
ff1588a46d
[IMP] added new supportable languages, bog solved in config dialog, improved count words dialog
...
bzr revid: pga@tinyerp.com-20140331070625-qtr7l45lnca5rfze
2014-03-31 12:36:25 +05:30
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
Parth Gajjar (Open ERP)
3de6738dbb
merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140328131822-0kc0f5j5qhupkhbr
2014-03-28 18:48:22 +05:30
ajay javiya (OpenERP)
e63646130e
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
2014-03-28 09:58:15 +05:30
Fabien Meghazi
cf311bda60
[MERGE] remote module import
...
bzr revid: fme@openerp.com-20140327141233-i7xu8ism7howhflv
2014-03-27 15:12:33 +01:00
Parth Gajjar (Open ERP)
2de4260240
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140327113805-2ie66rru6o10nv38
2014-03-27 17:08:05 +05:30
c1b6589851
[IMP] website_event: widget to promote Events with country flag
...
bzr revid: chm@openerp.com-20140327093517-8ppcxypc6krxc2fi
2014-03-27 10:35:17 +01:00
Fabien Meghazi
eb5cbea318
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
Parth Gajjar (Open ERP)
473243270b
[MERGE] merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140326112709-m1iqkkmjt1xtmio1
2014-03-26 16:57:09 +05:30
ajay javiya (OpenERP)
864892d6ce
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
2014-03-26 11:18:41 +05:30
Fabien Meghazi
0fe55dddc1
[IMP] Added a mimetype field in ir.attachment
...
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04:13 +01:00
ajay javiya (OpenERP)
f76a734e90
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140325114109-lts5z42lq9xlgqx0
2014-03-25 17:11:09 +05:30
13d7cfe86c
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Fabien Pinckaers
fa46f255f2
[IMP] wording
...
bzr revid: fp@tinyerp.com-20140324203540-rx76yaqaw3p9aql9
2014-03-24 21:35:40 +01:00
e5f645df4d
[FIX] website: snippet editor: forward port of branch saas-3
...
bzr revid: chm@openerp.com-20140324145416-qn2fvylylxtgu39a
2014-03-24 15:54:16 +01:00
5692dbdb5e
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324135220-j0abaam1n4ue03l7
2014-03-24 14:52:20 +01:00
449ca3ab18
[IMP] website snippet: add example in documentation
...
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
Christophe Simonis
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
ba55fcf1d0
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324130119-xbnejtayna8haykk
2014-03-24 14:01:19 +01:00
Parth Gajjar (Open ERP)
bf0d35dbdd
[IMP] merged gengo translator with main translator, removed 'Restart Job' from wizard,removed constraint from base_gengo
...
bzr revid: pga@tinyerp.com-20140324103631-j4cswrlk5huuibt5
2014-03-24 16:06:31 +05:30
Xavier Morel
aa9387e845
[FIX] don't mark view sections as dirty just because the snippets thing has inserted drop zones in it
...
bzr revid: xmo@openerp.com-20140324101850-el3cfs0x4uln3u7v
2014-03-24 11:18:50 +01:00
Fabien Pinckaers
843ac33ad9
[IMP] clean css
...
bzr revid: fp@tinyerp.com-20140322185641-qy57fotd1uvztffy
2014-03-22 19:56:41 +01:00
Denis Ledoux
30853afd18
[FIX] website: prevent animations in edit mode
...
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
Parth Gajjar (Open ERP)
ac8babe0e5
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
2014-03-20 17:37:58 +05:30
Parth Gajjar (Open ERP)
e45d9bc7b0
[IMP] removed unnecessary code
...
bzr revid: pga@tinyerp.com-20140320094434-4zp7x6dmd27wfza2
2014-03-20 15:14:34 +05:30
Parth Gajjar (Open ERP)
a378f547f4
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320092643-1pw62dmbj9h6sjh4
2014-03-20 14:56:43 +05:30
Parth Gajjar (Open ERP)
b7a68828ed
[IMP] improved statistics, added sendbox options for testing, improved UI
...
bzr revid: pga@tinyerp.com-20140320071028-adyh8d89o7dij81o
2014-03-20 12:40:28 +05:30
Parth Gajjar (Open ERP)
b8d87606f0
[IMP] added gengo statistics, displayed inprogress elements
...
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
2014-03-19 19:01:21 +05:30
00aa1b69dc
[FIX] website tour: don't hide error in test mode if openerp don't exist
...
bzr revid: chm@openerp.com-20140319102348-rb1tkgd14nca6o15
2014-03-19 11:23:48 +01:00
b80d06d327
[FIX] website tour: reset tour before console.log 'ok' or 'error' who close phantomjs tour
...
bzr revid: chm@openerp.com-20140319092012-v83w99ts6z0apgl0
2014-03-19 10:20:12 +01:00
Dharmraj Jhala (OpenERP)
e07861bb19
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
a762af1f21
[FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
...
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
ed2743f755
merge upstream
...
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
Parth Gajjar (Open ERP)
c49befd59f
[ADD] added website_gengo module
...
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
Christophe Simonis
99a3c45976
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
...
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
1395c9ee0e
[IMP] website: snippet editor: change size automatic button into a cross between resize handler
...
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
f9579073fe
[FIX] website: color of Edit Master link for themes. CSS less specific
...
bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
2014-03-18 12:14:42 +01:00
abe8e7208e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
Kersten Jeremy
77622d3b24
[FIX] Fix css which make unusable the option dropdown for unpublished product. When an user was hover on a product not published and was trying to go in submenu, he had lost cursor, because he was changing div due to opacoty little than 1.
...
bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
2014-03-18 10:23:41 +01:00
Dharmraj Jhala (OpenERP)
3566b69374
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
d87bc392ce
[IMP] website snippet option: rename data-class into data-value
...
bzr revid: chm@openerp.com-20140317144254-18cscu2yx5thmb89
2014-03-17 15:42:54 +01:00
b8071f8bc7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140317142550-53fky76kjdc04s4h
2014-03-17 15:25:50 +01:00
d3111df3aa
[FIX] website: The user does not see the content menu because of the tutorial is hover
...
bzr revid: chm@openerp.com-20140317141324-th65fhx512h2p1fa
2014-03-17 15:13:24 +01:00
Xavier Morel
cd4f83122a
[FIX] reduce span of paragraph spacer thing to not break layout
...
bzr revid: xmo@openerp.com-20140317135144-hvuxshfp4cjudnbh
2014-03-17 14:51:44 +01:00
ajay javiya (OpenERP)