Thibault Delavallée [Tue, 15 Apr 2014 11:38:17 +0000 (13:38 +0200)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20140415113817-j38p3rn3j7pz2kxg
Kersten Jeremy [Tue, 15 Apr 2014 11:37:51 +0000 (13:37 +0200)]
[FIX] mail template view - Set body_html field as simple text area without cke by default. Else, the mako code are considered as mal formatted and moved.
bzr revid: jke@openerp.com-
20140415113751-h0a1tg36tht1bys1
Thibault Delavallée [Tue, 15 Apr 2014 11:04:39 +0000 (13:04 +0200)]
[IMP] mass_mailing :handle attachments for mailings
bzr revid: tde@openerp.com-
20140415110439-j72v9cnz3nml7g04
Thibault Delavallée [Tue, 15 Apr 2014 10:43:37 +0000 (12:43 +0200)]
[IMP] mass_mailing :improved demo data
bzr revid: tde@openerp.com-
20140415104337-gokvkpvx36wch132
Thibault Delavallée [Tue, 15 Apr 2014 10:43:28 +0000 (12:43 +0200)]
[FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation
bzr revid: tde@openerp.com-
20140415104328-yll2kgxtjmg6f3hc
Thibault Delavallée [Tue, 15 Apr 2014 10:28:18 +0000 (12:28 +0200)]
[FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not allowed
bzr revid: tde@openerp.com-
20140415102818-zcm9vfc7zalg29f4
Kersten Jeremy [Tue, 15 Apr 2014 10:14:06 +0000 (12:14 +0200)]
[FIX] Website banner tour - Fix test according to new banner structure
bzr revid: jke@openerp.com-
20140415101406-54cdr44xayvyq8xo
Thibault Delavallée [Tue, 15 Apr 2014 10:13:42 +0000 (12:13 +0200)]
[FIX] mass_mailing: various fixes in campaign view and basic management
bzr revid: tde@openerp.com-
20140415101342-7vvadykp1udz6hgs
Kersten Jeremy [Tue, 15 Apr 2014 10:08:34 +0000 (12:08 +0200)]
[FIX] Website tour - Click inside the zone before to insert sampleText
bzr revid: jke@openerp.com-
20140415100834-2pstpw357y9klc89
Thibault Delavallée [Tue, 15 Apr 2014 09:58:17 +0000 (11:58 +0200)]
[REM] mass_mailing: removed report, a graph view on statistics will be sufficient
bzr revid: tde@openerp.com-
20140415095817-rx7bokd6qc5rkrhq
Thibault Delavallée [Tue, 15 Apr 2014 09:39:54 +0000 (11:39 +0200)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20140415093954-f4swocgxl5k5si3r
Thibault Delavallée [Tue, 15 Apr 2014 09:25:03 +0000 (11:25 +0200)]
[IMP] mass_mailing: finishing refactoring for the new func flow.
- cleaned reply-to management, now displaying an alert but simplifying the underlying
model about options available / not available for certain documents;
- cleaned a bit the form view;
- date -> create_date, and added a sent_date to distinguish the two;
- removed dead code;
- first draft of improving the chardomain widget
bzr revid: tde@openerp.com-
20140415092503-q1hku1rh12ldy9i1
Raphael Collet [Mon, 14 Apr 2014 14:47:54 +0000 (16:47 +0200)]
[FIX] calendar: fix string quoting mess in email template
bzr revid: rco@openerp.com-
20140414144754-08fgs7xnzax5uzht
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 14:44:07 +0000 (16:44 +0200)]
[MERGE][FIX] Mobile preview of blogs
bzr revid: rim@openerp.com-
20140414144407-cz3fmydj8vpzl7n6
Thibault Delavallée [Mon, 14 Apr 2014 14:40:11 +0000 (16:40 +0200)]
[CLEAN] mass_mailing: rmeoved dead stuff
bzr revid: tde@openerp.com-
20140414144011-awu4g35etq9s4gje
Kersten Jeremy [Mon, 14 Apr 2014 14:30:01 +0000 (16:30 +0200)]
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
bzr revid: jke@openerp.com-
20140414143001-26p3ka7dwb1er6y0
Kersten Jeremy [Mon, 14 Apr 2014 14:26:31 +0000 (16:26 +0200)]
[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width
bzr revid: jke@openerp.com-
20140414142631-k78shkqjqdtcnp83
Cedric Snauwaert [Mon, 14 Apr 2014 14:06:52 +0000 (16:06 +0200)]
[FIX]modal windows: when pressing esc key, modal-backdrop was not removed
bzr revid: csn@openerp.com-
20140414140652-g06gl0mguyhta5px
Fabien Pinckaers [Mon, 14 Apr 2014 13:40:26 +0000 (15:40 +0200)]
[REM] removing unused and non clean modules
bzr revid: fp@tinyerp.com-
20140414134026-ruv2o1vnpxtshnoo
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 13:26:34 +0000 (15:26 +0200)]
[REF] hr_timesheet: unused piece of code
bzr revid: rim@openerp.com-
20140414132634-xaps5ydbic5jriw4
Thibault Delavallée [Mon, 14 Apr 2014 13:11:09 +0000 (15:11 +0200)]
[MERGE] Merged fp's refactoring branch.
bzr revid: tde@openerp.com-
20140414131109-7ijlz4gybjd2b2oj
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 12:55:58 +0000 (14:55 +0200)]
[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore
bzr revid: rim@openerp.com-
20140414125558-zcwstm1ooa3qecpx
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 12:42:51 +0000 (14:42 +0200)]
[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Configuration
bzr revid: rim@openerp.com-
20140414124251-5u5nu75c9q8g8zi9
Fabien Pinckaers [Mon, 14 Apr 2014 12:34:43 +0000 (14:34 +0200)]
[IMP] translateable event description
bzr revid: fp@tinyerp.com-
20140414123443-qom78utc45e86lh1
Fabien Pinckaers [Mon, 14 Apr 2014 12:32:31 +0000 (14:32 +0200)]
[IMP] Ticket types translateable
bzr revid: fp@tinyerp.com-
20140414123231-b27qnkaujayk9j84
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 11:56:04 +0000 (13:56 +0200)]
[MERGE] from trunk
bzr revid: rim@openerp.com-
20140414115604-x1a32wfbxwkn3yhp
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 11:53:54 +0000 (13:53 +0200)]
[MERGE] from trunk
bzr revid: rim@openerp.com-
20140414115354-w8gpo3eks1rnud9k
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 09:33:42 +0000 (11:33 +0200)]
[MERGE][IMP] Terminology uniformisation
bzr revid: rim@openerp.com-
20140414093342-91n7m8o730om25qm
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 09:31:58 +0000 (11:31 +0200)]
[MERGE][IMP] invoice/sale: Terminology uniformisation
bzr revid: rim@openerp.com-
20140414093158-pbtttnv57a7nt7y6
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 09:11:37 +0000 (11:11 +0200)]
[MERGE] Sync with trunk
bzr revid: ypa@tinyerp.com-
20140404114223-zalha5tvp2l0ov8f
bzr revid: rim@openerp.com-
20140414091137-icatnn1humn7kisc
Thibault Delavallée [Mon, 14 Apr 2014 09:04:28 +0000 (11:04 +0200)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20140414090428-y435e4tsy4ju5nc3
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 09:03:36 +0000 (11:03 +0200)]
[MERGE] Sync with trunk
bzr revid: rim@openerp.com-
20140414090336-vc5283odv5f612es
Richard Mathot (OpenERP) [Mon, 14 Apr 2014 08:35:11 +0000 (10:35 +0200)]
[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
chm@openerp.com [Mon, 14 Apr 2014 08:26:17 +0000 (10:26 +0200)]
[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
Fabien Pinckaers [Mon, 14 Apr 2014 08:10:35 +0000 (10:10 +0200)]
[IMP] commment
bzr revid: fp@tinyerp.com-
20140414081035-9ixrag5oly2q0emb
Raphael Collet [Mon, 14 Apr 2014 07:59:06 +0000 (09:59 +0200)]
[IMP] test cursor: code cleanup to make it more robust to concurrent accesses
bzr revid: rco@openerp.com-
20140414075906-2d0i4qhe4x7czsao
Josse Colpaert [Mon, 14 Apr 2014 07:45:58 +0000 (09:45 +0200)]
[IMP] context_today should apply to function fields also in order to show them in qweb reports
bzr revid: jco@openerp.com-
20140414074558-irgt7g9st5ongny9
Fabien Pinckaers [Sun, 13 Apr 2014 20:53:37 +0000 (22:53 +0200)]
[FIX] show stages only if campaign is set
bzr revid: fp@tinyerp.com-
20140413205337-kkr9xtk6x5bzvzo5
Fabien Pinckaers [Sun, 13 Apr 2014 20:46:25 +0000 (22:46 +0200)]
[IMP] website_link field removed
bzr revid: fp@tinyerp.com-
20140413204625-tu2bw7cyj14rjx53
Fabien Pinckaers [Sun, 13 Apr 2014 20:36:34 +0000 (22:36 +0200)]
[IMP] features
bzr revid: fp@tinyerp.com-
20140413203634-75mf4z8o3xh7i83h
Fabien Pinckaers [Sun, 13 Apr 2014 20:33:09 +0000 (22:33 +0200)]
[IMP] Removing featuer
bzr revid: fp@tinyerp.com-
20140413203309-digp60hsobgv3i57
Fabien Pinckaers [Sun, 13 Apr 2014 20:29:22 +0000 (22:29 +0200)]
[IMP] removing unused code
bzr revid: fp@tinyerp.com-
20140413202922-glv198j62sqeugz2
Fabien Pinckaers [Sun, 13 Apr 2014 20:17:48 +0000 (22:17 +0200)]
[IMP] better usability
bzr revid: fp@tinyerp.com-
20140413201748-u8e26ef40dt7360i
Fabien Pinckaers [Sun, 13 Apr 2014 19:57:30 +0000 (21:57 +0200)]
[iMP] minor bugfixes
bzr revid: fp@tinyerp.com-
20140413195730-zpzpsmo53fqa4x96
Fabien Pinckaers [Sun, 13 Apr 2014 16:20:28 +0000 (18:20 +0200)]
[IMP] Template Editor
bzr revid: fp@tinyerp.com-
20140413162028-9tqqzis7qbggcrp4
Fabien Pinckaers [Sun, 13 Apr 2014 07:09:22 +0000 (09:09 +0200)]
[IMP] default recipients to mailing list
bzr revid: fp@tinyerp.com-
20140413070922-jw7f5s9wrt9g2gek
Fabien Pinckaers [Sat, 12 Apr 2014 23:30:19 +0000 (01:30 +0200)]
[IMP] Adding stats file
bzr revid: fp@tinyerp.com-
20140412233019-au2omxtet5sfqcxr
Fabien Pinckaers [Sat, 12 Apr 2014 23:25:48 +0000 (01:25 +0200)]
[IMP] Adding stats file
bzr revid: fp@tinyerp.com-
20140412232548-csyb7j13fyu4cwnw
Fabien Pinckaers [Sat, 12 Apr 2014 23:21:59 +0000 (01:21 +0200)]
[iMP] small improvements
bzr revid: fp@tinyerp.com-
20140412232159-1y35hdpaahy633tb
Fabien Pinckaers [Sat, 12 Apr 2014 20:31:29 +0000 (22:31 +0200)]
[WIP] Mailing Lists and Contacts cleaned
bzr revid: fp@tinyerp.com-
20140412203129-5l7w4qr8rf2d1nqo
Fabien Pinckaers [Sat, 12 Apr 2014 15:33:39 +0000 (17:33 +0200)]
[WIP] started to reduce code
bzr revid: fp@tinyerp.com-
20140412153339-rr3b1r4cmdeigp0v
Fabien Pinckaers [Sat, 12 Apr 2014 14:00:02 +0000 (16:00 +0200)]
[MERGE] trunk
bzr revid: fp@tinyerp.com-
20140412140002-lxl2bkmv0liwbiid
Antony Lesuisse [Sat, 12 Apr 2014 13:47:28 +0000 (15:47 +0200)]
[FIX] logging, pg logging use thread db
bzr revid: al@openerp.com-
20140412134728-vzn9247twgyfbcid
Fabien Pinckaers [Sat, 12 Apr 2014 13:01:32 +0000 (15:01 +0200)]
[merge]
bzr revid: fp@tinyerp.com-
20140412130132-6dncdvhrxsciyr7l
Launchpad Translations on behalf of openerp [Sat, 12 Apr 2014 08:31:53 +0000 (08:31 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20140412083153-3ona1js7o6z421vg
Thibault Delavallée [Fri, 11 Apr 2014 18:36:46 +0000 (20:36 +0200)]
[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
Thibault Delavallée [Fri, 11 Apr 2014 18:34:25 +0000 (20:34 +0200)]
[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
Thibault Delavallée [Fri, 11 Apr 2014 18:27:51 +0000 (20:27 +0200)]
[FIX] website_forum: fixed badges pgae
bzr revid: tde@openerp.com-
20140411182751-immtoih95el07n6n
Thibault Delavallée [Fri, 11 Apr 2014 18:22:54 +0000 (20:22 +0200)]
[IMP] website_forum: karma management for vote
bzr revid: tde@openerp.com-
20140411182254-0wyvzpcqxk4jyqev
Thibault Delavallée [Fri, 11 Apr 2014 18:06:37 +0000 (20:06 +0200)]
[FIX] website_forum: cleaning in notification fetch + in profil editoin
bzr revid: tde@openerp.com-
20140411180637-n1q4rmac5q1amqrw
Thibault Delavallée [Fri, 11 Apr 2014 18:06:15 +0000 (20:06 +0200)]
[IMP] website_forum: cleaned post cfreate and write
+ corrct subtype trigger
bzr revid: tde@openerp.com-
20140411180615-bznyth4tv7e89sed
Thibault Delavallée [Fri, 11 Apr 2014 18:05:50 +0000 (20:05 +0200)]
[CLEAN] website_forum: res_users: cleaned dead code
bzr revid: tde@openerp.com-
20140411180550-pucr84e70or4jhy0
Thibault Delavallée [Fri, 11 Apr 2014 17:57:30 +0000 (19:57 +0200)]
[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
Thibault Delavallée [Fri, 11 Apr 2014 17:26:58 +0000 (19:26 +0200)]
[FIX] website_forum: share links now working
bzr revid: tde@openerp.com-
20140411172658-9wxznhu2rds5y97i
Thibault Delavallée [Fri, 11 Apr 2014 17:24:08 +0000 (19:24 +0200)]
[TMP] website_forum: commented out badges, more tests will have to be
done on badges.
bzr revid: tde@openerp.com-
20140411172408-b5oq98y4kcz1fzfr
Thibault Delavallée [Fri, 11 Apr 2014 17:10:29 +0000 (19:10 +0200)]
[FIX] [CLEAN] website_forum: cleaned and fixed upvote, downvote and favourite
bzr revid: tde@openerp.com-
20140411171029-zeqtrko98z1jr3sm
Thibault Delavallée [Fri, 11 Apr 2014 17:01:14 +0000 (19:01 +0200)]
[FIX] website_forum: deleting a comment is back and works
bzr revid: tde@openerp.com-
20140411170114-po5bgwc2z2qgs8f0
Thibault Delavallée [Fri, 11 Apr 2014 16:44:55 +0000 (18:44 +0200)]
[FIX] website_forum: post edition working again
bzr revid: tde@openerp.com-
20140411164455-2mx3yic1hquu0pil
Thibault Delavallée [Fri, 11 Apr 2014 16:19:16 +0000 (18:19 +0200)]
[FIX] website_forum: convert comment to post is back and works
bzr revid: tde@openerp.com-
20140411161916-rlobfxosniii66m4
Thibault Delavallée [Fri, 11 Apr 2014 16:14:14 +0000 (18:14 +0200)]
[FIX] website_forum: fixe ddemo data, about create_uid warning.
bzr revid: tde@openerp.com-
20140411161414-gqyosw7g73r36fer
Thibault Delavallée [Fri, 11 Apr 2014 16:00:03 +0000 (18:00 +0200)]
[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
Thibault Delavallée [Fri, 11 Apr 2014 15:57:23 +0000 (17:57 +0200)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20140411155723-pqe8ofxh060afiuj
Thibault Delavallée [Fri, 11 Apr 2014 15:56:22 +0000 (17:56 +0200)]
[FIX] website_forum: fixed toggle_correct for setting answers as correct
bzr revid: tde@openerp.com-
20140411155622-18bdyddcs6hdln77
Martin Trigaux [Fri, 11 Apr 2014 15:47:40 +0000 (17:47 +0200)]
[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
Thibault Delavallée [Fri, 11 Apr 2014 15:41:50 +0000 (17:41 +0200)]
[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
Martin Trigaux [Fri, 11 Apr 2014 15:40:02 +0000 (17:40 +0200)]
[MERGE] sync with trunk
bzr revid: mat@openerp.com-
20140411154002-6557tcjfetqwb0kf
Thibault Delavallée [Fri, 11 Apr 2014 15:37:38 +0000 (17:37 +0200)]
[FIX] website_forum: ask a question was hidden by default, we want the reversal
bzr revid: tde@openerp.com-
20140411153738-werwgvte4tzrmu6y
Thibault Delavallée [Fri, 11 Apr 2014 15:37:24 +0000 (17:37 +0200)]
[FIX] website_forum: temporary fix to enable the counter
computation at creation.
bzr revid: tde@openerp.com-
20140411153724-8x7o0o774uf5g2x2
Thibault Delavallée [Fri, 11 Apr 2014 15:23:40 +0000 (17:23 +0200)]
[DEMO] website_forum: better demo dta
bzr revid: tde@openerp.com-
20140411152340-akpg0q2zg5q3xt90
Thibault Delavallée [Fri, 11 Apr 2014 15:23:28 +0000 (17:23 +0200)]
[FIX] website_forum: display forum description as html
bzr revid: tde@openerp.com-
20140411152328-ny4aej5vrlj6qrmv
Martin Trigaux [Fri, 11 Apr 2014 15:19:17 +0000 (17:19 +0200)]
[ADD] gamification: realtime badge to recieve badge without closing the challenge
bzr revid: mat@openerp.com-
20140411151917-21drebbaa1d36jv4
Thibault Delavallée [Fri, 11 Apr 2014 14:59:55 +0000 (16:59 +0200)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20140411145955-91iohb1enc50se5l
Thibault Delavallée [Fri, 11 Apr 2014 14:58:56 +0000 (16:58 +0200)]
[REM] website_forum: remove file not used anymore
bzr revid: tde@openerp.com-
20140411145856-81t6jwbbk7wq2nm1
Thibault Delavallée [Fri, 11 Apr 2014 14:52:10 +0000 (16:52 +0200)]
[REM] website_forum: removed dummy directories
bzr revid: tde@openerp.com-
20140411145210-in1x6uzhsrn4s7c5
Thibault Delavallée [Fri, 11 Apr 2014 14:50:18 +0000 (16:50 +0200)]
[CLEAN] website_forum: removed some licences, only one is sufficient
bzr revid: tde@openerp.com-
20140411145018-16dxhi62bkt4l2dg
Antony Lesuisse [Fri, 11 Apr 2014 14:36:45 +0000 (16:36 +0200)]
[FIX] instrumentation to debug a deadlock probably due to a race condition in
the test cursor
bzr revid: al@openerp.com-
20140411143645-ojb4t9plop4dmizh
Thibault Delavallée [Fri, 11 Apr 2014 14:28:42 +0000 (16:28 +0200)]
[FIX] mail: res_users post: fixed partner_ids computation, could receive
a list of ids, or a list of commands. Both cases should be taken into account.
bzr revid: tde@openerp.com-
20140411142842-kw0x1vrop6x6i5kf
Richard Mathot (OpenERP) [Fri, 11 Apr 2014 14:28:17 +0000 (16:28 +0200)]
[MERGE] Sync with trunk
bzr revid: rim@openerp.com-
20140411142817-svp3hp2qfx1xw25k
Martin Trigaux [Fri, 11 Apr 2014 14:22:57 +0000 (16:22 +0200)]
[REF] gamification: add batch mode, improve some views, remove inprogess_update state (replaced with boolean 'to update')
bzr revid: mat@openerp.com-
20140411142257-zpaul4sq3t5j5r64
Thibault Delavallée [Fri, 11 Apr 2014 14:22:14 +0000 (16:22 +0200)]
[FIX] mail: avoid crashing message_post if the subtype does not exists anymore.
Using xmlid_to_res_id, subtype_id will be False if not found.
bzr revid: tde@openerp.com-
20140411142214-nvvgkduzv51cc2eg
Thibault Delavallée [Fri, 11 Apr 2014 14:15:10 +0000 (16:15 +0200)]
[FIX] gamification: allow having False or 0 values as result of a computation.
bzr revid: tde@openerp.com-
20140411141510-c11djv7qlf9qgek2
Thibault Delavallée [Fri, 11 Apr 2014 14:09:29 +0000 (16:09 +0200)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20140411140929-7w4qo086j991houy
Thibault Delavallée [Fri, 11 Apr 2014 14:08:54 +0000 (16:08 +0200)]
[MERGE] Merge refactoring branch. Still fixing to do.
bzr revid: tde@openerp.com-
20140411140854-bxl6p3d4h4oczkl4
Richard Mathot (OpenERP) [Fri, 11 Apr 2014 13:57:59 +0000 (15:57 +0200)]
[MERGE][IMP] Kanban view: Better display of help message when there are no records, especially when displaying empty columns
bzr revid: rim@openerp.com-
20140411135759-r4fv9g4vucjee6t6
Thibault Delavallée [Fri, 11 Apr 2014 13:40:52 +0000 (15:40 +0200)]
[MERGE] Sync with upstream
bzr revid: tde@openerp.com-
20140411134052-x74otuwuxoz20qab
Thibault Delavallée [Fri, 11 Apr 2014 13:38:13 +0000 (15:38 +0200)]
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-
20140411133813-4rj4de6dlzna5g5s
Cedric Snauwaert [Fri, 11 Apr 2014 13:31:13 +0000 (15:31 +0200)]
[MERGE]change modal windows to only use bootstrap3
bzr revid: csn@openerp.com-
20140411133113-odansac9am8av3fh
Thibault Delavallée [Fri, 11 Apr 2014 13:29:39 +0000 (15:29 +0200)]
[CLEAN] website_forum: cleaning before merging
- cleaned models
- cleaned controllers: lots of cleaning, rewriting, simplfiication + updated in views
- added an override of the contact widget, to be able to display partner-related
stuff about karma and badges
- some css tweaking
- badges cleaning
bzr revid: tde@openerp.com-
20140411132939-bmvyc9bqpqpkk843
Cedric Snauwaert [Fri, 11 Apr 2014 13:29:34 +0000 (15:29 +0200)]
[MERGE]change modal windows to only use bootstrap3
bzr revid: csn@openerp.com-
20140411132934-iodyidypjxb7v9ug
Richard Mathot (OpenERP) [Fri, 11 Apr 2014 13:10:28 +0000 (15:10 +0200)]
[MERGE] Sync with trunk
bzr revid: rim@openerp.com-
20140411131028-fqudb40nz71qhwc6