5ea15d56fb
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3
2014-04-14 11:04:28 +02:00
15725997dd
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
01d9ea6f64
[MERGE][IMP] crm/sale_crm: Terminology
...
Replacement of the term "category" by "tag", for the sake of consistency
bzr revid: rim@openerp.com-20140414083511-b5qvr4ek4mgxx17x
2014-04-14 10:35:11 +02:00
8da0820a88
[FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image
...
bzr revid: chm@openerp.com-20140414082617-svxpb6kuqfhjm8oa
2014-04-14 10:26:17 +02:00
34e618965a
[IMP] commment
...
bzr revid: fp@tinyerp.com-20140414081035-9ixrag5oly2q0emb
2014-04-14 10:10:35 +02:00
3a27186643
[MERGE] [FIX] FormView: avoid multiple creations of the same line in o2m fields when the save action fails (e.g. forgot one required field)
...
This is done by removing the added action 'prepend_on_create' that can be present as many time as we pressed the save button
lp bug: https://launchpad.net/bugs/1265705 fixed
bzr revid: mat@openerp.com-20140414081003-290q4v21q01m4rsi
2014-04-14 10:10:03 +02:00
ea167ad7ab
[IMP] test cursor: code cleanup to make it more robust to concurrent accesses
...
bzr revid: rco@openerp.com-20140414075906-2d0i4qhe4x7czsao
2014-04-14 09:59:06 +02:00
72b37e2bbd
[IMP] context_today should apply to function fields also in order to show them in qweb reports
...
bzr revid: jco@openerp.com-20140414074558-irgt7g9st5ongny9
2014-04-14 09:45:58 +02:00
bf3d4a7d94
[MRG] merge with main branch
...
bzr revid: avo@tinyerp.com-20140414071801-3eaa6iqryfrolxbt
2014-04-14 12:48:01 +05:30
001a034e58
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00
8d42202c92
[FIX] show stages only if campaign is set
...
bzr revid: fp@tinyerp.com-20140413205337-kkr9xtk6x5bzvzo5
2014-04-13 22:53:37 +02:00
3db3160644
[IMP] website_link field removed
...
bzr revid: fp@tinyerp.com-20140413204625-tu2bw7cyj14rjx53
2014-04-13 22:46:25 +02:00
57078f5c12
[IMP] features
...
bzr revid: fp@tinyerp.com-20140413203634-75mf4z8o3xh7i83h
2014-04-13 22:36:34 +02:00
96a750fd03
[IMP] Removing featuer
...
bzr revid: fp@tinyerp.com-20140413203309-digp60hsobgv3i57
2014-04-13 22:33:09 +02:00
2ad0b6e369
[IMP] removing unused code
...
bzr revid: fp@tinyerp.com-20140413202922-glv198j62sqeugz2
2014-04-13 22:29:22 +02:00
b1ccd56368
[IMP] better usability
...
bzr revid: fp@tinyerp.com-20140413201748-u8e26ef40dt7360i
2014-04-13 22:17:48 +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
cb544e61c4
[IMP] default recipients to mailing list
...
bzr revid: fp@tinyerp.com-20140413070922-jw7f5s9wrt9g2gek
2014-04-13 09:09:22 +02:00
84fe98085b
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412233019-au2omxtet5sfqcxr
2014-04-13 01:30:19 +02:00
227b9a917d
[IMP] Adding stats file
...
bzr revid: fp@tinyerp.com-20140412232548-csyb7j13fyu4cwnw
2014-04-13 01:25:48 +02:00
e9cf53934b
[iMP] small improvements
...
bzr revid: fp@tinyerp.com-20140412232159-1y35hdpaahy633tb
2014-04-13 01:21:59 +02:00
3df4eb0f72
[WIP] Mailing Lists and Contacts cleaned
...
bzr revid: fp@tinyerp.com-20140412203129-5l7w4qr8rf2d1nqo
2014-04-12 22:31:29 +02:00
2feab20dbb
[WIP] started to reduce code
...
bzr revid: fp@tinyerp.com-20140412153339-rr3b1r4cmdeigp0v
2014-04-12 17:33:39 +02:00
ff41711be7
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20140412140002-lxl2bkmv0liwbiid
2014-04-12 16:00:02 +02:00
e69b086ecd
[FIX] logging, pg logging use thread db
...
bzr revid: al@openerp.com-20140412134728-vzn9247twgyfbcid
2014-04-12 15:47:28 +02:00
915ac89024
[merge]
...
bzr revid: fp@tinyerp.com-20140412130132-6dncdvhrxsciyr7l
2014-04-12 15:01:32 +02:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
9640e839d8
[ADD] New module: website_forum, a clone of askbot / stackoverflow.
...
This module models a forum: questions, answers, voting and comment system, karma
management. There is a link with gamification, allowing to use badges and reward
users for their participation to the forum.
Badges are temporarily commented out to ease the module beta-testing without having
to wait for some gamification improvements.
This merge also contains some fixes in access rights for gamification.
bzr revid: tde@openerp.com-20140411183646-fmkeng9fzixjrqy5
2014-04-11 20:36:46 +02:00
ac8f4d62a5
[IMP] [FIX] ir_qweb: fixed a call to a parameter considered as being
...
a dict but that could be None; added management of country flag on the
contact widget.
bzr revid: tde@openerp.com-20140411183425-nzhuk6mb80pahvwm
2014-04-11 20:34:25 +02:00
4c8418648f
[FIX] website_forum: fixed badges pgae
...
bzr revid: tde@openerp.com-20140411182751-immtoih95el07n6n
2014-04-11 20:27:51 +02:00
06776da4a9
[IMP] website_forum: karma management for vote
...
bzr revid: tde@openerp.com-20140411182254-0wyvzpcqxk4jyqev
2014-04-11 20:22:54 +02:00
2ec3a40334
[FIX] website_forum: cleaning in notification fetch + in profil editoin
...
bzr revid: tde@openerp.com-20140411180637-n1q4rmac5q1amqrw
2014-04-11 20:06:37 +02:00
7d834f0579
[IMP] website_forum: cleaned post cfreate and write
...
+ corrct subtype trigger
bzr revid: tde@openerp.com-20140411180615-bznyth4tv7e89sed
2014-04-11 20:06:15 +02:00
62fde442cb
[CLEAN] website_forum: res_users: cleaned dead code
...
bzr revid: tde@openerp.com-20140411180550-pucr84e70or4jhy0
2014-04-11 20:05:50 +02:00
d0740bedb9
[IMP] gamification: messages posted on user when receiving a badge
...
now have a subtype, to ease their search.
bzr revid: tde@openerp.com-20140411175730-hq06b7qezurzymj6
2014-04-11 19:57:30 +02:00
5a94881b32
[FIX] website_forum: share links now working
...
bzr revid: tde@openerp.com-20140411172658-9wxznhu2rds5y97i
2014-04-11 19:26:58 +02:00
c3cb7762a1
[TMP] website_forum: commented out badges, more tests will have to be
...
done on badges.
bzr revid: tde@openerp.com-20140411172408-b5oq98y4kcz1fzfr
2014-04-11 19:24:08 +02:00
b9b087ffb5
[FIX] [CLEAN] website_forum: cleaned and fixed upvote, downvote and favourite
...
bzr revid: tde@openerp.com-20140411171029-zeqtrko98z1jr3sm
2014-04-11 19:10:29 +02:00
5a3f68a767
[FIX] website_forum: deleting a comment is back and works
...
bzr revid: tde@openerp.com-20140411170114-po5bgwc2z2qgs8f0
2014-04-11 19:01:14 +02:00
a1e5f69cb3
[FIX] website_forum: post edition working again
...
bzr revid: tde@openerp.com-20140411164455-2mx3yic1hquu0pil
2014-04-11 18:44:55 +02:00
df3c6b7502
[FIX] web: do not try to close a destroyed dialog. trigger "closing" signal on close by top-right "X" button
...
bzr revid: chs@openerp.com-20140411162426-60bfybim5aqojsxx
2014-04-11 18:24:26 +02:00
b6a1359b4f
[FIX] website_forum: convert comment to post is back and works
...
bzr revid: tde@openerp.com-20140411161916-rlobfxosniii66m4
2014-04-11 18:19:16 +02:00
907a97b15b
[FIX] website_forum: fixe ddemo data, about create_uid warning.
...
bzr revid: tde@openerp.com-20140411161414-gqyosw7g73r36fer
2014-04-11 18:14:14 +02:00
8540a63aa6
[CLEAN] website_forum: gamification: removed code about ongoing challenges
...
as it is now a feature in trunk.
Also removed unnecessary column redefinition.
Also removed an override in users, will see if necessary.
bzr revid: tde@openerp.com-20140411160003-tffx54f2evjh4r70
2014-04-11 18:00:03 +02:00
f091e9d6e5
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411155723-pqe8ofxh060afiuj
2014-04-11 17:57:23 +02:00
133038c722
[FIX] website_forum: fixed toggle_correct for setting answers as correct
...
bzr revid: tde@openerp.com-20140411155622-18bdyddcs6hdln77
2014-04-11 17:56:22 +02:00
668fb8a542
[MERGE] gamification: add batch mode, improve some views, remove inprogess_update state and "realtime" (using cron) badge to recieve badges without needing to close the challenge
...
bzr revid: mat@openerp.com-20140411154740-pzw0v7po7pmci42l
2014-04-11 17:47:40 +02:00
5a402ce73a
[FIX] website_forum: disable the tour as it is not implemented
...
and seems to make other tours crash.
bzr revid: tde@openerp.com-20140411154150-4tn3bfe7wp8n901d
2014-04-11 17:41:50 +02:00
236a4d71be
[MERGE] sync with trunk
...
bzr revid: mat@openerp.com-20140411154002-6557tcjfetqwb0kf
2014-04-11 17:40:02 +02:00
Thibault Delavallée
Richard Mathot (OpenERP)
chm@openerp.com
Fabien Pinckaers
Martin Trigaux
Raphael Collet
Josse Colpaert
Amit Vora
Antony Lesuisse
Christophe Simonis