e4d4c00312
[FIX] gamification: allow having False or 0 values as result of a computation.
...
bzr revid: tde@openerp.com-20140411141510-c11djv7qlf9qgek2
2014-04-11 16:15:10 +02:00
2929f2438a
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411140929-7w4qo086j991houy
2014-04-11 16:09:29 +02:00
6ed34b7219
[MERGE] Merge refactoring branch. Still fixing to do.
...
bzr revid: tde@openerp.com-20140411140854-bxl6p3d4h4oczkl4
2014-04-11 16:08:54 +02:00
f8664c8d97
[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
2014-04-11 15:57:59 +02:00
e51049e8ed
[MERGE] Sync with upstream
...
bzr revid: tde@openerp.com-20140411134052-x74otuwuxoz20qab
2014-04-11 15:40:52 +02:00
d04ee666cc
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140411133813-4rj4de6dlzna5g5s
2014-04-11 15:38:13 +02:00
6b84615627
[MERGE]change modal windows to only use bootstrap3
...
bzr revid: csn@openerp.com-20140411133113-odansac9am8av3fh
2014-04-11 15:31:13 +02:00
cd4afee17e
[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
2014-04-11 15:29:39 +02:00
280caaa95c
[MERGE]change modal windows to only use bootstrap3
...
bzr revid: csn@openerp.com-20140411132934-iodyidypjxb7v9ug
2014-04-11 15:29:34 +02:00
53f71ba3d4
[IMP]imrpove sale_team sequence and depends
2014-04-11 18:59:26 +05:30
fb912d82be
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411131028-fqudb40nz71qhwc6
2014-04-11 15:10:28 +02:00
27738154c3
[MERGE][REM] Remove unused 'Survey' category for modules ('survey' will be now listed under 'Marketing')
...
bzr revid: rim@openerp.com-20140411125709-yrih60a1bcnq1vsx
2014-04-11 14:57:09 +02:00
12e84d59d8
[MERGE][IMP] Large refactoring of "survey" module
...
- surveys are now displayed through website
- new reporting tool
- model refactoring
- usability improvements
(affects also hr_evaluation and hr_recruitment, that use surveys)
bzr revid: rim@openerp.com-20140411124527-cbnd4r2wg38ihnss
2014-04-11 14:45:27 +02:00
23abadb62b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411124318-pgxdmjfidsyny2ob
2014-04-11 14:43:18 +02:00
89d665aa79
[FIX]some cosmetic of code
...
bzr revid: csn@openerp.com-20140411122840-tv1mx2nu5p2is669
2014-04-11 14:28:40 +02:00
c8607c8b81
[FIX]few cosmetic of code
...
bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs
2014-04-11 14:27:53 +02:00
2a8232c25e
[IMP] Typo and add link in layout
...
bzr revid: rim@openerp.com-20140411122620-33rcxanaxhf5qxap
2014-04-11 14:26:20 +02:00
63c2093d2c
[IMP] Larger texts
...
bzr revid: fp@tinyerp.com-20140411122232-s8yipnar4tllspm0
2014-04-11 14:22:32 +02:00
22fff5237b
[FIX] Correct prefill for comment answers
...
bzr revid: rim@openerp.com-20140411121541-pj3m0z44hwd0z89w
2014-04-11 14:15:41 +02:00
f3cd340628
[MERGE] posbox : regression fix, made it easier to add support for new printers
...
bzr revid: fva@openerp.com-20140411121003-dxt1mx57felkufb9
2014-04-11 14:10:03 +02:00
41447050e5
[FIX] Dirty fix: prevent crash in computing data from SCQ/MCQ/matrices by ignoring comments
...
bzr revid: rim@openerp.com-20140411120735-u04occnkchgm3ztc
2014-04-11 14:07:35 +02:00
57c636fb7a
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140411120636-o6yuuzphfiq33b8j
2014-04-11 14:06:36 +02:00
d704fb0060
[IMP] hw_proxy, hw_escpos: it is now possible to add support for new printers from the posbox hardware status page + fix backward compatiblity for hardcoded receipts
...
bzr revid: fva@openerp.com-20140411120510-t3a8b3axq1q4wuje
2014-04-11 14:05:10 +02:00
1e330fdd9e
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140401071103-v3290rmesztf6rjl
bzr revid: rim@openerp.com-20140402073433-y5spv10ms9nnmdim
bzr revid: rim@openerp.com-20140404062949-88d0tqhn8mr4ejnz
bzr revid: rim@openerp.com-20140407141506-e54pr3bwtnts6y3g
bzr revid: rim@openerp.com-20140408140530-fy6u3iz2x75xil9c
bzr revid: rim@openerp.com-20140409193801-ckzgmc5zfjlg4irk
bzr revid: rim@openerp.com-20140410120421-md5ts8wxd33mitnl
bzr revid: rim@openerp.com-20140410152240-t54id35dkowbqi56
bzr revid: rim@openerp.com-20140411115553-cbd8pq1yafkv7qcr
2014-04-11 13:55:53 +02:00
8ce4ac4d94
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411115525-87b9wa1ttwphiwf2
2014-04-11 13:55:25 +02:00
511cf0270c
[MERGE] sale_order_dates: several improvements to usability and planned date computing, courtesy of Lionel Sausin (Numerigraphe)
...
bzr revid: odo@openerp.com-20140411113007-yj4x5zui3luckg2n
2014-04-11 13:30:07 +02:00
410c82bd6a
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20140411094018-zqw3ac1br991qsnp
2014-04-11 11:40:18 +02:00
24e5270347
[IMP] ir_qweb: added country flag management in contact widget
...
bzr revid: tde@openerp.com-20140411091621-q0c2ndzv9xpptzqo
2014-04-11 11:16:21 +02:00
478cbd7c70
[FIX] read_group: avoid shared context and initialise if none
...
bzr revid: mat@openerp.com-20140411075556-kdxn1lsth45twgmj
2014-04-11 09:55:56 +02:00
6da28202f3
[MERGE] merge with latest trunk
2014-04-11 12:36:24 +05:30
0152bea512
[MERGE] [ADD] website_twitter: add twitter scroller snippet
...
bzr revid: odo@openerp.com-20140410174622-j2waid38nk3fqitt
2014-04-10 19:46:22 +02:00
7c75b5e004
[FIX] website: avoid discarding snippet animator after edit + properly restart animation while disabling clicks
...
bzr revid: odo@openerp.com-20140410174314-vecg7inmfgm7r5fq
2014-04-10 19:43:14 +02:00
3a4e264978
[FIX]use bootstrap modal windows. refactor and cleaned from trunk-ui-to-boostrap-modal
...
bzr revid: csn@openerp.com-20140410155022-3cqys3zc55idc4vg
2014-04-10 17:50:22 +02:00
09cd7585e2
[FIX]remove draggable on modal window + clean up
...
bzr revid: csn@openerp.com-20140410154520-h7790rxb8h2hx2zx
2014-04-10 17:45:20 +02:00
8905975fb8
[REM] unused code
...
bzr revid: rim@openerp.com-20140410152112-q91jka9pon4q6lya
2014-04-10 17:21:12 +02:00
049539809d
[FIX]modal strict to bootstrap: no resize and only use 3 size, large-medium-small instead of changing width of modal
...
bzr revid: csn@openerp.com-20140410151940-w0m1ljjqgo0eysgp
2014-04-10 17:19:40 +02:00
1fe3580fc6
[FIX] Correct saving of comments
...
bzr revid: rim@openerp.com-20140410150102-3bq9lz31sebigd9i
2014-04-10 17:01:02 +02:00
b7989fbeec
[FIX] Correct saving of comments
...
bzr revid: rim@openerp.com-20140410145247-o2759q0r022ybp4q
2014-04-10 16:52:47 +02:00
53ad31c18f
[FIX] avoid crash when there is 0 pages for surveys
...
bzr revid: rim@openerp.com-20140410143018-yk0xvelpiuh8bau2
2014-04-10 16:30:18 +02:00
4b776a90c0
[FIX] website_forum: user_id -> create_uid
...
bzr revid: tde@openerp.com-20140410142802-i8kyicrju7wmikem
2014-04-10 16:28:02 +02:00
60f74ff3f4
[MERGE] this commit contains a fix for a crash when the graph view does not have any data (wrong check for 0 data) and a quite good optimization of the javascript code in graph view when loading large tables. (addon graph view)
...
bzr revid: ged@openerp.com-20140410142419-vphlbb2diw21jih3
2014-04-10 16:24:19 +02:00
ea69de5114
[FIX] Dirty fix for links sent by email
...
bzr revid: rim@openerp.com-20140410141352-tb9rwbvawuy2kwc4
2014-04-10 16:13:52 +02:00
a8445aac37
[FIX] gamification: avoid discarding False or 0 given as result for
...
python computation.
bzr revid: tde@openerp.com-20140410141049-luw63buvf0jsvkoh
2014-04-10 16:10:49 +02:00
cbac424f91
[REF] website_forum: renamed models (website.forum -> forum) + cleaned models.
...
Added favorite_count function field, like vote_count and so on, to be able
to have badges based on a simple model.
bzr revid: tde@openerp.com-20140410133928-i0lncz8us9wueb13
2014-04-10 15:39:28 +02:00
7493326daf
[REM] website_forum: removed old badges files
...
bzr revid: tde@openerp.com-20140410133846-0dze10b09b9xhcoi
2014-04-10 15:38:46 +02:00
f7e6f1792f
[IMP] website_forum: first pass of cleaning badges + separated into separate files
...
bzr revid: tde@openerp.com-20140410133812-qa6z3u3oq8q70zdb
2014-04-10 15:38:12 +02:00
e52841aab3
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140410133408-ekglqz9jc4v9nvn7
2014-04-10 15:34:08 +02:00
89a60326da
[FIXes]
...
bzr revid: rim@openerp.com-20140410132146-5a0k2n4y8k5fzxts
2014-04-10 15:21:46 +02:00
458b95eacb
[IMP] imrove yml testcases
2014-04-10 18:47:17 +05:30
e53f66dcea
[IMP] improved typo
...
bzr revid: tpa@tinyerp.com-20140410130925-xrcsb13lp5bnqe3o
2014-04-10 18:39:25 +05:30
Thibault Delavallée
Richard Mathot (OpenERP)
Cedric Snauwaert
Randhir Mayatra rma-openerp
Fabien Pinckaers
Frédéric van der Essen
Olivier Dony
Martin Trigaux
Barad Mahendra
Gery Debongnie
Turkesh Patel (Open ERP)