Commit Graph

349 Commits

Author SHA1 Message Date
Thibault Delavallée 28317e8003 [FIX] mail: chatter: display blockquotes with normal font size (appearing for example when replying through thunderbird). 2014-08-29 13:08:10 +02:00
Thibault Delavallée e8eabf7708 [FIX] mail: bad display of join button on mail groups. 2014-08-01 13:29:55 +02:00
Olivier Dony 34bfa1b44f [MERGE] Forward-port saas-5 up to d9cda97 2014-07-05 01:45:45 +02:00
Olivier Dony 5ceded9d69 [MERGE] Forward-port saas-3 up to 4fa30f5 2014-07-05 01:04:19 +02:00
rba-odoo c6d8eaabf5 [IMP]kanban View: harmonize kanban view by changing head as bold and centered and aliases as centered 2014-07-02 14:52:29 +02:00
Thibault Delavallée 581341ce3f [FIX] mail: fixed display issue with the like button 2014-07-02 10:25:53 +02:00
Simon Lejeune 195fa93168 [MERGE] backend front end integration
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
Cedric Snauwaert 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
Thibault Delavallée 7a1221c9f3 [MERGE] [IMP] mail: followers widget: Follow button + subtypes are now displayed
like a button + a dropdown selection for subtypes, reducing the place this widget
takes in the form view.

