f4d78ae738
Merge branch 'server-trunk'
...
Conflicts:
addons/mass_mailing/controllers/main.py
2014-05-14 15:13:04 +02:00
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
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
105618443f
[IMP] Sitemap
...
bzr revid: fp@tinyerp.com-20140511134037-84vnn1b4zfzk8som
2014-05-11 15:40:37 +02:00
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
dab3557253
[FIX] website_forum: correct the 'Editor' goal definition, the field author_id on a mail_message is a m2o to res.partner and not res.users
...
bzr revid: mat@openerp.com-20140509134434-6u2ft2gyv0hcryxq
2014-05-09 15:44:34 +02:00
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
643871c20f
[FIX] website_forum: set config parameter via dedicated function
...
bzr revid: chs@openerp.com-20140507134127-xmp9kza1mvy37jf1
2014-05-07 15:41:27 +02:00
69ec02b2d4
[FIX] website_forum: more fixes :
...
- display tag name in 'filter' bar when filtering on a tag
- display active tag in a blue color
- order answers: correct first, then most upvoted
bzr revid: tde@openerp.com-20140506123001-fz5gt6i9zw6ondcu
2014-05-06 14:30:01 +02:00
55479a4cc2
[FIX] website_forum: new batch of fixes :
...
- fixed reopen link that was broken (python code appearing)
- fixed close link that was leading to a 500 error due to post -> question
- fixed link to question author, was redirecting to the current user
- fixed displayed number of questions in the forum, now displaying actual question
number, not number of displayed questions in the page
- improved guidelines: added link back to the forum
- fixed tags display: now by posts_count desc, unused tags are not shown
- users are now displayed by desc karma
- converting a comment as an answer does not allow to create a new answer if another
one by uid is already present, it just moves the comment
bzr revid: tde@openerp.com-20140505154523-6dld9sfm0nc0oulu
2014-05-05 17:45:23 +02:00
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
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
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
7f236edcdd
[FIX] website_forum: fixed link of answer's author, was redirecting
...
to the current users instead of the post's author;
bzr revid: tde@openerp.com-20140425124911-z4dqhm64yabq214t
2014-04-25 14:49:11 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
252be1b9ab
[FIX] website_forum: various fixes and usability improvements
...
- question title is now a link
- fixed a crash when trying to see badges in the 'new badge' notification
- improved the tags manager: manage tag at blur event (otherwise the last tag
was ften not created) + manage already-existing tags
bzr revid: tde@openerp.com-20140423142034-5si58h4jgd1jyyem
2014-04-23 16:20:34 +02:00
058427d88b
[FIX] website_forum: correct view xml (introduce by previous commit)
...
bzr revid: chs@openerp.com-20140422151111-2yfs704yk2qbiy89
2014-04-22 17:11:11 +02:00
618fbde36f
[MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
...
bzr revid: chs@openerp.com-20140422144651-840zze7p5549k88s
bzr revid: chs@openerp.com-20140422144933-0su8g7pgrcloijco
2014-04-22 16:49:33 +02:00
12beacda08
[MERGE] backport of trunk revisions:
...
9362 fp@tinyerp.com-20140421205739-rki3bctinjy3amzy [MERGE] new module: website_forum_doc + small fixes (close) in forum
9363 fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3 [IMP] improved form view for posts
bzr revid: chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
2014-04-22 16:32:49 +02:00
f756fa671e
[FIX] gamification: remove wrong double quote in xml
...
website_forum: restrict granting rights on forum badges
bzr revid: mat@openerp.com-20140422090937-l2mxc828hof9u8pi
2014-04-22 11:09:37 +02:00
bb91b146dd
[MERGE] [FIX] gamification and website_forum
...
- add noupdate tag
- domain are evaluated at loading
- better user subscription and computation of domain
- batch creation of users
bzr revid: mat@openerp.com-20140422083856-3dffeml5qt0w0dt4
2014-04-22 10:38:56 +02:00
c1b9748947
[IMP] improved form view for posts
...
bzr revid: fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3
2014-04-21 23:38:50 +02:00
261204c98d
[MERGE] new module: website_forum_doc + small fixes (close) in forum
...
bzr revid: fp@tinyerp.com-20140421205739-rki3bctinjy3amzy
2014-04-21 22:57:39 +02:00
1a09a703e4
[IMP] SEO tags
...
bzr revid: fp@tinyerp.com-20140421202518-vqa8l0gtaemzoc32
2014-04-21 22:25:18 +02:00
c550fcb3d0
[FIX] Promote to doc flow
...
bzr revid: fp@tinyerp.com-20140421202350-n6uzooo9mvty07i7
2014-04-21 22:23:50 +02:00
19da27c191
[FIX] close and reopen questions
...
bzr revid: fp@tinyerp.com-20140421184347-c86uyuw8l61dxl5o
2014-04-21 20:43:47 +02:00
64c7152e11
[IMP] better css
...
bzr revid: fp@tinyerp.com-20140421181228-w92l1ibo34o2xqya
2014-04-21 20:12:28 +02:00
cf78b6d9a0
[IMP] Forum + SEO
...
bzr revid: fp@tinyerp.com-20140421172330-gktockbm11emgsos
2014-04-21 19:23:30 +02:00
cbf071a62c
[IMP] better layout for documentation
...
bzr revid: fp@tinyerp.com-20140421144510-9qo1whru5u5ec721
2014-04-21 16:45:10 +02:00
bf6cd98083
[FIX] message author link, now working
...
bzr revid: tde@openerp.com-20140418153217-qdbslziaiz832xvz
2014-04-18 17:32:17 +02:00
018624ea43
[IMP] website_forum: better error messages about karma
...
bzr revid: tde@openerp.com-20140418151608-0pb3ui97aksb9en1
2014-04-18 17:16:08 +02:00
35a3f7fbd0
[CLEAN] website_forum: removed a forgotten print statement
...
bzr revid: tde@openerp.com-20140418144854-cxl30gibxw43r5th
2014-04-18 16:48:54 +02:00
aa8bdfc740
[IMP] website_forum: controllers now check the karma in addition to the viewé
...
bzr revid: tde@openerp.com-20140418144722-k2g2gespb3dwpio4
2014-04-18 16:47:22 +02:00
b153fcd35e
[IMP] [FIX] website_forum: better control of actions based on karma; those
...
actions are calculated in the controller, based on forum.forum values instead of values hardcoded
in the view.
bzr revid: tde@openerp.com-20140418135724-k64yey6hhrki0b6h
2014-04-18 15:57:24 +02:00
a6103a08be
[IMP] [FIX] website_forum: better karma management for votes
...
and answers. Also some fixes in answer tagging and edition closing.
bzr revid: tde@openerp.com-20140418132905-ja2rqcc2edqzu3jv
2014-04-18 15:29:05 +02:00
bb8e24d951
[FIX] website_forum: set badges and challenges in noupdate
...
bzr revid: mat@openerp.com-20140418124112-m97idrklxq8y3e3f
2014-04-18 14:41:12 +02:00
88600a6ee5
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20140417112956-590gdsus7485mkqk
2014-04-17 16:59:56 +05:30
f9ab97d869
[IMP] improved view, added hirachy view of documentation,show documentaion menu in hirarcy.
...
bzr revid: tpa@tinyerp.com-20140417112844-swv8lznyead51j4t
2014-04-17 16:58:44 +05:30
0c32e7241d
[IMP] use char_domain widget
...
bzr revid: mat@openerp.com-20140416152208-1rnyyvr35m0kj5cm
2014-04-16 17:22:08 +02:00
9094a7aab9
[FIX] forum: conversion of incorrect group to domain
...
bzr revid: mat@openerp.com-20140416151410-d59osro704v2zfdq
2014-04-16 17:14:10 +02:00
d79cbd3fb8
[FIX] gamification: convert autojoin_group_id to a domain representing the list of users
...
bzr revid: mat@openerp.com-20140416151026-lmvyo8k0wo4hw9gn
2014-04-16 17:10:26 +02:00
cd25de6989
[ADD] website_doc: modue based on website_forum to show documentatoin based on questions and best answers.
...
bzr revid: tpa@tinyerp.com-20140416105122-2368jv31gy26ek32
2014-04-16 16:21:22 +05:30
3755fa19a5
[IMP] gamification and website_forum improvements
...
gamification:
- fix batch mode when grouping by id
- fix subquery in batch mode when a ending date is set
- serialisation method can exclude categories of challenge
- view improvements
website_forum:
- enabling bages in batch mode
- fix karma computation when creating a new post
- changing previous vote affects the user karma
- do not display forum challenges on user home page
bzr revid: mat@openerp.com-20140415162400-78cklbdw0bmn94zr
2014-04-15 18:24:00 +02:00
35c7f4814d
Allow overwrite of the serialising method to exclude some categories in the challenge search
...
bzr revid: mat@openerp.com-20140415134809-uconkvnp0z32jxjs
2014-04-15 15:48:09 +02:00
bc0738e47e
One morning I shot an elephant in my pajamas. How he got in my pajamas, I don't know.
...
bzr revid: mat@openerp.com-20140415131929-6pktlodmlgr2fuwz
2014-04-15 15:19:29 +02:00
15306066d0
I love the smell of napalm in the morning.
...
bzr revid: mat@openerp.com-20140415113545-31efpjddjwqr4ajl
2014-04-15 13:35:45 +02:00
14ff39f96e
[FIX] website_forum: mooooore baaaaaadges
...
bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42
2014-04-15 12:18:42 +02:00
9f3a2f84e0
[ADD] website_forum: more badges
...
bzr revid: mat@openerp.com-20140414155344-v580tpy5l12z9v95
2014-04-14 17:53:44 +02:00
c40318a46a
[ADD] website_forum: self_reply field and some badges
...
bzr revid: mat@openerp.com-20140414145415-8g9jtp95d173183i
2014-04-14 16:54:15 +02:00
0c8539846a
[ADD] website_forum: quality badges
...
bzr revid: mat@openerp.com-20140414135115-onmywwurr03g21dw
2014-04-14 15:51:15 +02:00
Xavier Morel
Olivier Dony
Martin Trigaux
Fabien Pinckaers
Christophe Simonis
Thibault Delavallée
Fabien Meghazi
Antony Lesuisse
Turkesh Patel (Open ERP)