Commit Graph

100 Commits

Author SHA1 Message Date
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
Hardik Ansodariya (OpenERP) 7c92b8ba00 [FIX]portal,share : fixed the translation issue of share document wizard
bzr revid: mma@tinyerp.com-20121108100319-qfukxayiz7siic39
2012-11-08 15:33:19 +05:30
Turkesh Patel (Open ERP) ac75763855 [MRG] merge with lp:openobjec-addons.
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
Thibault Delavallée acd610f039 [FIX] share: fixed second call to schedule_with_attach, in send_emails. It has been replaced by a mail_mail.create() and mail_mail.send().
bzr revid: tde@openerp.com-20120904161956-tw1xvl2vghndhif7
2012-09-04 18:19:56 +02:00
Thibault Delavallée 6bea3b189b [FIX] share: fixed call to schedule_with_attach, as send_invite_email is now commented. This module will be cleaned in the next few days, and all invite mechanism is likely to disappear. scedule_with_attach is therefore commented and not really fixed.
bzr revid: tde@openerp.com-20120904161453-vq8zartows3eggtp
2012-09-04 18:14:53 +02:00
Thibault Delavallée 6fa349a4eb [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
Jiten (OpenERP) dfb82b2081 [MERGE] Merge from trunk.
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
Stephane Wirtel 1eac0fbe52 [REF] Replace the user id 1 by openerp.SUPERUSER_ID
bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
2012-08-31 15:51:36 +02:00
Bhumi Thakkar (Open ERP) 26a2b7378d [IMP] Remove 'message_email_pref' field.
bzr revid: bth@tinyerp.com-20120829132420-9c2mqv2pzg10z0co
2012-08-29 18:54:20 +05:30
Fabien Pinckaers b62858e83e [IMP] Merging different ways of posting a message:
message_append_note
  message_append_dict
  message_append
  --> merged all to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
2012-08-17 12:03:02 +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
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
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
Fabien Pinckaers 6c524cf107 [IMP] remove menu tips
bzr revid: fp@openerp.com-20120717064638-pg19mfj959vttw20
2012-07-17 08:46:38 +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 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
Quentin (OpenERP) 25fc3c3ec5 [MERGE] merged main trunk branch
bzr revid: qdp-launchpad@openerp.com-20120628114905-nnnho2mngndimj9b
2012-06-28 13:49:05 +02:00
Quentin (OpenERP) b2af135b03 [MERGE] lp: 974285
bzr revid: qdp-launchpad@openerp.com-20120627143910-whtbesexzaaa1cfh
2012-06-27 16:39:10 +02:00
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 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
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__)
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Xavier ALT 3157a06762 [FIX] share: fix error on user creation, missing 'company_ids' raising constraint ValidationError
bzr revid: xal@openerp.com-20120427083059-bziyfqba9la31sx8
2012-04-27 10:30:59 +02:00
Kuldeep Joshi (OpenERP) a498392b47 [FIX]share: convert to string and set group_id
bzr revid: kjo@tinyerp.com-20120417093156-d29vpph8it39sqiw
2012-04-17 15:01:56 +05:30
Thibault Delavallée a936f27674 [FIX] share and mail.thread: tweaked access rights. (TODO: second part of patch: checking access rights to email should check those from its master record, like attachments. Will be done shortly after the CD.)
bzr revid: tde@openerp.com-20120410160100-lh4jr3ubkvemggvk
2012-04-10 18:01:00 +02:00
Thibault Delavallée 3d6c40394a [IMP] Improved share-invite mechanism. Also slighty refactored code in emails sending.
bzr revid: tde@openerp.com-20120328090052-v73mn3tdnjat4kkb
2012-03-28 11:00:52 +02:00
Thibault Delavallée 3a1e1ce480 [IMP] share: update module to accept an 'invite' action, that is alike share, but used for OpenSocial. Share now also adds the 'invite' feature to OpenSocial.
bzr revid: tde@openerp.com-20120320180917-gj2c0tetyerfuprr
2012-03-20 19:09:17 +01:00
Olivier Dony 6f874454bf [FIX] share: create sharing rule even when no other ir.rule exists
lp bug: https://launchpad.net/bugs/909150 fixed

