Olivier Dony
e276ac33f6
[MERGE] Forward-port saas-4 up to bf135ad
2014-05-28 17:45:31 +02:00
Richard Mathot
bf135ad057
[FIX] website_blog: display properly (very) long words in comments
2014-05-28 17:23:28 +02:00
Xavier Morel
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
Fabien Pinckaers
143615ddc1
Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa
2014-05-23 09:24:16 +02:00
Yogesh Parekh
59ecefbed2
Remove content field in Pages History form in website_blog module
2014-05-22 16:17:22 +05:30
Yogesh Parekh
52f571ac8a
Remove content html field from website_blog module
2014-05-22 15:33:37 +05:30
Christophe Simonis
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
Christophe Simonis
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
Christophe Simonis
d93f628c72
[MERGE] merge bzr saas-4 addons branch
2014-05-20 17:12:01 +02:00
Xavier Morel
8c86be0c60
[FIX] indentation and formatting of various rst snippets
2014-05-19 13:59:17 +02:00
Thibault Delavallée
5a15b58a3b
[FIX] website_blog: order archives by date desc
2014-05-19 11:14:30 +02:00
Richard Mathot (OpenERP)
8145c52dea
[FIX] website_blog: display blog posts in anti-chronological order
2014-05-14 16:11:46 +02:00
Fabien Meghazi
c3cfc4bc32
[MERGE] sitemap backport, merge trunk from 9438 til 9440
...
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
Fabien Meghazi
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +02:00
Martin Trigaux
00a4845bc7
[FIX] website_blog: fix broken change cover wizard
2014-05-13 12:31:57 +02:00
Richard Mathot (OpenERP)
d34c54dbb6
[FIX] URL generation in blog template
2014-05-12 16:20:48 +02:00
Olivier Dony
4cecbd919f
[FIX] mass_mailing,website*,survey: leftover calls to website.get_public_user()
...
This method was (partially) removed at rev.9421
rev-id al@openerp.com-20140507153223-q73u5lhyrfw98o3a
bzr revid: odo@openerp.com-20140512103935-o0ue9wzenm5wjejq
2014-05-12 12:39:35 +02:00
Fabien Pinckaers
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
Fabien Meghazi
b0cbaf330a
[IMP] website: load website.xml templates only in editable mode
...
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
2014-05-05 13:38:00 +02:00
Antony Lesuisse
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
Fabien Meghazi
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Denis Ledoux
79d4c57877
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
...
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
Olivier Dony
d5534d7c42
[IMP] website_blog: spellcheck/grammar for module description, courtesy of Ray Carnes (Ursa Information Systems)
...
bzr revid: odo@openerp.com-20140429082329-m3q74wr7fgyr3bbu
2014-04-29 10:23:29 +02:00
Fabien Meghazi
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
Fabien Meghazi
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
chm@openerp.com
ee7ff4bd07
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
Fabien Meghazi
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
Xavier Morel
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
Christophe Simonis
146ee44c66
[FIX] website_blog: set oldname for background_image field
...
bzr revid: chs@openerp.com-20140417153948-loqwswgkq1zri462
2014-04-17 17:39:48 +02:00
chm@openerp.com
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
Thibault Delavallée
452f1fbe59
[MERGE] [IMP] website_blog: layout and usability improvements. This task proposes a better layout that eases the reading + smooth transitions between blogs based on suggestions dynamically chosen based on a ranking.
...
Featuring :
- blog: blog now have a subtitle field
- blog_post: blog post now have a subtitle field, removed shortened content + website_published_datetime (create_date and write_date are sufficient). Added tracking of visits + ranking computation, to select the next post the user will see. Added background-image, that is used to display a cover behind the post title and subtitle. Overall display improvement.
- added new feature that allows a user to tweet selected text on twitter from post.
- added new feature that allows a user to discuss on every paragraph (anonymous user have to give their name and email)
- better blog demo data
Misc:
- website: removed dead code about website_published_datetime that could have been generic but has never been used
- [FIX] website: fixed image controller, do not attempt to read website_published on models that do not have that field
bzr revid: tde@openerp.com-20140409123550-tkrcfvnofxz7ryiz
2014-04-09 14:35:50 +02:00
Thibault Delavallée
6c6885d7fa
[IMP] website_blog: always have a next_post, even a visited one, it you have at least
...
2 posts.
bzr revid: tde@openerp.com-20140408134728-fy4mbsuetwksa76v
2014-04-08 15:47:28 +02:00
Thibault Delavallée
5dac705c1a
[IMP] website_blog: enable_editor + slugify URLs in order to be directly
...
in edit mode when creating a new blog.
bzr revid: tde@openerp.com-20140408134115-125vtpmtikdd2u26
2014-04-08 15:41:15 +02:00
Thibault Delavallée
a59283ecc3
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140408131347-uo0ahmypbxhlx7vv
2014-04-08 15:13:47 +02:00
chm@openerp.com
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
Christophe Simonis
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Denis Ledoux
73b3c851da
[FIX] website*: remove unusable demo links from manifests
...
bzr revid: dle@openerp.com-20140403145128-9w92v4mmasz66mqj
2014-04-03 16:51:28 +02:00
Thibault Delavallée
271e43c3ed
[FIX] website_blog: content post process: forgotten the unicity of paragraph tagging
...
bzr revid: tde@openerp.com-20140403115122-wuk65a5ua7ewqzz7
2014-04-03 13:51:22 +02:00
Thibault Delavallée
8f105b6624
[IMP] website_blog: path computation (unique key) for paragraphs in medium-like blogs
...
is now done server-side and stored directly in the html content, as post processing.
The front-end attaches messages based on the attribute data-chatter-id, but do not
compute the attribute itself anymore.
Misc cleaning of code.
bzr revid: tde@openerp.com-20140403112656-ane3ovhh70qdc8b4
2014-04-03 13:26:56 +02:00
Thibault Delavallée
045157170a
[IMP] website_blog: update templates to use the contact widget, allowing to
...
display partner-related stuff without having to tweak the access rights.
Misc update of templates due to some filed renaming.
Added author field on the blog, allowing to avoid having issues with
create_uid field.
bzr revid: tde@openerp.com-20140402140200-a3g0750akro2n12v
2014-04-02 16:02:00 +02:00
Thibault Delavallée
fbecb8da26
[CLEAN] website_blog: removed some demo data to avoid bloating the diff
...
bzr revid: tde@openerp.com-20140402115939-q0gh61wp7owov64c
2014-04-02 13:59:39 +02:00
Thibault Delavallée
c45ae33859
[CLEAN] website_blog: cleaned modifications in models :
...
- default value for post name and subtitle, because using it through the front-end
is the only way it shoudl be used, and the behavior should always be consistent
- moved mail_message new field into its own mail_message.py file to ease the
module reading;
- renamed discussion into discussion_key, a bit more understandable
- link cleaning
bzr revid: tde@openerp.com-20140402111656-0h66yedwm36m6c7t
2014-04-02 13:16:56 +02:00
Thibault Delavallée
059508ee14
[FIX] website_blog: fixed security breach, we do not allow to read on res.partner.
...
Avoid doing things like this.
bzr revid: tde@openerp.com-20140402093348-4a3tjuxtqcxthvqb
2014-04-02 11:33:48 +02:00
ajay javiya (OpenERP)
7126bc5b50
[MERGE] : with trunk and resolve conflicts
...
bzr revid: aja@tinyerp.com-20140401132534-owbxvwqo6qpodw7e
2014-04-01 18:55:34 +05:30
Thibault Delavallée
76141aaecf
[FIX] website_blog: who wrote such stupid domains ?
...
bzr revid: tde@openerp.com-20140401095430-tn2i94o1bmdvevgd
2014-04-01 11:54:30 +02:00
Thibault Delavallée
e29e6dfe26
[CLEAN] website_blog :code cleaning in added code
...
bzr revid: tde@openerp.com-20140401092826-gf9f365bn4wu8mk3
2014-04-01 11:28:26 +02:00
ajay javiya (OpenERP)
eff3ce022c
[REM] : image
...
bzr revid: aja@tinyerp.com-20140401092101-neuzx2xuet0e8m7x
2014-04-01 14:51:01 +05:30
Thibault Delavallée
6a4e52f272
[IMP] website_blog: use 2 different URL schemes (post and blog), to ease url use in templates
...
bzr revid: tde@openerp.com-20140401092026-2patc88e0xu6ghyx
2014-04-01 11:20:26 +02:00
Thibault Delavallée
e6bcc1111e
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140401084304-mnbcx1agdzdptyyf
2014-04-01 10:43:04 +02:00
Fabien Pinckaers
804d3fe4f6
[IMP] rename class to be reusable
...
bzr revid: fp@tinyerp.com-20140401072504-6hbwo2jui240jng7
2014-04-01 09:25:04 +02:00