d211ac7798
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130114102410-m60y4kh8o69u00hc
2013-01-14 11:24:10 +01:00
4db73a4c7c
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130108090624-cubi563m34f1j6ab
2013-01-08 10:06:24 +01:00
9db9138056
[FIX] When extracting strings from mako reports we specify a correcter method for string extraction.
...
lp bug: https://launchpad.net/bugs/1096138 fixed
bzr revid: nh@agaplan.eu-20130104171631-p72mjfkfsvm2tdr8
2013-01-04 18:16:31 +01:00
013efb71cb
[MERGE] Forward port of 7.0 until rev. 4767.
...
bzr revid: vmt@openerp.com-20130104093343-xtbw4tphmlupahuv
2013-01-04 10:33:43 +01:00
21c5425d89
[IMP] mail_sanitize: simplification of the regular expression
...
bzr revid: chm@openerp.com-20130102162544-jfwdfqx2ruf0x1q2
2013-01-02 17:25:44 +01:00
a4e7fa97f4
[IMP] mail sanitize: add special email address for escape in the sanitizer
...
bzr revid: chm@openerp.com-20130102090040-yh0vdv8b3mtwoebh
2013-01-02 10:00:40 +01:00
71a92f46e4
[FIX] tools: html_sanitize
...
bzr revid: chm@openerp.com-20121231154451-0guqjid92rfndghp
2012-12-31 16:44:51 +01:00
2e01a395db
[FIX] workers memory limits better help
...
bzr revid: al@openerp.com-20121229132216-zfk4ipw4p6mbgxnj
2012-12-29 14:22:16 +01:00
0eac2ff48e
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20121228122804-c4t1z7x0zy2nyif0
2012-12-28 13:28:04 +01:00
a74d50d220
[IMP] support for lxml <2.3.1
...
bzr revid: fp@tinyerp.com-20121227163324-uloesoeixirmdtka
2012-12-27 17:33:24 +01:00
1c7b1b53d4
[IMP] sanitizer: improved logger message if crashed during sanitize.
...
bzr revid: tde@openerp.com-20121227092614-0ihi5sw5uuyboahk
2012-12-27 10:26:14 +01:00
be5118c704
[DOC] Added some comments. Updated failure message. Added a logging message when not capable of parsing.
...
bzr revid: tde@openerp.com-20121226164354-tjquf1zdyr90tl5e
2012-12-26 17:43:54 +01:00
d7185be38c
[IMP] html_sanitize: now uses the builtin cleaner of lxml.html. We also allows style attribute; the cleaner ensures no javascript or malicious code goes through those attributes. Updated and added tests for the sanitizer, especially about malicious code, and EDI-like html code.
...
bzr revid: tde@openerp.com-20121226162505-8rq060p375z1k9il
2012-12-26 17:25:05 +01:00
f05aff8ac9
[FIX]tools/mail: fix regex when sanitizing html containing mail address
...
bzr revid: csn@openerp.com-20130308104850-02nfuaxdr91bo0nx
2013-03-08 11:48:50 +01:00
527ef066dd
[REVERT] tools.translate: undo rev 4874 refactoring and renaming `trans_parse_view`, was meant for trunk
...
rev 4874 = rev-id xmo@openerp.com-20130306095720-3277aw0rq9pzpsw4
bzr revid: odo@openerp.com-20130307164558-alvl7hcov2uhqxbw
2013-03-07 17:45:58 +01:00
ab2dd715de
[FIX] module loading: allow addons path entries to have substring of others.
...
i.e. having ./addons/ and ./addons2/ is now possible
bzr revid: chm@openerp.com-20130307131104-ju2n7zm7yvced68h
2013-03-07 14:11:04 +01:00
7e7a8b44a9
[IMP] deduplicate trans_parse_view code, rename for clarity
...
also correctly handle all translatable attributes in a <attribute name=...> extension tag
bzr revid: xmo@openerp.com-20130306095720-3277aw0rq9pzpsw4
2013-03-06 10:57:20 +01:00
61eb94fb58
[MERGE] OPW 585261: translations: corrects extraction of translation for placeholders
...
bzr revid: cbi@openerp.com-20130305091225-kkpeb6i8yohce5if
2013-03-05 10:12:25 +01:00
d19777aa1d
[FIX] tools image thumbnailing jpg into png
...
bzr revid: al@openerp.com-20130220222612-g0j6d2a7az0u53hi
2013-02-20 23:26:12 +01:00
c0e0110f42
[translation] : placeholders are missed out for Translation (Case:585261)
...
bzr revid: dhs@tinyerp.com-20130219095601-ncsy6tnfns1xz4ls
2013-02-19 15:26:01 +05:30
01eb26c35a
[translation] : placeholders are missed out for Translation (Case:585261)
...
bzr revid: dhs@tinyerp.com-20130219084856-ab44isuegq7w31wo
2013-02-19 14:18:56 +05:30
db028dc09a
[MERGE] tools mail: Return the initial variable if is false or if is not an instance of basestring. Remove encoding attribute in html tags.
...
bzr revid: chm@openerp.com-20121221083527-py3wr2syz5d8igv8
2012-12-21 09:35:27 +01:00
faa67b8411
[FIX] tools: email regexp was too restrictive
...
bzr revid: fva@openerp.com-20121220160542-hiuu3drh4fa6j8v5
2012-12-20 17:05:42 +01:00
7d5dbda805
[MERGE] apps by chs
...
bzr revid: al@openerp.com-20121220144322-ign0s0u0rbufhedi
2012-12-20 15:43:22 +01:00
355dac7356
[FIX]Kanban view js not loaded when db created through command line
...
bzr revid: dle@openerp.com-20121220101511-679v8e6ijsbaxj0y
2012-12-20 11:15:11 +01:00
565853b732
[MERGE] trunk
...
bzr revid: al@openerp.com-20121219030106-i59u10tml3baqvun
bzr revid: al@openerp.com-20121219150107-8l92w2bi510yem45
2012-12-19 16:01:07 +01:00
111e080e48
[IMP] tools mail: don't remove xml and doctype but remove encoding attribute
...
bzr revid: chm@openerp.com-20121219124038-05bf07960h05x0o8
2012-12-19 13:40:38 +01:00
125f80888e
[FIX] tools mail: return the initial variable if is false or if is not an instance of basestring. remove xml and doctype tags.
...
bzr revid: chm@openerp.com-20121219103714-u52hfmqr5u508xa2
2012-12-19 11:37:14 +01:00
57acd22a00
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
...
bzr revid: rco@openerp.com-20121218085750-h0f50vi54q65ml5c
2012-12-18 09:57:50 +01:00
8f8a4b959c
[REV] image dont generate smaller thumbnail if avoid_if_small, massive speedup on demo
...
bzr revid: al@openerp.com-20121218003356-ldw86lkvpfihhiqn
2012-12-18 01:33:56 +01:00
0c7f17c0ac
merge upstream
...
bzr revid: chs@openerp.com-20121217172614-3z1pstu5th26wuuc
2012-12-17 18:26:14 +01:00
8d1b7ce632
[FIX] Removed too much in openerp.tools.misc: html2text
...
bzr revid: cto@openerp.com-20121217150241-smbswmdmumva29ft
2012-12-17 16:02:41 +01:00
ad8b76de53
[MERGE] From trunk (second time)
...
bzr revid: cto@openerp.com-20121217144753-1rboqdw01h8yrehj
2012-12-17 15:47:53 +01:00
5f0070dcb6
[FIX] Remove unused imports and fix some imports that doesn't use the new namespace
...
bzr revid: cto@openerp.com-20121217143029-e9ki4ftwihq7pdme
2012-12-17 15:30:29 +01:00
3040114651
[MERGE] trunk-style-improvements-xmo (Python stylistic improvement)
...
bzr revid: rco@openerp.com-20121217110150-4ijt04ic17miktq7
2012-12-17 12:01:50 +01:00
50be9a8903
[IMP] logo of company: False or OpenERP logo if demo data
...
bzr revid: fp@tinyerp.com-20121215213219-j7vhocg70mi9jjw6
2012-12-15 22:32:19 +01:00
5fc754b5d3
[MERGE] manually merge customizable web logo, by chs
...
bzr revid: al@openerp.com-20121215192606-9p66tpo1f4344e20
2012-12-15 20:26:06 +01:00
b8008dc7e4
[IMP] better thumbnail generation
...
bzr revid: fp@tinyerp.com-20121215104647-p4xnj04v5hxdz5wb
2012-12-15 11:46:47 +01:00
d02fc09bb9
[IMP] more augmented assignments
...
bzr revid: xmo@openerp.com-20121214134455-c1o7ehlot6vdwioe
2012-12-14 14:44:55 +01:00
d0a377cb1c
[FIX] incorrect docstrings or docstring param names not matching actual param names
...
bzr revid: xmo@openerp.com-20121214130758-a2wp963w4djmb02k
2012-12-14 14:07:58 +01:00
b6ece5d65f
[REM] trailing semicolons
...
bzr revid: xmo@openerp.com-20121214124310-wfdkhmcwxnyqu30m
2012-12-14 13:43:10 +01:00
a34a167037
[FIX] crazy direct calls to dunder methods
...
bzr revid: xmo@openerp.com-20121214124111-xk1wq0xh0gzgx8oh
2012-12-14 13:41:11 +01:00
c6079dd6bb
[REM] unnecessary parens
...
bzr revid: xmo@openerp.com-20121214123803-6xu2s1ndnoyj4i3e
2012-12-14 13:38:03 +01:00
affda60c8e
[FIX] spaceify tabs
...
bzr revid: xmo@openerp.com-20121214122423-j8hla3cf3uir7ypt
2012-12-14 13:24:23 +01:00
80d97e8d17
[REM] duplicate dict keys
...
bzr revid: xmo@openerp.com-20121214121741-lhkqewfw76riqy45
2012-12-14 13:17:41 +01:00
4cb3685f70
[IMP] compare to None by identity
...
bzr revid: xmo@openerp.com-20121214121638-6k5h0ztg94i4f5t6
2012-12-14 13:16:38 +01:00
88eb634fd5
[IMP] tools.image: size can have width or height optional
...
bzr revid: chs@openerp.com-20121211100631-th6jjwnc7b1u957v
2012-12-11 11:06:31 +01:00
236df95b22
merge upstream
...
bzr revid: chs@openerp.com-20121210132406-9ro3amw6s6pzeez4
2012-12-10 14:24:06 +01:00
96f632224f
[IMP] workers document defaults
...
bzr revid: al@openerp.com-20121209225349-k0f9jpg7n0nxc70t
2012-12-09 23:53:49 +01:00
c41d63f300
netrpc flip default, backward compatible for a few days
...
bzr revid: al@openerp.com-20121209185651-7i4vlvul5b3jgnmy
2012-12-09 19:56:51 +01:00
0cfa89dff7
netrpc flip default
...
bzr revid: al@openerp.com-20121209185442-1kgtc0hvds4fpng0
2012-12-09 19:54:42 +01:00
42f292af93
cron cleanup, back to the Kernighan KISS roots 1min poll time, rely only on database, multiprocess/multiserver ready.
...
Nota: If we replace sequence signaling for cache invalidation with pg
listen/notify in the future, we will use the same mechanism for more accurate
cron timing.
bzr revid: al@openerp.com-20121209170447-zs0k3jazokylwvar
2012-12-09 18:04:47 +01:00
d7d1fe562c
[IMP] dbname on localthread for logging
...
bzr revid: al@openerp.com-20121209034910-0iv3mek8860yts3i
2012-12-09 04:49:10 +01:00
a6700e0e3f
[MERGE] multiprocess signaling
...
trying trunk, feature branch fails with Address already in use
bzr revid: al@openerp.com-20121208210954-pi55sib4x7eyamem
2012-12-08 22:09:54 +01:00
3d2a09a973
multiprocessing signaling manually backported from 6.1
...
bzr revid: al@openerp.com-20121208181151-lfy956ysnok5b5hf
2012-12-08 19:11:51 +01:00
393fbe787a
merge upstream
...
bzr revid: chs@openerp.com-20121206101346-y29ofn540ihmbvtt
bzr revid: chs@openerp.com-20121207104259-xy72g0rs6sdqtroz
2012-12-07 11:42:59 +01:00
ec9cf39e86
Merged Latest.
...
bzr revid: tta@openerp.com-20121207101428-lhfadcamzazbb682
2012-12-07 15:14:28 +05:00
36cc0540cb
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20121203135026-d3wri3z1uxwk60z4
bzr revid: nicolas.vanhoren@openerp.com-20121206101800-5ypnpd02iolh2fsd
2012-12-06 11:18:00 +01:00
d65709f68b
[IMP] simplify @profile implementation
...
bzr revid: xmo@openerp.com-20121205160847-8zc8of4grueusbl2
2012-12-05 17:08:47 +01:00
69d057efc5
merge upstream
...
bzr revid: chs@openerp.com-20121201003326-j6n5r8juz16752j5
bzr revid: chs@openerp.com-20121204165557-u1oxocye3la4r6gf
bzr revid: chs@openerp.com-20121205143722-olswf8gsg8mhref3
2012-12-05 15:37:22 +01:00
b624267457
[FIX] translate,orm: remember local Model [_sql]_constraints, and keep only those when exporting translations
...
Previously all _*constraints leaked upstream and
downstream, and were duplicated in all the exported
terms for all modules inheriting from a given model.
bzr revid: odo@openerp.com-20121204082947-tdpiu71ryxzuredb
2012-12-04 09:29:47 +01:00
0a933f44e5
[IMP] small fix in YAML XML import
...
bzr revid: fp@openerp.com-20121201113524-8n94vnpxt3g21b1b
2012-12-01 12:35:24 +01:00
93a28103db
[MERGE] Forward-port of 6.1 bugfixes up to rev. 4307
...
rev.4307 = rev-id launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj
bzr revid: odo@openerp.com-20121130160523-nte65mkgp3y330n6
2012-11-30 17:05:23 +01:00
415dc94a9d
[FIX] test_reports.py: use communicate() to avoid creating zombie processes
...
bzr revid: chs@openerp.com-20121130152937-xcgs9bxrw7vyewex
2012-11-30 16:29:37 +01:00
25bd671e9e
[FIX] osutils: correct nt service check
...
bzr revid: chs@openerp.com-20121130103503-9l3elc3o1dgkovhe
2012-11-30 11:35:03 +01:00
4d91b6a87c
[FIX] osutils: missing import
...
bzr revid: chs@openerp.com-20121129151746-r7t5xgddekvoq23w
2012-11-29 16:17:46 +01:00
cc7bfc23d4
[IMP] Image crop with transparent effect.
...
bzr revid: tta@openerp.com-20121129125148-6j0qryd0wx6uqdbm
2012-11-29 17:51:48 +05:00
a55a26c777
[IMP] rewrite win32/setup.py to generate dynamic files
...
bzr revid: chs@openerp.com-20121128120950-bi6uv3bn73gotmwi
2012-11-28 13:09:50 +01:00
9432574fec
[FIX] restart of server on windows when running as nt service
...
bzr revid: chs@openerp.com-20121126184733-i4blfoh0d57s5s4l
2012-11-26 19:47:33 +01:00
7f5ad72429
[MERGE] Forward-port 6.1 bugfixes up to rev. 4307
...
rev.4307 = rev-id launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj
bzr revid: odo@openerp.com-20121126160320-t2suuik6lhk6wl0x
bzr revid: odo@openerp.com-20121126161836-mv8yymzgbnmif4ve
bzr revid: odo@openerp.com-20121126162023-ejvsapwouyudw6c6
bzr revid: odo@openerp.com-20121126181527-d4yx15372bis77qj
2012-11-26 19:15:27 +01:00
271ac094eb
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20121123102100-6j5nf4mqypsz6u02
bzr revid: nicolas.vanhoren@openerp.com-20121126093747-6w88rmpbnlcsc2ls
2012-11-26 10:37:47 +01:00
0293ce4f64
[FIX] translate: skip XML comments when extracting terms from views
...
bzr revid: odo@openerp.com-20121124025622-mb7t7q7wgb7gu8y6
2012-11-24 03:56:22 +01:00
a23fcfb1e8
[IMP] translate: ignore 0-1 letter terms during terms export + catch and log babel extractor exceptions with filename
...
bzr revid: odo@openerp.com-20121123235130-euhbx6zqs5118472
2012-11-24 00:51:30 +01:00
28062933d0
[FIX] translation export: added missing translation function `_lt` for javascript source files
...
bzr revid: odo@openerp.com-20121123164604-xhs2247xu4oh774q
2012-11-23 17:46:04 +01:00
c3cb554ab0
Improved config
...
bzr revid: nicolas.vanhoren@openerp.com-20121122150601-7wha9rao9ix2myvv
2012-11-22 16:06:01 +01:00
7137bb0b53
[IMP] Added configuration option for gevent
...
bzr revid: nicolas.vanhoren@openerp.com-20121122145309-bim6m10p0q7rf6wj
2012-11-22 15:53:09 +01:00
5bbce53e35
[FIX] tools mail : html_email_clean
...
bzr revid: chm@openerp.com-20121120154217-4ewxir45q1wtjoax
2012-11-20 16:42:17 +01:00
50f09660fb
[FIX] tools mail: html_email_clean return False (standard OpenERP) if the param is False
...
bzr revid: chm@openerp.com-20121120134001-ivw9dqxha2du70o6
2012-11-20 14:40:01 +01:00
e9a1f9f5a7
[FIX] tools mail: html_email_clean return an empty string if the are no value
...
bzr revid: chm@openerp.com-20121119105330-2kud8vp18gp15u9e
2012-11-19 11:53:30 +01:00
23743683ea
[IMP] tools: html_email_clean: a bit more robust.
...
bzr revid: tde@openerp.com-20121114141452-n5jy3yzbmlbd3811
2012-11-14 15:14:52 +01:00
7508a5c724
[CLEAN] html_email_clean: cleaned a bit the code.
...
bzr revid: tde@openerp.com-20121114103817-t19i2sv817jsur41
2012-11-14 11:38:17 +01:00
e2e94513f7
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121114083822-v5zjlspvkhacj4fo
2012-11-14 09:38:22 +01:00
3668f00ad1
[FIX] tools: image: trying to fix the error about converting palette image.
...
bzr revid: tde@openerp.com-20121113143835-1j8t9azqcrskijq7
2012-11-13 15:38:35 +01:00
d36f972f96
[REV] tools: image: reverted changes introduced at rev 4440. The purpose of image_resize is to resize an image, without cropping, without aspect ratio changes. If another image management function is needed, please implement a new one with matching comments and behavior.
...
bzr revid: tde@openerp.com-20121113141752-1rbsais66ooi89jp
2012-11-13 15:17:52 +01:00
62c419e66f
[IMP] tools: mail: improved append_content_to_html, including plaintext2html. Updated tests.
...
bzr revid: tde@openerp.com-20121109123521-e04g4zrhtv947l1r
2012-11-09 13:35:21 +01:00
e6a9084677
[IMP] tools: added text2html function, basically turning plaintext into html. Added a test for this function. Updated signature for demo data.
...
bzr revid: tde@openerp.com-20121107164117-2caoqna2aclzowpk
2012-11-07 17:41:17 +01:00
b36547e3ef
[CLEAN] tools: mail: removed commented code; moved some code.
...
bzr revid: tde@openerp.com-20121107154129-nhz7qjv1ksq521ur
2012-11-07 16:41:29 +01:00
688b6babed
[FIX] tools: html_email_clean: remove blockquote in any node, not just firs childs of root.
...
bzr revid: tde@openerp.com-20121107105031-xf0u71q3chx0chnv
2012-11-07 11:50:31 +01:00
4d89845de6
[IMP] tools: tests: cleaner: cleaned a bit test data. Will have to be improved.
...
bzr revid: tde@openerp.com-20121107093201-s0pco15msilt4erz
2012-11-07 10:32:01 +01:00
3ba739cbf5
[IMP] tools: mail: improved basic html_email_clean.
...
bzr revid: tde@openerp.com-20121107085807-td2okmbr61pm4g1e
2012-11-07 09:58:07 +01:00
a80fab6303
[FIX] tools: mail: use beautifulsoup parser, if not present, html parser.
...
bzr revid: tde@openerp.com-20121106133751-ds0g2c7k8pu4d6rl
2012-11-06 14:37:51 +01:00
f2d53fd215
[FIX] tools: mail: fixed some import, cleaned some code.
...
bzr revid: tde@openerp.com-20121106124109-63svzi72lx2a13yq
2012-11-06 13:41:09 +01:00
c596792bc2
[FIX] tools: re-added html2text import, because of its use in ir_mail_server. Not sure it belongs here.
...
bzr revid: tde@openerp.com-20121106123407-2s4ya7ln7detui6y
2012-11-06 13:34:07 +01:00
1d52a68dd9
[IMP] tools: mail: added html_cleaner, to clean html code to display in chatter (remove quotes, signatures, ...).
...
bzr revid: tde@openerp.com-20121106121737-ej57bijc7ypksu8v
2012-11-06 13:17:37 +01:00
5f53f5253b
[FIX] tools: some import cleaning and fixing.
...
bzr revid: tde@openerp.com-20121106115851-5f5sfhtp2g3qrm1o
2012-11-06 12:58:51 +01:00
da6ad1e27c
[REF] tools: moved email and mail related functions from misc to mail.
...
bzr revid: tde@openerp.com-20121106115744-pcxgyqv3lf8zfedw
2012-11-06 12:57:44 +01:00
207675a174
[REN] html_sanitize -> mail, to have a central file for methods about mail (html sanitizing, html management, emails related functions, ...).
...
bzr revid: tde@openerp.com-20121106115420-1h8mvzohol9zjysa
2012-11-06 12:54:20 +01:00
7d1c5ac4ff
[FIX] yaml_import: why the hell is False not iterable.
...
bzr revid: vmt@openerp.com-20121031164512-qegyw1q865neivgt
2012-10-31 17:45:12 +01:00
e44f673e61
[FIX] tools.yaml_import: change w.r.t. etree FutureWarning, which was:
...
FutureWarning: The behavior of this method will change in future versions. Use
specific 'len(elem)' or 'elem is not None' test instead.
bzr revid: vmt@openerp.com-20121031161437-pzz2czkaq6rw5t31
2012-10-31 17:14:37 +01:00
55f8e0485b
[IMP] yaml_import: allow to use a view from another module when creating a record in yaml by prefixing it with <module_name> + '.' (e.g: account.supplier_invoice_form_view). A great patch from odony. Hooray
...
bzr revid: qdp-launchpad@openerp.com-20121030152824-0n2gazacag2hzkbj
2012-10-30 16:28:24 +01:00
niv-openerp
Niels Huylebroeck
Vo Minh Thu
Christophe Matthieu
Antony Lesuisse
Frédéric van der Essen
Fabien Pinckaers
Thibault Delavallée
Cedric Snauwaert
Olivier Dony
Christophe Simonis
Xavier Morel
Chris Biersbach
Dhruti Shastri
dle@openerp.com
Raphael Collet
Cecile Tonglet
Tejas Tank
Fabien Pinckaers