Xavier Morel
|
477d7ad803
|
Merge branch 'web-trunk'
|
2014-05-14 15:13:35 +02:00 |
Launchpad Translations on behalf of openerp
|
e30348e1e0
|
Launchpad automatic translations update.
|
2014-05-14 05:55:34 +00:00 |
Fabien Meghazi
|
f3c8cc50c8
|
[IMP] Include openerpframework in common assets. Add module list in bundle
|
2014-05-12 17:18:12 +02:00 |
Martin Trigaux
|
27a6d2e9f4
|
Forward-port of latest saas-4, up to revision 3994 (rev-id jke@openerp.com-20140509131203-4gy3nhlj0v6fk7zv)
|
2014-05-12 10:10:32 +02:00 |
|
Fabien Meghazi
|
dba3e92195
|
[IMP] Add $.fn.button to jquery.ui noconflict template
bzr revid: fme@openerp.com-20140509133528-9i2kvn0heyxn6ngw
|
2014-05-09 15:35:28 +02:00 |
Cedric Snauwaert
|
dee000be14
|
[FIX]modal: when closing a modal, focus previous one to allow several escape hit key
bzr revid: csn@openerp.com-20140509094836-yhncaqp60od67w7k
|
2014-05-09 11:48:36 +02:00 |
Mahendra Barad
|
b4aa0eb76f
|
[MERGE] [ADD] kanban_state_selection widget, allowing to manage kanban_state-like selection fields using bullet + dropdown; priority widget allowing to manage priorities using stars.
bzr revid: tde@openerp.com-20140508160156-b2jekyiajkjp7bse
|
2014-05-08 18:01:56 +02:00 |
Thibault Delavallée
|
7d5de8d90d
|
[IMP] dropdownselection widget renamed kanban state selection
bzr revid: tde@openerp.com-20140508153418-hs6ix3qouy1fu482
|
2014-05-08 17:34:18 +02:00 |
|
Thibault Delavallée
|
15e28717b4
|
[FIX] priority widget: css fixes
bzr revid: tde@openerp.com-20140508152516-1rv69jatyswj8e4r
|
2014-05-08 17:25:16 +02:00 |
|
Thibault Delavallée
|
750cc768c1
|
[CLEAN] web: cleaned priority widget implementation: cleaned xml / js code
bzr revid: tde@openerp.com-20140508140545-kkogxe1dhbh7ryrk
|
2014-05-08 16:05:45 +02:00 |
Richard Mathot (OpenERP)
|
0ab06fa991
|
[IMP] Tooltip placement
bzr revid: rim@openerp.com-20140508133931-3ffe66hwgnffvdqu
|
2014-05-08 15:39:31 +02:00 |
Vidhin Mehta (OpenERP)
|
9967c9e19c
|
[MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140508125444-7d1m7qk7bi2hrbmv
|
2014-05-08 18:24:44 +05:30 |
|
Thibault Delavallée
|
dae5ee484a
|
[CLEAN] web: cleaned dropdown selection widget implementation: cleaned css and js code.
bzr revid: tde@openerp.com-20140508123347-ye6pvk1uo5jargec
|
2014-05-08 14:33:47 +02:00 |
|
Thibault Delavallée
|
0b28fb706f
|
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140508120955-m29bs4no8uogrm0n
|
2014-05-08 14:09:55 +02:00 |
|
Barad Mahendra
|
0b9126d0fe
|
[IMP]remove unwanted css
bzr revid: mba@tinyerp.com-20140508083740-g0u9cfef10d94oxh
|
2014-05-08 14:07:40 +05:30 |
|
Barad Mahendra
|
d9f8f11541
|
[IMP]improve the widget for dropdown selection and priority
bzr revid: mba@tinyerp.com-20140508055735-ekt5gh7w119w2i2j
|
2014-05-08 11:27:35 +05:30 |
|
Fabien Meghazi
|
4373f85773
|
[FIX] Do not self close empty elements that are not html void elements
bzr revid: fme@openerp.com-20140507121413-o7jqhexbm1wmitt6
|
2014-05-07 14:14:13 +02:00 |
|
Barad Mahendra
|
d3410a6924
|
[Merge]with trunk
bzr revid: mba@tinyerp.com-20140507104547-p7pmav8pez08zf1h
|
2014-05-07 16:15:47 +05:30 |
|
Fabien Meghazi
|
7db3619c37
|
[REM] html_template and render_bootstrap_template()
bzr revid: fme@openerp.com-20140506163422-vruavrvkcowu09zi
|
2014-05-06 18:34:22 +02:00 |
|
Mohammed Shekha
|
0e62b9d8df
|
[IMP] Jinja template for database manager
bzr revid: fme@openerp.com-20140506155051-3u3kkb9lpvm06iad
|
2014-05-06 17:50:51 +02:00 |
|
Fabien Meghazi
|
b393c4ac18
|
[FIX] jQuery.ui - boostrap conflicts
bzr revid: fme@openerp.com-20140506153300-0p1gwnrxihpb4y3r
|
2014-05-06 17:33:00 +02:00 |
|
Fabien Meghazi
|
f6e33eca13
|
[IMP] do_warn on ClientAction not found
bzr revid: fme@openerp.com-20140506122840-01b9xtewp4wcv42g
|
2014-05-06 14:28:40 +02:00 |
|
Fabien Meghazi
|
c033b660e8
|
[ADD] openerp.loadBundle()
bzr revid: fme@openerp.com-20140506103649-wrfa25boj2chy6gl
|
2014-05-06 12:36:49 +02:00 |
|
Launchpad Translations on behalf of openerp
|
2b67c9c77b
|
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506061338-jwpj0jxfcnakph24
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506061359-p8lxp23aopeb6mwh
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506063612-leryt792evbx9hsy
|
2014-05-06 06:36:12 +00:00 |
|
Vidhin Mehta (OpenERP)
|
e41508cb8d
|
[MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp
|
2014-05-05 10:02:33 +05:30 |
Mohammed Shekha
|
5600a79007
|
[IMP]Improved the database manager, instead of calling html_template, created separate html file which is rendered using jinja2, so that we don't need html_template once pos and edit support render_bootstrap_template.
bzr revid: msh@tinyerp.com-20140502132349-bw9zdyaou4yf8o7q
|
2014-05-02 18:53:49 +05:30 |
Gery Debongnie
|
132ccb7180
|
[MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
|
2014-05-02 14:33:55 +02:00 |
|
Fabien Meghazi
|
db48dbef3e
|
[FIX] database manager
bzr revid: fme@openerp.com-20140501210436-osyrvlue41w63i6f
|
2014-05-01 23:04:36 +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 |
|
Fabien Meghazi
|
556c1404c2
|
[FIX] backward compatibility for html_template
bzr revid: fme@openerp.com-20140430132636-p42ehcb0dnc1d3jx
|
2014-04-30 15:26:36 +02:00 |
|
Fabien Meghazi
|
d00d092e18
|
[FIX] bootstrap - jquery.ui conflicts
bzr revid: fme@openerp.com-20140430131730-du7hem15of8spau1
|
2014-04-30 15:17:30 +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
|
f0bdc2f9f4
|
[FIX] phantomjs's console.log does not support string formatting
(version used 1.9.2)
bzr revid: fme@openerp.com-20140430074101-91z0854pqwz5u1ek
|
2014-04-30 09:41:01 +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
|
3998225317
|
[MOV] select2 from common to backend assets
bzr revid: fme@openerp.com-20140430072044-24camfdauw6xxczk
|
2014-04-30 09:20:44 +02:00 |
Randhir Mayatra (OpenERP)
|
adef80714d
|
[MERGE][REM] Configurable menu action for users -- was broken (web part)
bzr revid: rim@openerp.com-20140429143923-1340bi40th1w57du
|
2014-04-29 16:39:23 +02:00 |
|
Fabien Meghazi
|
78be910192
|
[MERGE] trunk-js-httpcase-al
bzr revid: fme@openerp.com-20140429142822-ytw2oiljapi1t4q0
|
2014-04-29 16:28:22 +02:00 |
|
Fabien Meghazi
|
22725bd29f
|
[MERGE] upstream
bzr revid: fme@openerp.com-20140429142729-y4kfuohn4lsklnud
|
2014-04-29 16:27:29 +02:00 |
|
Richard Mathot (OpenERP)
|
dfe236fe82
|
[REM] removing menu_di
bzr revid: rim@openerp.com-20140429135640-84ycqhsdlhmdj268
|
2014-04-29 15:56:40 +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 |
|
Antony Lesuisse
|
d9eec7345b
|
convert js tests to HttpCase
bzr revid: al@openerp.com-20140428152857-h7z61vdw5crezv2u
|
2014-04-28 17:28:57 +02:00 |
|
Fabien Meghazi
|
d60af567ad
|
[FIX] web test suite: manually fetch registry
bzr revid: fme@openerp.com-20140428132846-k8ofnlsse4s28jpr
|
2014-04-28 15:28:46 +02:00 |
|
Fabien Meghazi
|
e82a652a7c
|
[DAMN] !
bzr revid: fme@openerp.com-20140428122423-pbo2pnm5ecqwibnf
|
2014-04-28 14:24:23 +02:00 |
|
Fabien Meghazi
|
9dc42584b8
|
[FIX] js admin test postinstall
Web client won't work without kanbanview, graph, ... so
we should not test the admin before they are installed
bzr revid: fme@openerp.com-20140428102756-7mus5xls5jybklo3
|
2014-04-28 12:27:56 +02:00 |
|
Fabien Meghazi
|
18615e2493
|
[TRY] to get runbot green
bzr revid: fme@openerp.com-20140428081602-c1u8jbvjnoni7sds
|
2014-04-28 10:16:02 +02:00 |