bzr revid: odo@openerp.com-20120215153440-c6ojz409kwzaus5w
2012-02-15 16:34:40 +01:00
Fabien Pinckaers b49bb75a26 [IMP] no email required to share a link or embed
bzr revid: fp@tinyerp.com-20111228210901-sywx5rab63d10lsd
2011-12-28 22:09:01 +01:00
Olivier Dony a42e668e77 [FIX] share: fix URLs - `key` parameter is now required
bzr revid: odo@openerp.com-20111223162421-nn7onw3itb6noa6p
2011-12-23 17:24:21 +01:00
Antony Lesuisse 4a99f28a02 [FIX] share email warning and menu tips
bzr revid: al@openerp.com-20111222140135-2gh7pwmr4ir2qb04
2011-12-22 15:01:35 +01:00
Christophe Simonis 96dbcce7ce [FIX] portal and share wizard
bzr revid: chs@openerp.com-20111221161135-l8e1yj1azkqy1c2g
2011-12-21 17:11:35 +01:00
Christophe Simonis 5c92c476d3 [FIX] share: correct login url + add action to embed url
bzr revid: chs@openerp.com-20111220150714-dltvf2p1dedjo97h
2011-12-20 16:07:14 +01:00
Christophe Simonis cdeffb44b5 [FIX] share: fix embed url
bzr revid: chs@openerp.com-20111219163836-n39w32ly2ai7uosu
2011-12-19 17:38:36 +01:00
Christophe Simonis 75fdf278b6 [FIX] share: do not hardcode the server url
bzr revid: chs@openerp.com-20111219111525-hlkww0n4e9ejpfhh
2011-12-19 12:15:25 +01:00
Raphael Collet 30233c37b7 [MERGE] lp:903060 (share: disable shortcuts when creating share users)
bzr revid: rco@openerp.com-20111219103328-3a437qz2mjck3vz6
2011-12-19 11:33:28 +01:00
Antony Lesuisse c3c7712e13 [IMP] separate embed and email actions
bzr revid: al@openerp.com-20111218154332-28ecj6xek6dixthp
2011-12-18 16:43:32 +01:00
Antony Lesuisse b818bd00e7 [IMP] improve user_type
bzr revid: al@openerp.com-20111218150704-wbemuzili2mw9150
2011-12-18 16:07:04 +01:00
Antony Lesuisse 94c5c147cd fix typo embed code
bzr revid: al@openerp.com-20111216164018-l5ht2rzsec1na74f
2011-12-16 17:40:18 +01:00
Antony Lesuisse d3795a63b1 simplify embed code
bzr revid: al@openerp.com-20111216163540-o13b84nsrj5kdulu
2011-12-16 17:35:40 +01:00
Antony Lesuisse c4edd73361 [MERGE] trunk
bzr revid: al@openerp.com-20111216154912-h94xe3zti4a3eo2n
2011-12-16 16:49:12 +01:00
Antony Lesuisse b988821d00 [IMP] shorter embed code
bzr revid: al@openerp.com-20111216153653-bdofkkan141xup3x
2011-12-16 16:36:53 +01:00
Olivier Dony 78bb2dd689 [IMP] share: use the builtin Model._all_columns now that it has been added
bzr revid: odo@openerp.com-20111214171049-jdbso53n3wqc8kjn
2011-12-14 18:10:49 +01:00
Olivier Dony 7b4917e780 [FIX] share: users may have an empty signature
lp bug: https://launchpad.net/bugs/902106 fixed
lp bug: https://launchpad.net/bugs/902898 fixed

bzr revid: odo@openerp.com-20111214145200-9ly20dra7n2s1l6p
2011-12-14 15:52:00 +01:00
Olivier Dony efc5cabe7a [FIX] share: sent share notifications immediately w/o queuing
lp bug: https://launchpad.net/bugs/903058 fixed

bzr revid: odo@openerp.com-20111214143321-l9r6mdqe2fc7m4t0
2011-12-14 15:33:21 +01:00
Christophe Simonis f2e5898992 [FIX] share: EmbedClient -> EmbeddedClient
bzr revid: chs@openerp.com-20111214130721-8tsba71wotmg97qv
2011-12-14 14:07:21 +01:00
Christophe Simonis d462f2e800 merge upstream
bzr revid: chs@openerp.com-20111214112712-wg6r5bhehcau701o
2011-12-14 12:27:12 +01:00
Nimesh (Open ERP) a66f81244b [FIX]share: noshortcut added when share user creted
bzr revid: nco@tinyerp.com-20111214063557-ydtz3tctlf0ul2f8
2011-12-14 12:05:57 +05:30
Christophe Simonis a6438cae30 [IMP] share: add option to generate embedded code
bzr revid: chs@openerp.com-20111201160040-15s4tn1pxixvmvnu
2011-12-01 17:00:40 +01:00