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
9e8e3653f2
[MERGE] forward port of branch saas-4 up to f68c835
2014-06-25 12:43:41 +02:00
0f825ed48e
[FIX]modal: when trying to dropdb or change password, if rpc call result in error, modal was stuck
2014-06-23 11:25:22 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
cef51e2a50
[FIX]modal: in some particular case, we have 2 actions opening modal one after another, fix problem in those case where second modal was close instead of first one
2014-05-19 14:01:47 +02:00
08c504d39e
[FIX] web: Dialog: avoid triggering "closing" twice.
2014-05-13 13:38:10 +02:00
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
0ab06fa991
[IMP] Tooltip placement
...
bzr revid: rim@openerp.com-20140508133931-3ffe66hwgnffvdqu
2014-05-08 15:39:31 +02:00
e41508cb8d
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp
2014-05-05 10:02:33 +05:30
d4b534e7be
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb
2014-04-23 14:37:35 +02:00
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
099ba54e28
[IMP]add tooltip to menu with bootstrap.
...
bzr revid: vme@tinyerp.com-20140418133036-lspgwn0fywl5zrn3
2014-04-18 19:00:36 +05:30
77172b410b
[MERGE]merge with latest trunk
...
bzr revid: csn@openerp.com-20140417090153-m6d65ubew0wlr9ic
2014-04-17 11:01:53 +02:00
347985e050
[FIX]tooltip: overwrite bootstrap default for tooltip
...
bzr revid: csn@openerp.com-20140417085954-mirh4eeotsorlyeo
2014-04-17 10:59:54 +02:00
b7f3808824
[FIX]modal not correctly destroying from DOM at exit
...
bzr revid: csn@openerp.com-20140416120034-sps3a7dc2mgpwfzt
2014-04-16 14:00:34 +02:00
20556abc08
[MERGE]clean and refactored tooltip from branch trunk-tipsy-to-boostrap
...
bzr revid: csn@openerp.com-20140416102659-vft9tfuqmax0qx3q
2014-04-16 12:26:59 +02:00
457b877160
[MERGE] forward port of branch saas-3 up to revid 4000 dle@openerp.com-20140415130951-ckuv8nsl17qkb300
...
bzr revid: chs@openerp.com-20140415142910-c3fqzce7wju83f5e
2014-04-15 16:29:10 +02:00
6b020549f8
[FIX]modal windows: when pressing esc key, modal-backdrop was not removed
...
bzr revid: csn@openerp.com-20140414140652-g06gl0mguyhta5px
2014-04-14 16:06:52 +02:00
df3c6b7502
[FIX] web: do not try to close a destroyed dialog. trigger "closing" signal on close by top-right "X" button
...
bzr revid: chs@openerp.com-20140411162426-60bfybim5aqojsxx
2014-04-11 18:24:26 +02:00
c8607c8b81
[FIX]few cosmetic of code
...
bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs
2014-04-11 14:27:53 +02:00
e1bf418856
[MERGE] trunk
...
bzr revid: fme@openerp.com-20140410173524-9oz7irm59a5d8d7g
2014-04-10 19:35:24 +02:00
09cd7585e2
[FIX]remove draggable on modal window + clean up
...
bzr revid: csn@openerp.com-20140410154520-h7790rxb8h2hx2zx
2014-04-10 17:45:20 +02:00
049539809d
[FIX]modal strict to bootstrap: no resize and only use 3 size, large-medium-small instead of changing width of modal
...
bzr revid: csn@openerp.com-20140410151940-w0m1ljjqgo0eysgp
2014-04-10 17:19:40 +02:00
964e94f8a8
[FIX]forgot to open a dialog
...
bzr revid: csn@openerp.com-20140410121122-y0a8l1hzd01af8bn
2014-04-10 14:11:22 +02:00
e95ca69113
[REF]add bootstrap modal window based, cleaned, refactored from trunk-ui-to-boostrap-modal branch
...
bzr revid: csn@openerp.com-20140410100631-5v6a71oi5wyunbda
2014-04-10 12:06:31 +02:00
8e14e7a870
[WIP] AssetsBundle
...
bzr revid: fme@openerp.com-20140409161648-sx87vc0saj30f68x
2014-04-09 18:16:48 +02:00
2686f48dd9
[FIX] web: correct company info popup closing
...
bzr revid: chs@openerp.com-20140407101324-vhm0d9r2nf0m7ve3
2014-04-07 12:13:24 +02:00
f1d3f2a0c4
[MERGE] forward port of branch saas-3 up to revid 3995 chs@openerp.com-20140407144625-jfimvsx4mgrkztqv
...
bzr revid: chs@openerp.com-20140407161728-ccudwnqo970ac8ay
2014-04-07 18:17:28 +02:00
c0db6aec56
[FIX] web: do not reload record on dialog close if the wizard return an action
...
bzr revid: dle@openerp.com-20140402165008-y19pnbb35eerrnwx
2014-04-02 18:50:08 +02:00
9379dc0312
[FIX] chrome.js: detect correct error type for session expired
...
bzr revid: odo@openerp.com-20140328142309-apraiq42f3xavqda
2014-03-28 15:23:09 +01:00
a2f9619e26
[MERGE] forward port of branch saas-3 up to revid 3975 chs@openerp.com-20140318115516-sn3laxqseam1oz3f
...
bzr revid: chs@openerp.com-20140318124050-ul3reev0vvmgqxz8
2014-03-18 13:40:50 +01:00
541a5d3f82
[MERGE] forward port of branch saas-2 up to revid 3904 chs@openerp.com-20140318112743-tqv492026y2pnbff
...
bzr revid: chs@openerp.com-20140318115516-sn3laxqseam1oz3f
2014-03-18 12:55:16 +01:00
acb010a985
[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
...
bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
2014-03-18 12:27:43 +01:00
c1d9449a57
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140227101745-k6iseaz765qnflnm
2014-02-27 11:17:45 +01:00
16a5c45114
[FIX] home action: open the linked menu in addition to execute the action. The menu tree is now correctly displayed instead of only messaging.
...
bzr revid: mat@openerp.com-20140221165706-79uqffr5nk4zbj5e
2014-02-22 03:57:06 +11:00
59aa0e88d9
Forward-port of latest saas-2 bugfixes, up to rev.3902 revid:mat@openerp.com-20140219111353-cxo860z7ctz7om30
...
bzr revid: odo@openerp.com-20140219163348-5fpbm3rgpkq7kjw5
2014-02-19 17:33:48 +01:00
9cc13d4216
[MERGE] [FIX] home action: fixing the broken field 'action_id' on the res.users form (lost with 6.1->7). This field executes a custom action at page load.
...
bzr revid: mat@openerp.com-20140214131800-9vwuxe9b2zki35il
2014-02-14 14:18:00 +01:00
d65df64cdd
[IMP] always click on first link to have menus and breadcrumb
...
bzr revid: mat@openerp.com-20140214111707-7zzpeccs9aanfdct
2014-02-14 12:17:07 +01:00
8877c10161
[FIX] login: look at the value of action_id on the current res.users to execute the action instead of the first link (Inbox). Bring back 6.1 behaviour.
...
bzr revid: mat@openerp.com-20140214111540-sbn3y6ou3vrjza15
2014-02-14 12:15:40 +01:00
42952bb7cf
[REM] Remove LoginForm javascript
...
bzr revid: fme@openerp.com-20140205091749-39333kr3hz0dt4wg
2014-02-05 10:17:49 +01:00
c0dda700f1
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140116181519-xtzhzm7u98u6xz18
2014-01-16 19:15:19 +01:00
5649e0bbf2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx
...
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
2014-01-16 17:14:15 +01:00
0e870fc7a7
[MERGE] forward port of branch saas-2 up to revid 3897 dle@openerp.com-20140115121441-bskbyxxbc09ubavh
...
bzr revid: chs@openerp.com-20140115221349-3lw7b0kpo3f2d04l
2014-01-15 23:13:49 +01:00
dec6f2569e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140114133953-ku7af6v3z9y7qap2
2014-01-14 14:39:53 +01:00
01f3648d3a
[ADD] javascript hooks for LoginForm and debug forwarding
...
bzr revid: fme@openerp.com-20140114111707-ts3ik25p4o2vysxb
2014-01-14 12:17:07 +01:00
75e02860c2
[REM] Removed Login from webclient
...
bzr revid: fme@openerp.com-20140113173808-1clqlztx6fs79h2k
2014-01-13 18:38:08 +01:00
1bb2fccb9d
[FIX] web: avoid crash when the Home client action is called without `action` param
...
E.g. this could happen when the HistoryBack client action
was unable to restore the previous breadcrumbs item, and
used the Home action as fallback. Could be reproduce by
performing a successful import from an action without
menu and context, such as what you get after refreshing
your browser.
bzr revid: odo@openerp.com-20140107161154-430y7hlf9mvtfyfe
2014-01-07 17:11:54 +01:00
f12a8e94ac
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20131220073414-spf39j62hv7btxt9
2013-12-20 13:04:14 +05:30
5e5483bde4
[FIX]for dialog box stick to page.
...
bzr revid: vme@tinyerp.com-20131220073241-xi7v47jecgewapw2
2013-12-20 13:02:41 +05:30
90b63ee28c
[FIX] support client_options.action and client_options.post_login_action
...
bzr revid: fme@openerp.com-20131219180628-s95y5ryomnbgvko2
2013-12-19 19:06:28 +01:00
Simon Lejeune
Christophe Simonis
Cedric Snauwaert
Christophe Simonis
Richard Mathot (OpenERP)
Vidhin Mehta (OpenERP)
Fabien Meghazi
Denis Ledoux
Olivier Dony
Martin Trigaux