Commit Graph
5553 Commits
Author SHA1 Message Date
Vidhin Mehta (OpenERP) e41508cb8d [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp
2014-05-05 10:02:33 +05:30
Gery Debongnie 132ccb7180 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
2014-05-02 14:33:55 +02:00
Antony Lesuisse aa943fae18 [FIX] qweb loading concat mode only, increase cache age to one day
bzr revid: al@openerp.com-20140501204242-jngte754yqyj4nb0
2014-05-01 22:42:42 +02:00
Antony Lesuisse 5e21a4235d [MERGE] saas-4 up to dle@openerp.com-20140501121915-q88k37nd25ietw8c
bzr revid: al@openerp.com-20140501172508-tjennzht30ktw3nz
2014-05-01 19:25:08 +02:00
Fabien Meghazi acf2123123 [MERGE] Web assets moved from manifests to ir.ui.view bundles
bzr revid: fme@openerp.com-20140430151302-e42monb4klz4udw5
2014-04-30 17:13:02 +02:00
Cédric Snauwaert af03a3e4e0 [FIX] export: make the 'Close' button works fine with modal
bzr revid: mat@openerp.com-20140430115650-334th9boorlb80aw
2014-04-30 13:56:50 +02:00
Richard Mathot (OpenERP) 03cfbf0f46 [MERGE] from lp:openerp-web
bzr revid: rim@openerp.com-20140430080103-tc4a9ow7rwp3b5nk
2014-04-30 10:01:03 +02:00
Fabien Meghazi f144f3a7c7 [REM] useless load_script
bzr revid: fme@openerp.com-20140430073342-nyjdb88soxggzkvr
2014-04-30 09:33:42 +02:00
Fabien Meghazi 22725bd29f [MERGE] upstream
bzr revid: fme@openerp.com-20140429142729-y4kfuohn4lsklnud
2014-04-29 16:27:29 +02:00
Simon Lejeune 6bef64f513 [MERGE] trunk
bzr revid: sle@openerp.com-20140422123804-dnjnwfyfrpxjgrlo
bzr revid: sle@openerp.com-20140424124720-ihcrqojmnmj0k66q
bzr revid: sle@openerp.com-20140428162227-sbvq5ogtshpz0vw6
bzr revid: sle@openerp.com-20140429124237-dhk3378fvche068v
2014-04-29 14:42:37 +02:00
Kunal Chavda (OpenERP) 6f51331d52 [MERGE][FIX] Position of m2o autocompletion on too small and non scrollable screens
bzr revid: rim@openerp.com-20140429112237-jdnd04gr1t2qot5r
2014-04-29 13:22:37 +02:00
Fabien Meghazi dde0c9324b [IMP] Convered qunit test suite to template
bzr revid: fme@openerp.com-20140428182451-u4mgen9669gnldva
2014-04-28 20:24:51 +02:00
Vidhin Mehta (OpenERP) 4312b921f3 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140425130739-ug3n26htiqrky5j3
2014-04-25 18:37:39 +05:30
Chirag Dodiya (OpenERP) 775e553d5a [IMP]Improved code for add <p> tag
bzr revid: cod@tinyerp.com-20140425101340-znewo5agt8vdl5mw
2014-04-25 15:43:40 +05:30
Fabien Meghazi 9c58bd5538 [FIX] listview test shall not assume default color is black
bzr revid: fme@openerp.com-20140425093053-3644kvcz13481fxo
2014-04-25 11:30:53 +02:00
Chirag Dodiya (OpenERP) 616c20a0f7 [MRG]Merge lp:openerp-web
bzr revid: cod@tinyerp.com-20140425061936-csz156gyzu0holkw
2014-04-25 11:49:36 +05:30
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Cedric Snauwaert 8ddf7a21b7 [FIX]calendar tooltip attachment container
bzr revid: csn@openerp.com-20140423145235-ajph1xj2l492q1sy
2014-04-23 16:52:35 +02:00
Cedric Snauwaert 1b594f5cce [FIX]while everything is not adaptative, leave overflow-y on modal body
bzr revid: csn@openerp.com-20140423131548-7hyo9eei2d2z99zc
2014-04-23 15:15:48 +02:00
Fabien Meghazi d4b534e7be [MERGE] upstream
bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb
2014-04-23 14:37:35 +02:00
Thibault Delavallée 48e9d255ae [FIX] web: list view: fixed button behavior
- icon-like behavior is the default behavior
- text-based buttons (using btn_txt class) are used whenever no icon is given to the
button in a list view.
This way the previous behavior is always the default behavior, and the css modifications are
done only for the text-based buttons, avoiding side-effects.

bzr revid: tde@openerp.com-20140423094124-8zq3yysy616aowu2
2014-04-23 11:41:24 +02:00
Cedric Snauwaert 8ee8b7bde6 [FIX]problem with header dropdown buttons css
bzr revid: csn@openerp.com-20140423091414-llv3t70gi59orbh0
2014-04-23 11:14:14 +02:00
Cedric Snauwaert 447fa873df [FIX] Force zindex for elements which should be at top of a modal window.
bzr revid: jke@openerp.com-20140423081914-anmpeae40z7dav4a
2014-04-23 10:19:14 +02:00
Denis Ledoux 5ff7146e15 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4179 revid:dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g
bzr revid: dle@openerp.com-20140417101315-2pjn31wb7ald3qe4
bzr revid: dle@openerp.com-20140417161003-g3mchwrucp6ab8tu
bzr revid: dle@openerp.com-20140422160712-iq4yur3jmw5n01ar
2014-04-22 18:07:12 +02:00
Denis Ledoux 6083ed4b46 [FIX] web: abitility to do exact id matching with child_of operator for searchs on many2one fields
bzr revid: dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g
2014-04-22 17:09:18 +02:00
Gery Debongnie f584b030bc [FIX] correct fix for the scrolling problem in graph view: the view now saves its scrolling position before redrawing itself (addon web_graph)
bzr revid: ged@openerp.com-20140422150316-m51u750732re8qib
2014-04-22 17:03:16 +02:00
Christophe Simonis 8a1b43be67 [MERGE] forward port of branch saas-4 up to revid 3981 dle@openerp.com-20140418151400-1g98vljq3cjv0czs
bzr revid: chs@openerp.com-20140422094727-7hi9bv3wm1bi0ov9
2014-04-22 11:47:27 +02:00
Vidhin Mehta (OpenERP) 4a5e671166 [FIX]destroy tooltip because after expanding inner menu, paren menu ellipsis deactived.
bzr revid: vme@tinyerp.com-20140421092638-1qq85mrfrpt0rjc1
2014-04-21 14:56:38 +05:30
Cedric Snauwaert 115c586e0a [FIX]tooltip: fix bootstrap bug when using auto placement and element was removed before the tooltip actually show resulting in an error
bzr revid: csn@openerp.com-20140418152511-f11mzqefa791vgl2
2014-04-18 17:25:11 +02:00
Denis Ledoux b250c5f9f5 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 4003 revid:dle@openerp.com-20140417161003-g3mchwrucp6ab8tu
bzr revid: dle@openerp.com-20140418151400-1g98vljq3cjv0czs
2014-04-18 17:14:00 +02:00
Vidhin Mehta (OpenERP) 099ba54e28 [IMP]add tooltip to menu with bootstrap.
bzr revid: vme@tinyerp.com-20140418133036-lspgwn0fywl5zrn3
2014-04-18 19:00:36 +05:30
Cedric Snauwaert d535196bb6 [FIX]pretty tooltip: attach tooltip to body to insure that some element don't move over the place.
increase tooltip z-index to be visible when a modal is open

bzr revid: csn@openerp.com-20140418101235-08yqheh70wi4hb6g
2014-04-18 12:12:35 +02:00
Gery Debongnie 5910f9375f [IMP] removes 2px to the stat button height, to save on vertical space (addon web)
bzr revid: ged@openerp.com-20140418093453-4u0vcqbtj2pdqi69
2014-04-18 11:34:53 +02:00
Martin Trigaux fa4e285be7 [FIX] FieldMany2One: avoid error when saving changes in popup from a related fields (opw 606601)
bzr revid: mat@openerp.com-20140418092033-mvqng3thuy61kfoq
2014-04-18 11:20:33 +02:00
Kunal Chavda (Open ERP) 8b2bc4da90 [MERGE]with latest.
bzr revid: kch@tinyerp.com-20140418084142-d8lm531l8dyk7roo
2014-04-18 14:11:42 +05:30
Simon Lejeune 545e8ae529 [MERGE] trunk
bzr revid: sle@openerp.com-20140417150234-45cmuz6bnandmxiv
2014-04-17 17:02:34 +02:00
Cedric Snauwaert 1c0289ecc7 [MERGE]tooltip: replace tipsy by bootstrap tooltip
bzr revid: csn@openerp.com-20140417141447-8ou48355igzbggaw
2014-04-17 16:14:47 +02:00
Cedric Snauwaert 4aec292e5c [FIX]tooltip: when not in debug mode, display tooltip in form view with bootstrat as well
bzr revid: csn@openerp.com-20140417140452-afqwxqv8pbvpbs3m
2014-04-17 16:04:52 +02:00
Gery Debongnie 372e640bb2 [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140417134752-0yfhhv4zilp9e002
2014-04-17 15:47:52 +02:00
Gery Debongnie 98b45f97eb [IMP] small css tweaks to stat buttons (addon web)
bzr revid: ged@openerp.com-20140417133735-ijp8il7e1igs7z95
2014-04-17 15:37:35 +02:00
Gery Debongnie fcacd5452c [IMP] improves the css for the stat buttons: moves the css independent of oe_button_box to a oe_stat_button section to allow a better look when used out of the button box (addon web)
bzr revid: ged@openerp.com-20140417133706-c60zdovc3k4ll9ga
2014-04-17 15:37:06 +02:00
Gery Debongnie 8ae48fae7d [IMP] simplify the stat button html structure (one less span) (addon web)
bzr revid: ged@openerp.com-20140417133630-q001n7sjrt9xw0to
2014-04-17 15:36:30 +02:00
Gery Debongnie 3e99ca7285 [IMP] small css tweaks to stat buttons (addon web)
bzr revid: ged@openerp.com-20140417133457-m04g3560jnwjudnr
2014-04-17 15:34:57 +02:00
Denis Ledoux 7c668d8eac [FIX] web: double click on save button was trying to save the data two times if there is some latency, event target should be used instead of delegate target
bzr revid: dle@openerp.com-20140417101217-3fwnm76qne6f1vwk
2014-04-17 12:12:17 +02:00
Denis Ledoux f928ba4f10 [FIX] web: double click on save button was trying to save the data two times if there is some latency
bzr revid: dle@openerp.com-20140417101000-6gtyxntkm5d7zcoy
2014-04-17 12:10:00 +02:00
Cedric Snauwaert 336fba01e5 [FIX]tooltip: should not use placement auto since it is currently bugged in bootstrap
(see: https://github.com/twbs/bootstrap/issues/13268)

bzr revid: csn@openerp.com-20140417095944-3k2c8829tm6lmxmo
2014-04-17 11:59:44 +02:00
Amit Vora bbd3799dac [MERGE] [FIX] web: fixed layout of radio buttons that were
a bit lower than the following text.

bzr revid: tde@openerp.com-20140417091032-qu9uto3g535f2ej5
2014-04-17 11:10:32 +02:00
Cedric Snauwaert 77172b410b [MERGE]merge with latest trunk
bzr revid: csn@openerp.com-20140417090153-m6d65ubew0wlr9ic
2014-04-17 11:01:53 +02:00
Cedric Snauwaert 347985e050 [FIX]tooltip: overwrite bootstrap default for tooltip
bzr revid: csn@openerp.com-20140417085954-mirh4eeotsorlyeo
2014-04-17 10:59:54 +02:00
Simon Lejeune 6c6310bd38 [MERGE] trunk
bzr revid: sle@openerp.com-20140414155401-0h8yjg06ig4gdb1s
bzr revid: sle@openerp.com-20140415192015-z1p7ehl2882jfxfc
bzr revid: sle@openerp.com-20140416163644-yuaup4qapgbsbmec
2014-04-16 18:36:44 +02:00