Commit Graph

278 Commits

Author SHA1 Message Date
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +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
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
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
Thibault Delavallée fe6fd3de09 [REV] Followers widget: Invite people back to Add others of 7.0, because it was cool and clean.
bzr revid: tde@openerp.com-20130515164258-fs6ekiwf06v2x3n9
2013-05-15 18:42:58 +02:00
Thibault Delavallée 0525c965a9 [CLEAN] [REF] mail, hr: cleaned JS/CSS/XML code for suggestion widgets. Those are now 2 widgets extending web.Widget, included inside a Sidebar widget.
bzr revid: tde@openerp.com-20130515103518-2djzogjdtjh0n7rl
2013-05-15 12:35:18 +02:00
Dharmraj Zala (OpenERP Trainee) f764168051 [FIX] line break in 'Follow' column by giving padding to left.
bzr revid: nco@tinyerp.com-20130501121234-u8gtjzccjw0h7dk1
2013-05-01 17:42:34 +05:30
Thibault Delavallée e0ea2dbdcb [IMP] Chatter: first message is truncated after 100 characters, other messages after 300 characters; cleaned code about expan management.
bzr revid: tde@openerp.com-20130425104336-3xvdwgwanrutzinp
2013-04-25 12:43:36 +02:00
Vishmita Jadeja (openerp) 4847ba7997 [Merge]Merge lp:openobject-addons
bzr revid: vja@tinyerp.com-20130418051753-az8hip1buttp1ykk
2013-04-18 10:47:53 +05:30
Martin Trigaux cbeb793c57 [IMP] remove manual subscription and better css
bzr revid: mat@openerp.com-20130417080714-8taku42rc1eanz1q
2013-04-17 10:07:14 +02:00
Martin Trigaux 56a5a3280f [MERGE] Latest trunk
bzr revid: mat@openerp.com-20130417072750-dp6pjn14vy6hitsp
2013-04-17 09:27:50 +02:00
Turkesh Patel (Open ERP) 9ea1b238bf [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130417062640-0b8at1f087grtiu3
2013-04-17 11:56:40 +05:30
Thibault Delavallée 4da68cbc22 [FORWARD] Forward port of addons 7.0 until revision 9008
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Martin Trigaux b9352e9eea [MERGE] Latest trunk
bzr revid: mat@openerp.com-20130405141758-2a0nzmg8cbwe7145
2013-04-05 16:17:58 +02:00
Paramjit Singh Sahota fcb015d277 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130405133030-u1lr42lly3dqvr37
2013-04-05 19:00:30 +05:30
Christophe Matthieu d8b3533a82 [IMP] mail_followers: remove the blue background color on invite button
bzr revid: chm@openerp.com-20130405092352-gg9tyfnztu9ay23j
2013-04-05 11:23:52 +02:00
Quentin (OpenERP) 3bb51ac696 [MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Martin Trigaux 46110fbf29 [ADD] option to globally stop showing group suggestions
bzr revid: mat@openerp.com-20130403151056-4vjno2k9n77drm6y
2013-04-03 17:10:56 +02:00
Thibault Delavallée 35b51a2efd [IMP] Chatter: improved footer of chatter messages: better differentiation of logged a note / send a message / system notification, with or without recipients.
bzr revid: tde@openerp.com-20130403145151-nvpeqdpp937079iu
2013-04-03 16:51:51 +02:00
Martin Trigaux 8d8eb553ce [ADD] suggestions for employees to follow
bzr revid: mat@openerp.com-20130403142716-lmsz9hwkg7tathly
2013-04-03 16:27:16 +02:00
Martin Trigaux 851e6c1f5a [REF] cleaning js code
bzr revid: mat@openerp.com-20130403122408-fbbybeczf6xqwjvc
2013-04-03 14:24:08 +02:00
Martin Trigaux 64dcc8db92 [IMP] CSS tweaks
bzr revid: mat@openerp.com-20130403091244-l3snsoja4t8c41q6
2013-04-03 11:12:44 +02:00
Turkesh Patel (Open ERP) c4ef5d2f6c [IMP] improved css and view
bzr revid: tpa@tinyerp.com-20130329111451-49ouiym81aeh1np4
2013-03-29 16:44:51 +05:30
Martin Trigaux 5a112d8fa2 [ADD] suggested groups
bzr revid: mat@openerp.com-20130328161634-1fcmj0s67bofc6ra
2013-03-28 17:16:34 +01:00
Turkesh Patel (Open ERP) 0f1d7c9e9e [IMP] improved code to fix visibility related issue
bzr revid: tpa@tinyerp.com-20130328070856-ohmghoo3bj1comx9
2013-03-28 12:38:56 +05:30
Paramjit Singh Sahota bd6a436bbb [IMP] Added css for the ' Close(X)' icon of the dialog box when the title size increases than overlap the title.
bzr revid: psa@tinyerp.com-20130322091026-m0eqoqnt1t2p184v
2013-03-22 14:40:26 +05:30
Paramjit Singh Sahota 7d6a58f205 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130319051946-370tjmb1o26e1lfo
2013-03-19 10:49:46 +05:30
Paramjit Singh Sahota d6a8dc2af5 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130318061027-p2w4b4oupcnkdhtb
2013-03-18 11:40:27 +05:30
Thibault Delavallée 4484a3197c [MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
2013-03-15 12:43:38 +01:00
Thibault Delavallée 46101c447b [FIX] mail.css: fixed a forgotten ';'; added a bit of style to invite people button.
bzr revid: tde@openerp.com-20130315110528-oggnd7iwktgag5a1
2013-03-15 12:05:28 +01:00
Christophe Matthieu d80d18ff1b [IMP] mail_followers: fix invite button, hidden subtype if only one
bzr revid: chm@openerp.com-20130313161510-kkis63zaoc3yb6kz
2013-03-13 17:15:10 +01:00