347985e050
[FIX]tooltip: overwrite bootstrap default for tooltip
...
bzr revid: csn@openerp.com-20140417085954-mirh4eeotsorlyeo
2014-04-17 10:59:54 +02:00
37fab3d03d
[FIX]few errors
...
bzr revid: csn@openerp.com-20140416134655-1e4q8e8i30qj9y7t
2014-04-16 15:46:55 +02:00
20556abc08
[MERGE]clean and refactored tooltip from branch trunk-tipsy-to-boostrap
...
bzr revid: csn@openerp.com-20140416102659-vft9tfuqmax0qx3q
2014-04-16 12:26:59 +02:00
6b020549f8
[FIX]modal windows: when pressing esc key, modal-backdrop was not removed
...
bzr revid: csn@openerp.com-20140414140652-g06gl0mguyhta5px
2014-04-14 16:06:52 +02:00
909db628e5
[REM] removing unused and non clean modules
...
bzr revid: fp@tinyerp.com-20140414134026-ruv2o1vnpxtshnoo
2014-04-14 15:40:26 +02:00
e1cebe9003
[REF] hr_timesheet: unused piece of code
...
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
2014-04-14 15:26:34 +02:00
fe6ef26720
[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore
...
bzr revid: rim@openerp.com-20140414125558-zcwstm1ooa3qecpx
2014-04-14 14:55:58 +02:00
fed6bdcf5e
[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Configuration
...
bzr revid: rim@openerp.com-20140414124251-5u5nu75c9q8g8zi9
2014-04-14 14:42:51 +02:00
1c4b74a7d1
[IMP] translateable event description
...
bzr revid: fp@tinyerp.com-20140414123443-qom78utc45e86lh1
2014-04-14 14:34:43 +02:00
f5ccf4c523
[IMP] Ticket types translateable
...
bzr revid: fp@tinyerp.com-20140414123231-b27qnkaujayk9j84
2014-04-14 14:32:31 +02:00
028b093102
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115604-x1a32wfbxwkn3yhp
2014-04-14 13:56:04 +02:00
91a5db808d
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k
2014-04-14 13:53:54 +02:00
c34ea0a384
[MERGE][IMP] Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093342-91n7m8o730om25qm
2014-04-14 11:33:42 +02:00
6d99b1df52
[MERGE][IMP] invoice/sale: Terminology uniformisation
...
bzr revid: rim@openerp.com-20140414093158-pbtttnv57a7nt7y6
2014-04-14 11:31:58 +02:00
96417099b3
[MERGE] Sync with trunk
...
bzr revid: ypa@tinyerp.com-20140404114223-zalha5tvp2l0ov8f
bzr revid: rim@openerp.com-20140414091137-icatnn1humn7kisc
2014-04-14 11:11:37 +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
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
e69b086ecd
[FIX] logging, pg logging use thread db
...
bzr revid: al@openerp.com-20140412134728-vzn9247twgyfbcid
2014-04-12 15:47:28 +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
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
56d8d0afb6
[FIX] website_forum: ask a question was hidden by default, we want the reversal
...
bzr revid: tde@openerp.com-20140411153738-werwgvte4tzrmu6y
2014-04-11 17:37:38 +02:00
68cb0dca6f
[FIX] website_forum: temporary fix to enable the counter
...
computation at creation.
bzr revid: tde@openerp.com-20140411153724-8x7o0o774uf5g2x2
2014-04-11 17:37:24 +02:00
f3bb1036f6
[DEMO] website_forum: better demo dta
...
bzr revid: tde@openerp.com-20140411152340-akpg0q2zg5q3xt90
2014-04-11 17:23:40 +02:00
e937d106af
[FIX] website_forum: display forum description as html
...
bzr revid: tde@openerp.com-20140411152328-ny4aej5vrlj6qrmv
2014-04-11 17:23:28 +02:00
c67c964d5f
[ADD] gamification: realtime badge to recieve badge without closing the challenge
...
bzr revid: mat@openerp.com-20140411151917-21drebbaa1d36jv4
2014-04-11 17:19:17 +02:00
aa48312b98
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411145955-91iohb1enc50se5l
2014-04-11 16:59:55 +02:00
926cfb33b2
[REM] website_forum: remove file not used anymore
...
bzr revid: tde@openerp.com-20140411145856-81t6jwbbk7wq2nm1
2014-04-11 16:58:56 +02:00
Cedric Snauwaert
Fabien Pinckaers
Richard Mathot (OpenERP)
chm@openerp.com
Raphael Collet
Josse Colpaert
Antony Lesuisse
Thibault Delavallée
Martin Trigaux