Commit Graph
589 Commits
Author SHA1 Message Date
Thibault Delavallée ac5871490e [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120629122606-jcqebhhtuqqpjvqm
2012-06-29 14:26:06 +02:00
Thibault Delavallée b9555aaa8a [IMP] mail_group: cleaned form view.
bzr revid: tde@openerp.com-20120629085703-230ysrp861pxydt1
2012-06-29 10:57:03 +02:00
Raphael Collet 5133bee1d5 [FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Antony Lesuisse f8daa47a0a [MERGE] portal, group_user on fields, contact form, default portal menu
bzr revid: al@openerp.com-20120628102942-ja0qtr1eho4z3749
2012-06-28 12:29:42 +02:00
Launchpad Translations on behalf of openerp 997fe404b3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120628044101-cehvpv9yfm3xfsr3
2012-06-28 04:41:01 +00:00
Antonin Bourguignon b0cd65959e [FIX] give some proper style to broken the mail.Wall view
bzr revid: abo@openerp.com-20120627154454-dq6935c5ogd12t9n
2012-06-27 17:44:54 +02:00
Antonin Bourguignon d8a570a9d7 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120627150256-rc8c78zwhzf4cfhx
2012-06-27 17:02:56 +02:00
Randhir Mayatra (OpenERP) a4b94dbee6 [USA] add cancel button
bzr revid: rma@tinyerp.com-20120627141917-bs9bg2j3dasy9n1y
2012-06-27 19:49:17 +05:30
Antony Lesuisse f17b0eea00 [MERGE] Use Email everywhere
bzr revid: al@openerp.com-20120627131528-u97jw0m7cq2825ll
2012-06-27 15:15:28 +02:00
Jigar Amin - OpenERP 7c645856fe [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120627114052-094g4yequ34sr59d
2012-06-27 17:10:52 +05:30
Antony Lesuisse 5c8eec43bd [MERGE] trunk
bzr revid: al@openerp.com-20120626202324-g3q9tc9uee49lg28
2012-06-26 22:23:24 +02:00
Antonin Bourguignon 48c18a60f3 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120626143915-907g4k2d91iwszld
2012-06-26 16:39:15 +02:00
Twinkle (OpenERP) 471037495c [IMP]Apply css class flow on wizards buttons
bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
2012-06-26 12:01:19 +05:30
Jigar Amin - OpenERP d9db3c44df [REN] renamed e-mail, E-mail, E-Mail to email, Email
bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
2012-06-25 19:12:53 +05:30
Twinkle (OpenERP) 0e97cefe9e [IMP]Improve wizard button
bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
2012-06-25 15:39:01 +05:30
Sbh (Openerp) 9eb877fee5 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120622084051-mu5wvb8ubinul6gb
bzr revid: sbh@tinyerp.com-20120625090342-b149ncajdnl4a3i6
2012-06-25 14:33:42 +05:30
Launchpad Translations on behalf of openerp 0a22debf5f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120623050212-tvzx03gj3h8f0ool
bzr revid: launchpad_translations_on_behalf_of_openerp-20120624052822-84nt172gva6prhqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120625051509-c432dvk4aqn3vjj9
2012-06-25 05:15:09 +00:00
Amit Patel (OpenERP) 3c7cd469e6 [MERGE]
bzr revid: apa@tinyerp.com-20120622090553-lkvmsz12ooao1lug
bzr revid: apa@tinyerp.com-20120625050407-vfjnqgnqexrfvr8d
2012-06-25 10:34:07 +05:30
Jigar Amin - OpenERP dfdbf8cf17 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041316-rwtc4zf2pska9t5c
2012-06-25 09:43:16 +05:30
Antony Lesuisse bd2b65318b [FIX] clean some mess left after branch merge
console.log()
comment in the wrong place
typo in a comment
remove useless french translations

bzr revid: abo@openerp.com-20120622170639-2cohro2awcv6qf2t
2012-06-22 19:06:39 +02:00
Antonin Bourguignon 3c4c6aaf77 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120622130939-bt6d9nfolgza513t
2012-06-22 15:09:39 +02:00
Quentin (OpenERP) 4c104ca727 [IMP] search views: made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622130506-pzz8wqo5p5y902qc
2012-06-22 15:05:06 +02:00
Purnendu Singh (OpenERP) 55633a22a2 [REF] search views: removed filterr_domain if only one element was inside
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +05:30
Sbh (Openerp) cb0f82149a [MERGE] Merge logger changes
bzr revid: sbh@tinyerp.com-20120622082023-e6ha3w9gadml4uqo
2012-06-22 13:50:23 +05:30
Quentin (OpenERP) ecd59426ae [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120622080504-bd0291ildonwdz82
2012-06-22 10:05:04 +02:00
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__)
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Amit Patel (OpenERP) bbdbb9dd6b [MERGE]
bzr revid: apa@tinyerp.com-20120622060031-pp85k3ezxboev0it
2012-06-22 11:30:31 +05:30
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Sbh (Openerp) 434d2ca820 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120622052105-1ucbczumubnd1k4a
2012-06-22 10:51:05 +05:30
Launchpad Translations on behalf of openerp eea8d59604 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120622044730-v8e5fvfsa039ahbf
2012-06-22 04:47:30 +00:00
Antony Lesuisse 3821fcc47f [IMP] mail layout simplications
bzr revid: al@openerp.com-20120622012102-ysfvjdj2jkhshuwq
2012-06-22 03:21:02 +02:00
Antony Lesuisse f216fcef42 [FIX] renable timeago, now packaged in web
bzr revid: al@openerp.com-20120621225154-ikh42l6e26t32ds6
2012-06-22 00:51:54 +02:00
Antony Lesuisse c89c01929b [FIX] cleanups
bzr revid: al@openerp.com-20120621215527-5f05axqf9t1gnc8e
2012-06-21 23:55:27 +02:00
Antonin Bourguignon ad71e2a680 [ADD] mail.group form view (from tde's branch)
bzr revid: abo@openerp.com-20120621161853-0vyfyt8rwdh4v8d0
2012-06-21 18:18:53 +02:00
Antonin Bourguignon b821d42061 [IMP] properly prefix templates names with 'mail.'
use 'main' and 'aside' instead of 'left' and 'right' in the mail main boxes' class names

bzr revid: abo@openerp.com-20120621150002-u7saes5bc06bt51l
2012-06-21 17:00:02 +02:00
Antonin Bourguignon 22a0a0208f [MERGE] latest trunk
bzr revid: abo@openerp.com-20120621133551-w2g9oznhxxi8kpf7
2012-06-21 15:35:51 +02:00
Antonin Bourguignon c8e5450ba3 [IMP] use the default openerp dropdown menu implementation.
also improve markup (ul.oe_mail_wall_threads is now a list of li.oe_mail_wall_thread)
more markup and css improvements to come

bzr revid: abo@openerp.com-20120621124843-klk1oy2rxdcd08uh
2012-06-21 14:48:43 +02:00
Raphael Collet d17d438405 [MERGE] trunk-review-dashboards (reorganize dashboards in menu Reporting)
bzr revid: rco@openerp.com-20120621101007-g8bvaxwfh86t47ng
2012-06-21 12:10:07 +02:00
Sbh (Openerp) e02d8a68ef [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120621093607-eczt3bj4j215cfl2
2012-06-21 15:06:07 +05:30
Launchpad Translations on behalf of openerp 6e30c1323d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621052527-r3t1oxcolviiii4x
2012-06-21 05:25:27 +00:00
Jigar Amin - OpenERP a2db2cc18f [MERGE] lp:opebobject-addons
bzr revid: jam@tinyerp.com-20120621050852-ob0sd5c97821gpso
2012-06-21 10:38:52 +05:30
Jigar Amin - OpenERP f7db2ab215 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621044348-3r8ur7izhjriing4
2012-06-21 10:13:48 +05:30
Antonin Bourguignon 86b2f33f71 [IMP] slightly refactor timeago.js for l18n's sake
bzr revid: abo@openerp.com-20120620174743-s603skiqcisu2yhm
2012-06-20 19:47:43 +02:00
Antonin Bourguignon 688ced2225 [ADD] introduce timeago.js (check the end of mail.js)
bzr revid: abo@openerp.com-20120620155434-8qos8oooxfwxkm6u
2012-06-20 17:54:34 +02:00
Antonin Bourguignon 231b8ca886 [IMP] better markup, remove some dead code
bzr revid: abo@openerp.com-20120620143222-oyw84qxbzlia7lb6
2012-06-20 16:32:22 +02:00
Antonin Bourguignon 7d53b3977f [IMP] attachments display and accessibility in mail messages
a user can now download an attachment in one click

bzr revid: abo@openerp.com-20120620140204-1mphi5tjyp57i74t
2012-06-20 16:02:04 +02:00
Twinkle (OpenERP) 660cc67256 [IMP]Added highlight button on wizard
bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
2012-06-20 16:19:23 +05:30
Antonin Bourguignon ce00e156b3 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120620084819-k7pha7zwyggceh1w
2012-06-20 10:48:19 +02:00
Sbh (Openerp) 2f78f37e17 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120620065331-oprjf5vc24j7gd0o
2012-06-20 12:23:31 +05:30