Commit Graph

357 Commits

Author SHA1 Message Date
Thibault Delavallée 9056c6dfe8 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120814194449-lbgwttiax09fhvj6
2012-08-14 21:44:49 +02:00
Christophe Simonis c5dc5cef00 [IMP] sed -i '' -e 's/connection/session/g'
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
2012-08-14 17:30:53 +02:00
Thibault Delavallée aac03b547d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120814152634-ix63oxwcyrfkku4t
2012-08-14 17:26:34 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Thibault Delavallée 620b7e9b11 [IMP] Addons: user_email -> email.
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Antonin Bourguignon 54bbe3d78b [MERGE] exception and warning messages improvement
bzr revid: abo@openerp.com-20120808130608-tnk060lr543nqn2n
2012-08-08 15:06:08 +02:00
Christophe Simonis 6c12d5b308 [FIX] correct home and login urls
bzr revid: chs@openerp.com-20120808120214-13k9qgzx8gu330cs
2012-08-08 14:02:14 +02:00
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Jigar Amin - OpenERP 935e31b328 merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120807105628-j3py2jnd1fnbnzza
2012-08-07 16:26:28 +05:30
Twinkle Christian (OpenERP) 2e689ca4e0 [IMP]improved views
bzr revid: tch@tinyerp.com-20120807093734-0u3ozi0hn7rxiy2q
2012-08-07 15:07:34 +05:30
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Turkesh Patel (Open ERP) a4efa58a1a [IMP] Improved serch view in share.
bzr revid: tpa@tinyerp.com-20120724062549-zb12vt1c6y3vqlpx
2012-07-24 11:55:49 +05:30
Saurang Suthar(OpenERP) 7e978dce74 [IMP] Improved warning messages for report_webkit, share and wiki modules
bzr revid: pso@tinyerp.com-20120722134024-hu4fbdhw5ga8p1u7
2012-07-22 19:10:24 +05:30
pso (OpenERP) d5d97cb6e3 [MERGE] Improved warning messages for report_webkit, share and wiki modules
bzr revid: pso@tinyerp.com-20120722131934-j9rbotugz3ymvt4m
2012-07-22 18:49:34 +05:30
Twinkle Christian (OpenERP) 8cdc899237 [IMP]Improve search view in share module
bzr revid: tch@tinyerp.com-20120719102724-0h31wws3g62vhltn
2012-07-19 15:57:24 +05:30
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Fabien Pinckaers 6c524cf107 [IMP] remove menu tips
bzr revid: fp@openerp.com-20120717064638-pg19mfj959vttw20
2012-07-17 08:46:38 +02:00
Purnendu Singh (OpenERP) 2e2f7188d3 [MERGE, IMP] improve and merge cha branch to update desc formatting
bzr revid: psi@tinyerp.com-20120716094548-xx1ip3eljal3ffvl
2012-07-16 15:15:48 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Ajay Chauhan (OpenERP) 59e9f0ca00 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713105030-jbl2mm81j6cyjake
2012-07-13 16:20:30 +05:30
Purnendu Singh (OpenERP) 79a8450b72 [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120711090814-z3khnc83bl9ndcy6
2012-07-11 14:38:14 +05:30
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Ajay Chauhan (OpenERP) 4fe87edb8f [IMP] : improve description for modules
bzr revid: cha@tinyerp.com-20120706103356-lctrqno2dy0wrpvt
2012-07-06 16:03:56 +05:30
Thibault Delavallée b9081b29c1 [IMP] Invite/Share: hide email_lines when workign with (portal) groups.
bzr revid: tde@openerp.com-20120702095133-79986yd46zsyf94x
2012-07-02 11:51:33 +02:00
Thibault Delavallée 66b4961ead [MERGE] Merged with trunk (addons).
bzr revid: tde@openerp.com-20120702075146-ixfgjt3ba54xl57x
2012-07-02 09:51:46 +02:00
Launchpad Translations on behalf of openerp 9c9141cc65 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120630050830-k11jnn5mmbbgylbv
bzr revid: launchpad_translations_on_behalf_of_openerp-20120701044014-x39v57m00291uyfh
2012-07-01 04:40:14 +00:00
Thibault Delavallée 329b80d934 [IMP] Removed a classe on invite button.
bzr revid: tde@openerp.com-20120629151020-nuu0cy38wmgn0ait
2012-06-29 17:10:20 +02:00
Thibault Delavallée ce1ed3f928 [IMP] Share wizard: removed icons and their related code; share is now in the 'more' menu. Cleaned a bit the code.
bzr revid: tde@openerp.com-20120629135657-fwp4q225zzr60dz8
2012-06-29 15:56:57 +02:00
Thibault Delavallée 4d49b59c73 [IMP] share_wizard: added some string and help in the wizard fields. Also osv_memoy -> TransientModel.
bzr revid: tde@openerp.com-20120629132251-zzck7hmjfntz4c8v
2012-06-29 15:22:51 +02:00
Thibault Delavallée a4a116d502 [IMP] Share: embed mode: cleaned wizard form view.
bzr revid: tde@openerp.com-20120629132142-j2et1zdopayjzygr
2012-06-29 15:21:42 +02:00
Thibault Delavallée d8cb7505b9 [IMP] Share wizard, share mode: cleaned form view.
bzr revid: tde@openerp.com-20120629131114-h5jldqhsdxhgcivf
2012-06-29 15:11:14 +02:00
Thibault Delavallée 5b7ce38f98 [REM] share: removed not unnecessary links before the page title, as the links are in 'more'.
bzr revid: tde@openerp.com-20120629123326-ifzufvr2slmptebm
2012-06-29 14:33:26 +02:00
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 3060903c8c [IMP] share: share and embed added to 'more' sidebar menu.
bzr revid: tde@openerp.com-20120629122530-yyux1swdn4puem1l
2012-06-29 14:25:30 +02:00
Raphael Collet 37601079a9 [MERGE] trunk-red-button (highlight the right buttons in all form views)
bzr revid: rco@openerp.com-20120629101954-i11jwpaussdeyc5d
2012-06-29 12:19:54 +02:00
Thibault Delavallée bdf01388a1 [FIX] share: fixed templates, because of some changes in xml organization.
bzr revid: tde@openerp.com-20120629084004-u30rzwl9ry3xn9xc
2012-06-29 10:40:04 +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
Thibault Delavallée 2cf2b9e92b [DOC] Share: added some comments.
bzr revid: tde@openerp.com-20120629080607-5gyr8jsy1hb4jv15
2012-06-29 10:06:07 +02:00
Thibault Delavallée 4dd9c631ac [FIX] share: fixed mail data, added password and action if present. Coming from trunk-openchatter-part3-tde branch.
bzr revid: tde@openerp.com-20120629074538-rq82fo9brb1qga2v
2012-06-29 09:45:38 +02:00
Launchpad Translations on behalf of openerp 3c6d5dabfb Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120629043853-120u6x3erpg73gq2
2012-06-29 04:38:53 +00:00
Raphael Collet 2963e31ebf [MERGE] from trunk
bzr revid: rco@openerp.com-20120628142628-qi35145b8hsvpsfi
2012-06-28 16:26:28 +02:00
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Quentin (OpenERP) 25fc3c3ec5 [MERGE] merged main trunk branch
bzr revid: qdp-launchpad@openerp.com-20120628114905-nnnho2mngndimj9b
2012-06-28 13:49:05 +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