Antony Lesuisse
58fb28746a
ir_logging, cleanup and minimize merge diff
...
bzr revid: al@openerp.com-20140316192223-gfxzbo83j5hpm527
2014-03-16 20:22:23 +01:00
Antony Lesuisse
eaacd8a4d8
ir_logging make it work, and make it usable
...
bzr revid: al@openerp.com-20140316191622-l59vkjeu2e8nbh75
2014-03-16 20:16:22 +01:00
Antony Lesuisse
3168c3c1ca
[MERGE] trunk
...
bzr revid: al@openerp.com-20140316183515-fthpvudn1rbmru4q
2014-03-16 19:35:15 +01:00
Antony Lesuisse
e9d047e611
sql loggin cleanups
...
- prepare for netsvc will be renamed to logging
- move back log from http.py has it's used by the cron
- move sql handler to netsvc, simplify to use sql_db
- remove unused handler
- close plaform specific #ifdef pandora's box
bzr revid: al@openerp.com-20140316182933-jkcji9yqfbsokcmg
2014-03-16 19:29:33 +01:00
Antony Lesuisse
ddf66c0621
[FIX] website_mail_group remove demo from manifest
...
bzr revid: al@openerp.com-20140316181851-qn8cuk5lwqec5fts
2014-03-16 19:18:51 +01:00
Antony Lesuisse
af1c00ac3b
[FIX] typo remove import
...
bzr revid: al@openerp.com-20140316173911-e4z89t8bgoxvz6bl
2014-03-16 18:39:11 +01:00
Antony Lesuisse
af216148ca
[REM] separate command to run test, as --test-enable now works
...
bzr revid: al@openerp.com-20140316173406-ow8q7kayp1mw42b6
2014-03-16 18:34:06 +01:00
Antony Lesuisse
c93b466d32
[FIX] website tour, prepare for manual injection
...
- reorder website.js in a choerent way
- remove injectable website.tour.test.js
We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.
bzr revid: al@openerp.com-20140316165442-p82wqwv82559oact
2014-03-16 17:54:42 +01:00
Antony Lesuisse
eac5185731
[IMP] phantom tests
...
- phantomjs more verbose
- revert to dumber console.log relay, dont try to be smart, just display it
- json is only optionally parsed for errors stack dumps
bzr revid: al@openerp.com-20140316160634-hh7br4mbg01xcrpk
2014-03-16 17:06:34 +01:00
Fabien Pinckaers
d6223f2c9d
[IMP] forum
...
bzr revid: fp@tinyerp.com-20140316150931-moklwsh33ls07k0g
2014-03-16 16:09:31 +01:00
Antony Lesuisse
0772c99bcb
[FIX] website test, remove useless test, waitfor banner fix
...
bzr revid: al@openerp.com-20140316144546-agpgmlwxa532xxmb
2014-03-16 15:45:46 +01:00
Antony Lesuisse
e23ce63133
[FIX] website tests crawler, admin password != super admin password
...
bzr revid: al@openerp.com-20140316142302-7xm0sputqgadihs0
2014-03-16 15:23:02 +01:00
Antony Lesuisse
5b21fc0225
[REM] http useless controller
...
bzr revid: al@openerp.com-20140316141311-m0xqh386ax952va1
2014-03-16 15:13:11 +01:00
Antony Lesuisse
5cc7237f63
[REM] useless jsonrpc tests and controllers
...
bzr revid: al@openerp.com-20140316141228-0c35ymruttd5mx2j
2014-03-16 15:12:28 +01:00
Fabien Pinckaers
1b008aa424
[IMP] typo
...
bzr revid: fp@tinyerp.com-20140316125836-zoqm4f62txvev0st
2014-03-16 13:58:36 +01:00
Fabien Pinckaers
316db0b5c8
[IMP] typo
...
bzr revid: fp@tinyerp.com-20140316125722-btl8v409xmwc3rqo
2014-03-16 13:57:22 +01:00
Fabien Pinckaers
f497f319a0
[MERGE] Mailing List Archives for Website
...
bzr revid: fp@tinyerp.com-20140316123800-bqbk34ixeiure75d
2014-03-16 13:38:00 +01:00
Fabien Pinckaers
21cb5da695
[IMP] removed unsed files
...
bzr revid: fp@tinyerp.com-20140316123407-snoyaoybyl45l6xl
2014-03-16 13:34:07 +01:00
Fabien Pinckaers
d143e09ff5
[IMP] Mailing List Fixes
...
bzr revid: fp@tinyerp.com-20140316123220-5hq7e3f6p7fzbr96
2014-03-16 13:32:20 +01:00
Fabien Pinckaers
d5c63e3205
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20140316122101-angijeo5fmr5j8v7
2014-03-16 13:21:01 +01:00
Fabien Pinckaers
675a71b2b8
[IMP] attachments on messages
...
bzr revid: fp@tinyerp.com-20140316113742-odae0ph3a1qrqn12
2014-03-16 12:37:42 +01:00
Fabien Pinckaers
9d9e6007fe
[IMP] Clean CTA
...
bzr revid: fp@tinyerp.com-20140316110240-g9esx75vt2qmxcic
2014-03-16 12:02:40 +01:00
Fabien Pinckaers
018039ebce
[IMP] removing unused directoriess
...
bzr revid: fp@tinyerp.com-20140316104349-oebzg5vsixvhg9fd
2014-03-16 11:43:49 +01:00
Fabien Pinckaers
fb64b578e8
[IMP] Cleaning Archives
...
bzr revid: fp@tinyerp.com-20140316104022-fps64jlo8rpssf9m
2014-03-16 11:40:22 +01:00
948799e259
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
2014-03-16 05:42:24 +00:00
Richard Mathot (OpenERP)
04e2c89c62
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140315102709-3zp27g8lyr3z36d1
2014-03-15 11:27:09 +01:00
b370a4e695
[FIX] website: test tour: must inject tour in page
...
bzr revid: chm@openerp.com-20140314180705-fjx0uetgyug1diaw
2014-03-14 19:07:05 +01:00
d5ddf5152c
[FIX] website: remove backslash from redirect with enable_editor
...
bzr revid: chm@openerp.com-20140314180029-iaeq4i6735pcw100
2014-03-14 19:00:29 +01:00
Thibault Delavallée
48098b5df1
[IMP] mail.compose.message: removed unnecessary code, email_from is already corretly managed
...
bzr revid: tde@openerp.com-20140314174827-nent5v02s2v2y2n0
2014-03-14 18:48:27 +01:00
Thibault Delavallée
95284e1ecf
[CLEAN] mail_mail: lean cleaning
...
bzr revid: tde@openerp.com-20140314174809-t66z5pjxwu1izh6a
2014-03-14 18:48:09 +01:00
Thibault Delavallée
ed116d6b6b
[IMP] mail_message: avoid doing search criterions on subtype_ids, takes long time
...
bzr revid: tde@openerp.com-20140314171658-9zbji55or9dq761p
2014-03-14 18:16:58 +01:00
Thibault Delavallée
4b5b4e86d7
[REM] mail_message: removed dead code: quote context is not planned
...
to be used anymore.
bzr revid: tde@openerp.com-20140314171213-0v3t7c1akbviu99e
2014-03-14 18:12:13 +01:00
Thibault Delavallée
4ef08f78a0
[REM] mail_message: removed dead code
...
bzr revid: tde@openerp.com-20140314171054-859jix3el18i0g53
2014-03-14 18:10:54 +01:00
Kersten Jeremy
7c8e468dee
[FIX] Convert offset aware into offset naive before to use timedelta. That remove traceback when we try to get notification (notif or mail) for a recurrent event
...
bzr revid: jke@openerp.com-20140314165641-6bwyxe3wej4upqzh
2014-03-14 17:56:41 +01:00
Thibault Delavallée
fd85a00311
[MERGE] Merged prototyping branch about improving performances
...
in messaging, especially for mass mailing and mail mail creation. Some things will
probably be discarded or improved further, but this work will serve as a basis
for the whole mass mailing refactorign about speed.
bzr revid: tde@openerp.com-20140314165621-stpmdbq92fbigc3u
2014-03-14 17:56:21 +01:00
Thibault Delavallée
29d3bb15b3
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140314165311-9rwt6tygh4hc1gj4
2014-03-14 17:53:11 +01:00
Thibault Delavallée
08ab922468
[IMP] [REF] mass_mailing: first draft for the saas-4 refactoring.
...
Improved mass mailing form view, that is used as a central point to create new
mailings.
Added concept of contact list (based on partner, or leads (to add)), as well as
contact (a list of name / email to import). Mailings are done un contact list
to simplify the way it works.
Added a kanban view of templates, with a flag to filter only mass mailing templates
(to avoid havign to deal with acknoledgments).
Using campaigns is now an option (a group), mailings can be done without having to
deal with campaigns.
Mailings and campaigns now have a status, used to display their kanban view.
bzr revid: tde@openerp.com-20140314165113-g4gvvifrhr2nfu15
2014-03-14 17:51:13 +01:00
b9ff076c73
[FIX] css: add important in .fa class for FontAwesome font. The font can't be overwrited by themes and custom css without important arguments
...
bzr revid: chm@openerp.com-20140314164244-siih3eo271govt27
2014-03-14 17:42:44 +01:00
d0e2834c2d
[FIX] website: css fixes for themes
...
bzr revid: chm@openerp.com-20140314164028-em7mrfse2dx9doao
2014-03-14 17:40:28 +01:00
b220dc926e
[FIX] website: can't see edit button because css with overflow hidden for all tag. Aplly css only on carousel, paralax and blockquote
...
bzr revid: chm@openerp.com-20140314163639-l086jn568rtti5mv
2014-03-14 17:36:39 +01:00
410ec52276
[MERGE] website: add optional 'action' in managment edit button to laod one specific backend view
...
bzr revid: chm@openerp.com-20140314162909-ff0obqbw6j7lalmz
2014-03-14 17:29:09 +01:00
353bbdc2c3
[FIX] website: route and redirect: remove all backslash from url
...
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
Thibault Delavallée
e6f6960d17
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140314162124-fn8f9ne80skha19h
2014-03-14 17:21:24 +01:00
Martin Trigaux
4bf3a10056
[MERGE] [FIX] stock: add some missing context, courtesy of Lionel Sausin (Numérigraphe)
...
bzr revid: mat@openerp.com-20140314160938-px91g81280qff635
2014-03-14 17:09:38 +01:00
79e1813d6e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
264186541b
[IMP] website: remove css .fa and write important in font fa in web branch
...
bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
2014-03-14 16:04:46 +01:00
Olivier Dony
6a14fddc35
[MERGE] Forward port of saas-2 fixes up to rev 9152 rev-id odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
...
bzr revid: odo@openerp.com-20140314143911-c2mxesg31xezeyr9
2014-03-14 15:39:11 +01:00
8820d9f188
[FIX] website: can't edit baner image. Add contentEditable on image tag.
...
bzr revid: chm@openerp.com-20140314143049-8sp1q32i4x4q76ga
2014-03-14 15:30:49 +01:00
10af6ef168
[rev] website: remove js fix from this branch
...
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
2014-03-14 15:22:44 +01:00
Gery Debongnie
af61fd53bc
[IMP] removes the tooltip when mouse hovers over a 'percentpie' widget (addon web)
...
bzr revid: ged@openerp.com-20140314142155-u8suij5tikxwd0zi
2014-03-14 15:21:55 +01:00
Antony Lesuisse