620b7e9b11
[IMP] Addons: user_email -> email.
...
bzr revid: tde@openerp.com-20120810144339-30ro9omgfxtjtjyz
2012-08-10 16:43:39 +02:00
54bbe3d78b
[MERGE] exception and warning messages improvement
...
bzr revid: abo@openerp.com-20120808130608-tnk060lr543nqn2n
2012-08-08 15:06:08 +02:00
6c12d5b308
[FIX] correct home and login urls
...
bzr revid: chs@openerp.com-20120808120214-13k9qgzx8gu330cs
2012-08-08 14:02:14 +02:00
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
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
6c524cf107
[IMP] remove menu tips
...
bzr revid: fp@openerp.com-20120717064638-pg19mfj959vttw20
2012-07-17 08:46:38 +02:00
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
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
25fc3c3ec5
[MERGE] merged main trunk branch
...
bzr revid: qdp-launchpad@openerp.com-20120628114905-nnnho2mngndimj9b
2012-06-28 13:49:05 +02:00
b2af135b03
[MERGE] lp: 974285
...
bzr revid: qdp-launchpad@openerp.com-20120627143910-whtbesexzaaa1cfh
2012-06-27 16:39:10 +02:00
f17b0eea00
[MERGE] Use Email everywhere
...
bzr revid: al@openerp.com-20120627131528-u97jw0m7cq2825ll
2012-06-27 15:15:28 +02:00
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
3c50eb017a
[IMP] set logging.getLogger(__name__)
...
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
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
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
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
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
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
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
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
4a99f28a02
[FIX] share email warning and menu tips
...
bzr revid: al@openerp.com-20111222140135-2gh7pwmr4ir2qb04
2011-12-22 15:01:35 +01:00
96dbcce7ce
[FIX] portal and share wizard
...
bzr revid: chs@openerp.com-20111221161135-l8e1yj1azkqy1c2g
2011-12-21 17:11:35 +01:00
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
cdeffb44b5
[FIX] share: fix embed url
...
bzr revid: chs@openerp.com-20111219163836-n39w32ly2ai7uosu
2011-12-19 17:38:36 +01:00
75fdf278b6
[FIX] share: do not hardcode the server url
...
bzr revid: chs@openerp.com-20111219111525-hlkww0n4e9ejpfhh
2011-12-19 12:15:25 +01:00
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
c3c7712e13
[IMP] separate embed and email actions
...
bzr revid: al@openerp.com-20111218154332-28ecj6xek6dixthp
2011-12-18 16:43:32 +01:00
b818bd00e7
[IMP] improve user_type
...
bzr revid: al@openerp.com-20111218150704-wbemuzili2mw9150
2011-12-18 16:07:04 +01:00
94c5c147cd
fix typo embed code
...
bzr revid: al@openerp.com-20111216164018-l5ht2rzsec1na74f
2011-12-16 17:40:18 +01:00
d3795a63b1
simplify embed code
...
bzr revid: al@openerp.com-20111216163540-o13b84nsrj5kdulu
2011-12-16 17:35:40 +01:00
c4edd73361
[MERGE] trunk
...
bzr revid: al@openerp.com-20111216154912-h94xe3zti4a3eo2n
2011-12-16 16:49:12 +01:00
b988821d00
[IMP] shorter embed code
...
bzr revid: al@openerp.com-20111216153653-bdofkkan141xup3x
2011-12-16 16:36:53 +01:00
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
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
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
f2e5898992
[FIX] share: EmbedClient -> EmbeddedClient
...
bzr revid: chs@openerp.com-20111214130721-8tsba71wotmg97qv
2011-12-14 14:07:21 +01:00
d462f2e800
merge upstream
...
bzr revid: chs@openerp.com-20111214112712-wg6r5bhehcau701o
2011-12-14 12:27:12 +01:00
a66f81244b
[FIX]share: noshortcut added when share user creted
...
bzr revid: nco@tinyerp.com-20111214063557-ydtz3tctlf0ul2f8
2011-12-14 12:05:57 +05:30
a6438cae30
[IMP] share: add option to generate embedded code
...
bzr revid: chs@openerp.com-20111201160040-15s4tn1pxixvmvnu
2011-12-01 17:00:40 +01:00
779fa653c1
[IMP] Added missing vim mode lines
...
lp bug: https://launchpad.net/bugs/524279 fixed
bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
d6ebd88ba5
[IMP] share: only show current view when selecting "readonly" mode
...
bzr revid: chs@openerp.com-20111115155630-4ut72jrc8111ivm4
2011-11-15 16:56:30 +01:00
9f964ca29d
[IMP] share: share_url_template is read from ir_config_parameter
...
bzr revid: chs@openerp.com-20111014094324-wpj3265vwinel3rj
2011-10-14 11:43:24 +02:00
b46ef4b960
[FIX] share: correct function fields labels
...
bzr revid: chs@openerp.com-20111010145406-0k4au407iwv9e31n
2011-10-10 16:54:06 +02:00
a1e5797727
[FIX] share+portal: fix share wizard.
...
[IMP] share wizard: share_root_url and share_url are now function fields
bzr revid: chs@openerp.com-20111010142549-uvco15xdf2198e0x
2011-10-10 16:25:49 +02:00
dca92e2cc1
[FIX] share: correct default value
...
bzr revid: chs@openerp.com-20111007153719-2lq8ntxom3y8g2xj
2011-10-07 17:37:19 +02:00
807955bfdc
[FIX] share: remove context argument passed to cached method, now deprecated
...
bzr revid: odo@openerp.com-20110915103040-laoviibia601ybqj
2011-09-15 12:30:40 +02:00
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
fe71f70e90
[FIX] share: urlescaping + typo
...
bzr revid: odo@openerp.com-20110624101727-jz3xfab71sio0afq
2011-06-24 12:17:27 +02:00
5cfa1974c6
[IMP] share,portal: improve sharing with portal group
...
Use a new strategy: documents are shared with a
temporary group, and when everything is setup,
the access rights are copied to the groups we are
sharing with, and the rules are transferred to them.
The temporary group is then deleted.
This works well for multiple shares, are both
access rights and rules are additive in this
fashion.
bzr revid: odo@openerp.com-20110619170000-epst11y4aaichblh
2011-06-19 19:00:00 +02:00
981b3fa3e1
[FIX] share,portal: some quirks in share/portal integration
...
bzr revid: odo@openerp.com-20110619130345-2yf5t8zbqw2zcems
2011-06-19 15:03:45 +02:00
Thibault Delavallée
Antonin Bourguignon
Christophe Simonis
Saurang Suthar(OpenERP)
pso (OpenERP)
Fabien Pinckaers
Quentin (OpenERP)
Antony Lesuisse
Jigar Amin - OpenERP
Kuldeep Joshi (OpenERP)
Olivier Dony
Fabien Pinckaers
Raphael Collet
Nimesh (Open ERP)
Numerigraphe - Lionel Sausin