555d4879c8
Forward-port of latest saas-4, up to revision 9416 (rev-id fme@openerp.com-20140509164338-gnz7p3qxt8etrh5w)
...
bzr revid: mat@openerp.com-20140512072331-0lidgqb6x7fregdj
2014-05-12 09:23:31 +02:00
6f60eb218f
[IMP] subscribe to group / newsletter widgets: wording cleaning
...
bzr revid: tde@openerp.com-20140509132156-qbmop9au07cllgkk
2014-05-09 15:21:56 +02:00
59b9344bab
[IMP] website_mail, mass_mailing: icon in editor for the snippets + renaming
...
bzr revid: tde@openerp.com-20140507090029-fh312buk013t1gdp
2014-05-07 11:00:29 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
c92e1b6bcb
[IMP] Rename assets_frontend
...
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
2014-04-29 16:57:45 +02:00
eae846f2c8
[FIX] remove @translatable conditions and de-activate group_website_designer specifics
...
Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion
bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
2014-04-25 14:49:13 +02:00
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
0ec498371e
[FIX] translatable condition on *.editor.js assets
...
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
74d4d1f58d
[CHG] bundlify website
...
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.
bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
7b413e4aff
[FIX] Mail snippet - Set generic URL
...
bzr revid: jke@openerp.com-20140417115621-c0j2nj4srlshougy
2014-04-17 13:56:21 +02:00
d264cd1640
[IMP] website_mail: make the template / mail editor work. We now have a limited
...
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.
Also fixed editor not being actiated when going into the body edition.
bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9
2014-04-16 12:59:01 +02:00
68312cf9f8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140415093954-f4swocgxl5k5si3r
2014-04-15 11:39:54 +02:00
bafa8e448d
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
...
bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0
2014-04-14 16:30:01 +02:00
55266ab25d
[MERGE] Merged fp's refactoring branch.
...
bzr revid: tde@openerp.com-20140414131109-7ijlz4gybjd2b2oj
2014-04-14 15:11:09 +02:00
3db3160644
[IMP] website_link field removed
...
bzr revid: fp@tinyerp.com-20140413204625-tu2bw7cyj14rjx53
2014-04-13 22:46:25 +02:00
8d6e2b4a15
[iMP] minor bugfixes
...
bzr revid: fp@tinyerp.com-20140413195730-zpzpsmo53fqa4x96
2014-04-13 21:57:30 +02:00
f908137d76
[IMP] Template Editor
...
bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
2014-04-13 18:20:28 +02:00
8178669795
[FIX] mail, mass_mailing
...
- mail: now trigger postprocess_sent_message in every case, being sent or not, as the state
is propagated in the method; udpated all addons accordingly;
- email_template: fixed URL to edit it in website + form view;
- mass_mailing: barchart now send jsonified value;
- mass_mailing: tweaking the form view with all options
bzr revid: tde@openerp.com-20140408124053-o9tb14k6v47s5mjd
2014-04-08 14:40:53 +02:00
271e805cb8
[IMP] mass_mailing: new refactoring of the way the body is managed
...
- now body_html is a right field on mass_mailing, editable using the website
- email_designer controller / template now works on everything that has a body
receiving its model and res_id as post parameters; it does not work only on
email tempaltes anymore
- cleaning of the mass mailing form view: reply_to managment option (either
replied go into the document, either there is a specified reply_to; it is implemented
using boolean fields instead of a selection because all options are not available
for all models ... models like contact or partner do not have a chatter or
shoudl be be used for a chatter-like use)
- send to all now instantiates a mail.compose.message; the mass mailign processing
is delegated to the wizard itself.
bzr revid: tde@openerp.com-20140407170346-hpklabi513xskd07
2014-04-07 19:03:46 +02:00
3624a3beb2
[IMP] website_mail: refactor follow button; add partner_id in session for public user
...
bzr revid: chm@openerp.com-20140318101505-4yivw8h5oujyhm9b
2014-03-18 11:15:05 +01:00
d143e09ff5
[IMP] Mailing List Fixes
...
bzr revid: fp@tinyerp.com-20140316123220-5hq7e3f6p7fzbr96
2014-03-16 13:32:20 +01:00
55ec0feba2
[IMP] Subscribe data
...
bzr revid: fp@tinyerp.com-20140313194801-24f5f9s03rk663d6
2014-03-13 20:48:01 +01:00
58a5f90758
[IMP] website: dynamic website_mail snippet with js
...
bzr revid: chm@openerp.com-20140306130240-cpsd5mssziuvrpf8
2014-03-06 14:02:40 +01:00
7cf77276fb
[IMP] website snippet: add Configurable follow snippet
...
bzr revid: chm@openerp.com-20140305175411-in3oodk778dxvu0k
2014-03-05 18:54:11 +01:00
c02a510889
[IMP] website_mail: email designer: improved template + link to backend
...
bzr revid: tde@openerp.com-20140207102124-5joee7c201fmxizu
2014-02-07 11:21:24 +01:00
d26919f73e
[IMP] website_mail: reordered email snippets, added 2 and 3 columns in basic email structures
...
bzr revid: tde@openerp.com-20140207091907-6brx7m2i69mo9ow0
2014-02-07 10:19:07 +01:00
1e2452fb1a
[IMP] website_mail: email designer snippets categories better explained, to avoid
...
confusion with the classic html editor
bzr revid: tde@openerp.com-20140207084137-zk2o3nn7ml84axa6
2014-02-07 09:41:37 +01:00
93a5122ac5
[IMP] website_mail: improve email_template link for front-end edition didsplay
...
bzr revid: tde@openerp.com-20140206145510-y4mangyhhmwcofa7
2014-02-06 15:55:10 +01:00
b7f88a58fb
[FIX] website:_mail: fix followers
...
bzr revid: chm@openerp.com-20140129170829-abmv73xswzl6ccm9
2014-01-29 18:08:29 +01:00
54ee20cbd0
[IMP] website_mail: tmeplate editor: improved tmeplate of the pag
...
- removed an unnecessary oe_structure in head of the page
- added a position: relative on the body_html field because otherwise
there are ugly violet bars
bzr revid: tde@openerp.com-20140115151706-pwy0jjgce955ttth
2014-01-15 16:17:06 +01:00
7a9bafc39c
[CLEAN] website_mail: template designer: cleaned a bit the snippets to remove section tag
...
bzr revid: tde@openerp.com-20140115091738-q0gpxqpn80m9r1sd
2014-01-15 10:17:38 +01:00
cb26621d2b
[IMP] website_mail: template designer: improved button snippet
...
bzr revid: tde@openerp.com-20140114173629-zfxili82zn6zi6yv
2014-01-14 18:36:29 +01:00
0aa495f5cb
[IMP] website_mail: improved email template snippets + added comparison / three columns / big pictures + some improvements in the page layout of template designer
...
bzr revid: tde@openerp.com-20140114171715-akbkj9x8ls8i5phf
2014-01-14 18:17:15 +01:00
4ec71cd82b
[ADD] website_mail: template designer: added some snippets for template design
...
bzr revid: tde@openerp.com-20140113180051-dqtzzn9mrya0ythq
2014-01-13 19:00:51 +01:00
cbbe82a4a1
[MERGE] Sync with main website-al branch
...
bzr revid: tde@openerp.com-20140113134937-kijvjjne6grov61c
2014-01-13 14:49:37 +01:00
b97727701c
[IMP] [ADD] website: added base for template designer.
...
[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.
bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
2014-01-13 13:55:34 +01:00
f927506bfc
[FIX] website_mail: follow/subscribe button
...
bzr revid: chm@openerp.com-20140113110542-jkb13xfiy3tno50n
2014-01-13 12:05:42 +01:00
ee370a837c
[IMP] website: Removing unnecessary spaces at beginning of line
...
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
72c996333f
[IMP] website_mail: rename template
...
bzr revid: chm@openerp.com-20131211153543-4vjcd1h31ltf4dl0
2013-12-11 16:35:43 +01:00
5217c8ebe8
[IMP] website: remove secure_layout. Inherit with groups for js editor
...
bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7
2013-12-11 15:44:02 +01:00
b2bd96340f
[FIX] website: create button and help (fix inherit_id in modules)
...
bzr revid: chm@openerp.com-20131205165340-ty0xybh7uz859gnm
2013-12-05 17:53:40 +01:00
b1765e2834
[IMP] website: slip layout
...
bzr revid: chm@openerp.com-20131204161754-5dq4bt7gghnk878c
2013-12-04 17:17:54 +01:00
ed7623fc45
[IMP] Performance improvement: improved cache with context, better get_object
...
bzr revid: fp@tinyerp.com-20131130154659-uqis34x2cemmocly
2013-11-30 16:46:59 +01:00
07f7807e94
[IMP] website_event_track
...
bzr revid: chm@openerp.com-20131125143713-q9a0vlenbi7njix2
2013-11-25 15:37:13 +01:00
20b5e1af2f
[IMP] primary button for follow blog
...
bzr revid: fp@openerp.com-20131116151344-8hjt2kwz4fakpkep
2013-11-16 16:13:44 +01:00
ceb04895d3
[IMP] Cleaning code of followers and website_published, 200 lines removed
...
[IMP] CSS and design of options and follow, avoid custom CSS
bzr revid: fp@openerp.com-20131116150927-4mjk1zdcgfzt4e95
2013-11-16 16:09:27 +01:00
dbf79284ab
[FIX] don't leave a dangling input box when removing the follow/unfollow button in logged-out mode
...
bzr revid: xmo@openerp.com-20131030150958-si48ypzrxabegdpo
2013-10-30 16:09:58 +01:00
75a4a7e3f8
[IMP] Ace: proper template naming
...
bzr revid: ddm@openerp.com-20131021102840-h8s2nflqdmuumun0
2013-10-21 12:28:40 +02:00
Martin Trigaux
Thibault Delavallée
Antony Lesuisse
Fabien Meghazi
Christophe Simonis
Xavier Morel
Kersten Jeremy
Fabien Pinckaers
chm@openerp.com
Christophe Matthieu
Fabien Pinckaers
ddm