bzr revid: tde@openerp.com-20140409074712-pn3nqpga1mxaa3ie
2014-04-09 09:47:12 +02:00
Fabien Pinckaers 0b539587b8 [IMP] kanban view for ir.attachments
bzr revid: fp@tinyerp.com-20140401164322-fq3r0pt6idkoobxx
2014-04-01 18:43:22 +02:00
Darshan Kalola (OpenERP) 068c1be14c [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140224101844-2k8p1j86ngybtvw4
2014-02-24 15:48:44 +05:30
Thibault Delavallée fc7f21e4bf [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140221102322-oi7wa2sc3867g81d
2014-02-21 11:23:22 +01:00
Darshan Kalola (OpenERP) b69271064b [MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140221045744-hopnxp3mj9z7vz0j
2014-02-21 10:27:44 +05:30
Darshan Kalola (OpenERP) 7c1f4fb619 [IMP]convert subtypes list into selection.
bzr revid: dka@tinyerp.com-20140220102958-l2uwymwtnzcxnetw
2014-02-20 15:59:58 +05:30
Darshan Kalola (OpenERP) 1f71463cfc [IMP] extract subtype ordering from lp:~openerp-dev/openobject-addons/trunk-visibility-hr_holidays-darshan.
bzr revid: dka@tinyerp.com-20140219105246-qmm78w81erhfvhlc
2014-02-19 16:22:46 +05:30
Olivier Dony 76d89c0477 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9133 dle@openerp.com-20140214131810-9abebxpfeoga1crn
bzr revid: odo@openerp.com-20140217091203-kmeg4qsn2qyvll23
2014-02-17 10:12:03 +01:00
Denis Ledoux 0ef17beed0 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9846 revid:dle@openerp.com-20140217124044-o8sgz1esfqeha01f
bzr revid: dle@openerp.com-20140214100922-m6rf7c6x85nv67sl
bzr revid: dle@openerp.com-20140214114713-oab4kbearvv7g3nh
bzr revid: dle@openerp.com-20140214131810-9abebxpfeoga1crn
bzr revid: dle@openerp.com-20140217124230-ov201kfep88f5tn7
2014-02-17 13:42:30 +01:00
Denis Ledoux 677c972e85 [FIX] mail: word wrapping in pre tags (for mails without html in chatter)
bzr revid: dle@openerp.com-20140214131705-efs3bggixyjalxun
2014-02-14 14:17:05 +01:00
Thibault Delavallée 751eb333bc [MERGE] [FIX] mail: fixed group button position that was too much dependent of the group description length
[IMP] project: removed unnecessary code in project to try to be able to move kanban records in a folded column (was not working + generic solution coming)

bzr revid: tde@openerp.com-20131219135206-nv8i13wjugix84r3
2013-12-19 14:52:06 +01:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
Denis Ledoux 7f00274384 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
Christophe Simonis 1734cea7d6 [MERGE] annoucement bar
bzr revid: chs@openerp.com-20131210181038-lzeg6v4n9qdup9tp
2013-12-10 19:10:38 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Christophe Simonis eba79e46a5 [FIX] mail: correct announcement bar
bzr revid: chs@openerp.com-20131202114516-u0u44l3xbkk1zcbx
2013-12-02 12:45:16 +01:00
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +01:00
Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
ima-openerp 88a79fdaf3 [IMP]improved css for survey kanban, file attach button and my current timesheet in hr.
bzr revid: ima@tinyerp.com-20131115101317-3jb422klc3jgdwps
2013-11-15 15:43:17 +05:30
ima-openerp 1098f7021e [IMP]improved css for sales team kanban, sale order payment_acquirers and attach file button.
bzr revid: ima@tinyerp.com-20131114120529-5ltoe9aoglsx92vv
2013-11-14 17:35:29 +05:30
ajay javiya (OpenERP) d9cf77b80d [IMP]: change internal notes color light light gray
bzr revid: aja@tinyerp.com-20130927100513-dj1y3qyqk7tqf57d
2013-09-27 15:35:13 +05:30
ajay javiya (OpenERP) c841fd0ca3 [IMP]:color of notes , and notes restrict to group hr/employee
bzr revid: aja@tinyerp.com-20130919133829-bthuzij8g78v72cv
2013-09-19 19:08:29 +05:30
Vidhin Mehta ef0b4d0202 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130903051341-cqnxom7mo4dk9zvf
bzr revid: vme@tinyerp.com-20130905053153-5wjz9girs41pupfi
2013-09-05 11:01:53 +05:30
Vidhin Mehta 75ddd5ccbe [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
2013-08-23 10:36:02 +05:30
Atul Patel (OpenERP) 1a382f268c [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130812043810-y14dmqwvuxrxkuag
2013-08-12 10:08:10 +05:30
Thibault Delavallée 079ea21883 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130808083451-plvcks1kwjhh2vzi
2013-08-08 10:34:51 +02:00
Atul Patel (OpenERP) ac9e08f481 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130725073521-nbuthhc3l0a3y2zi
2013-07-25 13:05:21 +05:30
Thibault Delavallée 68d1c2928f [CLEAN] Cleaning befor merging
No need to use an image for edition -> use webtypo font instead
Small code cleaning in js / python

bzr revid: tde@openerp.com-20130723095509-knp45uvmlfmr27v9
2013-07-23 11:55:09 +02:00
Thibault Delavallée 32d0f6bce0 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130717074710-2jz58nqwe7hnyyij
2013-07-17 09:47:10 +02:00
Priket Trivedi (OpenERP Trainee) e2155ae540 [IMP] mail in add class to set margin and change pixel for filed
bzr revid: trivedi.pariket@gmail.com-20130716085231-8qe107fvcm6rwmj4
2013-07-16 14:22:31 +05:30
Paramjit Singh Sahota 74bbd696f7 [MERGE] Sync with lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130626065359-z17dk91q9c0rgfaw
2013-06-26 12:23:59 +05:30
Paramjit Singh Sahota 4180da8a40 [IMP] Improved code and removed unwanted code.
bzr revid: psa@tinyerp.com-20130620050026-3kwfmowqfa9f4quz
2013-06-20 10:30:26 +05:30
Paramjit Singh Sahota ae8302a3d6 [IMP] Now the edit_subtype pencil will be visible when the cursor goes on to the follower_list.
And made the edit_subtype icon visible without debug mode.

bzr revid: psa@tinyerp.com-20130619134817-n390r4dsgmpo33nb
2013-06-19 19:18:17 +05:30
Paramjit Singh Sahota 01fcf4686e [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130612130222-ro7iun4a23qqjefj
2013-06-12 18:32:22 +05:30
Thibault Delavallée fc44f25d3a [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130612123429-a4mp0wiicdhlvk0m
2013-06-12 14:34:29 +02:00
Jignesh Rathod (OpenERP) 42f27a1527 Merge with latest code.
bzr revid: jir@tinyerp.com-20130607054638-61sdf0oip5kk20eg
2013-06-07 11:16:38 +05:30
Thibault Delavallée 5601fbd78c [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130606135313-u3mbe1a8yeussnck
2013-06-06 15:53:13 +02:00
Paramjit Singh Sahota 1c7ce4aa37 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130522064934-9ief76qy3lynwqt9
bzr revid: psa@tinyerp.com-20130527131734-mnqn4fir6b3pzogt
2013-05-27 18:47:34 +05:30
Thibault Delavallée 3f5c738084 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130522110325-hos9ocph7yo9ae7w
bzr revid: tde@openerp.com-20130522143206-uv1f6lj6xsenzj6u
2013-05-22 16:32:06 +02:00
Thibault Delavallée c4a019bbfd [CLEAN] mail: added CSS from web to mail module.
bzr revid: tde@openerp.com-20130522105434-nqmao3fyxy8on1rl
2013-05-22 12:54:34 +02:00
Thibault Delavallée 0d01d958fa [MERGE] [FORWARD] Forward port of saas-1 branch until revision 8711 (that includes forward-port of 7.0 until 9143)
Revision ID: tde@openerp.com-20130521152657-v48pj2m0692rw9b5

bzr revid: tde@openerp.com-20130522102605-bbc5vrfhfro4ab90
2013-05-22 12:26:05 +02:00
Vidhin Mehta f7bb48d3b1 [IMP] show button bottom of card.
bzr revid: vme@tinyerp.com-20130517093222-r62lgqhgx3xnryd9
2013-05-17 15:02:22 +05:30