Commit Graph

347 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
Olivier Dony b4976938d2 [MERGE] [I18N] Many translation bugfixes + resync of translation templates with latest source
lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130607194733-27oiskc6q4fnp476
2013-06-07 21:47:33 +02:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
Launchpad Translations on behalf of openerp b8046b6d8e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130607070228-7pj30eek2orow71g
2013-06-07 07:02:28 +00:00
Mohammed Shekha 84b2404cd2 [FIX]Fixed the issue of pad when there is no internet connection, it throws traceback instead of user freindly message.
bzr revid: msh@openerp.com-20130529065012-8eaklgttdkhbg6mt
2013-05-29 12:20:12 +05:30
Thibault Delavallée a05b0bebbe [FORWARD] Forward port of 7.0 branch until revision 9143.
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Martin Trigaux c8c298c83c [IMP] clean permissions and shebang in files
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
2013-05-14 12:31:13 +02:00
Olivier Dony 9c08e12962 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld

bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
niv-openerp 616f705ef9 [FIX] pad: display problem due to wrong css selectors
bzr revid: nicolas.vanhoren@openerp.com-20130424075406-eemkxc7eyyvgiywi
2013-04-24 09:54:06 +02:00
niv-openerp e6902869ed [FIX] pad: regression that caused a stack trace
bzr revid: nicolas.vanhoren@openerp.com-20130424074638-aq3o08v7z9j1asz0
2013-04-24 09:46:38 +02:00
Launchpad Translations on behalf of openerp 6b04a532b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423060902-2j8xouki50aemi14
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061017-5os2p9ztugb6jjph
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061019-n2660taj1o9os75c
2013-04-23 06:10:19 +00:00
Quentin (OpenERP) 33f27b362b [MERGE] forward port of addons v7 up to revision 9045
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
niv-openerp 1f2064cb93 [FIX] pad: revert part of previous fix because it could produce problems in some cases
bzr revid: nicolas.vanhoren@openerp.com-20130419144238-0hq1rgmcacw5sw1r
2013-04-19 16:42:38 +02:00
niv-openerp ea2544e432 [FIX] pad: problem about pad title not being updated correctly, was solved by solving another, more serious, bug that didn't updated correctly the database backup of the pad
lp bug: https://launchpad.net/bugs/1155039 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130419143529-jku5titoacaajft0
2013-04-19 16:35:29 +02:00
Raphael Collet 96ad608854 [IMP] general: use registry[X] instead registry.get(X) when X is dynamic
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
2013-03-29 15:37:20 +01:00
Launchpad Translations on behalf of openerp 7a8d71be6d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
2013-03-28 06:05:00 +00:00
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
Launchpad Translations on behalf of openerp b46c9dae1b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302045718-19m5dowwcweyf3fy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303050056-i10g2vgmvxm9l392
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305050744-svuruvv63292prwx
2013-03-05 05:07:44 +00:00
Launchpad Translations on behalf of openerp 6e22d502b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130210044934-z1bbgxucqmho88yy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130211051101-oqbt39y8nlf4mz0p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130212044352-69l303nui500furz
2013-02-12 04:43:52 +00:00
Quentin (OpenERP) 552583b9d8 [MERGE] merged v7 branch
bzr revid: qdp-launchpad@openerp.com-20130205155556-b4zw4y3gr9v2eom3
2013-02-05 16:55:56 +01:00
Launchpad Translations on behalf of openerp 7a49719d46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +00:00
Thibault Delavallée fb3dd0ebc2 [MERGE] Forward porting of the 7.0 addons branch inside trunk until rev 8561.
bzr revid: tde@openerp.com-20130110125129-9g99h3heldcnspfh
2013-01-10 13:51:29 +01:00
Frédéric van der Essen e40eeedf3e [IMP] css: made the styling of the note's content constistant with the styling of the etherpad editor
bzr revid: fva@openerp.com-20130108172057-8xmwdhfg3izkqbdf
2013-01-08 18:20:57 +01:00
Launchpad Translations on behalf of openerp 738f2b44a7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104052810-1hc0kz14e6ev38ly
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104052815-90n20ge4a6x22t2o
2013-01-04 05:28:15 +00:00
Launchpad Translations on behalf of openerp 7212971359 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222062604-dkriii8eozvsup5y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044904-96hdn6ba6yrv4f9j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226044702-qvjpmsxaacy1cg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050621-bg925wq3m04p2g71
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050125-ezgc0pyinpf7cjpa
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044027-9ufahl14z8fnhu6p
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044603-wg53ihk00q2059zn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044748-vijpm6xa5a4wkx8s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044725-gnjicg5umjgca6x4
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227052240-6m8i7kropwavbcnh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121228051144-leldhj31i0soxbew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121229050213-cxzd31aqqltp6q2x
bzr revid: launchpad_translations_on_behalf_of_openerp-20121230052006-x87nblyyoe179wg8
bzr revid: launchpad_translations_on_behalf_of_openerp-20121231044049-m31tcl22nog279qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130101044622-7p5h1mf14m4tlue5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130102043722-j7bk1uojgtgsz7u1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130103044815-xswvowa7jeizv4jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130104044801-0v8fmmv0jl7itv9b
2013-01-04 04:48:01 +00:00
Quentin (OpenERP) 399386ead1 [FIX] pad: don't throw a traceback if the pad server isn't set on the company (Returned value of pad_generate_url() is a dict not a string).
bzr revid: qdp-launchpad@openerp.com-20130117174027-ryt95jzs06cuabn2
2013-01-17 18:40:27 +01:00
Launchpad Translations on behalf of openerp 5c360f7327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225044840-forvhhdzu8wfuw2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226043938-300zdp9oob5hc6e6
2012-12-26 04:39:38 +00:00
Launchpad Translations on behalf of openerp f49cf3ad50 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
2012-12-24 05:10:43 +00:00
Launchpad Translations on behalf of openerp 94afe1ccef Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
2012-12-24 04:40:35 +00:00
Olivier Dony 3815d22432 [I18N] Update translation templates for latest changes - ready for 7.0 release
bzr revid: odo@openerp.com-20121221172005-uuwfq58gslzikygl
2012-12-21 18:20:05 +01:00
Christophe Matthieu 558fcc4471 [MERGE] FIX etherpad:When: a user access to the edit mode from a kanban view or list view, etherpad is dipslay on readonly mode but with the oe_editing class.
bzr revid: chm@openerp.com-20121221134227-1nbb922oz37ibjw5
2012-12-21 14:42:27 +01:00
Launchpad Translations on behalf of openerp 9485c49f4f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316063604-hv8xtn4g8e76no72
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317053030-q0f5iyfhv4qtah18
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318052217-ua2ev323qlvhi8l2
2013-03-18 05:22:17 +00:00
Launchpad Translations on behalf of openerp c5319f47f7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053740-hrhdafa05mp0s6cd
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051349-azaf8kb3hdi6ux85
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054204-8yc0hga0v6pkk36x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053843-8x3181swnc2x0rim
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051523-z6034cfpv1qbztzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054303-38ti3nq1h5jfbasa
bzr revid: launchpad_translations_on_behalf_of_openerp-20130309053849-8eqsc9sjxknzfha8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130310051527-tajzx0x6p7mzpg43
bzr revid: launchpad_translations_on_behalf_of_openerp-20130311054307-qgl6ao1a06b9an3a
2013-03-11 05:43:07 +00:00
Launchpad Translations on behalf of openerp cc87ba5db7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308052354-6aerviht20qnfh26
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060553-lujyj3qxhqljssu0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060749-69tgopwkctb0v5ei
2013-03-08 06:07:49 +00:00
Olivier Dony 1e5a3aa787 [I18N] *: update translation templates for latest term changes due to bug fixes
bzr revid: odo@openerp.com-20130307121934-jfwfl1q0jtvswe0c
2013-03-07 13:19:34 +01:00
Launchpad Translations on behalf of openerp 420f82ec0e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053802-13krr4lhrwrebwak
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053905-y30zk4dbbcc3qj4b
2013-03-05 05:39:05 +00:00
Launchpad Translations on behalf of openerp 03ad9f7290 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302052257-0w9v71dump44rtov
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303052333-9kn24ocknaagn33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130304055956-54bietn1iazrisga
2013-03-04 05:59:56 +00:00
Launchpad Translations on behalf of openerp 4a34c70ca8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130226053405-w5a9rp5orqi89z9h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130226053445-52kd76xxoxx5x7tt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130226053448-joq378fpfc2p1rwv
2013-02-26 05:34:48 +00:00
Launchpad Translations on behalf of openerp b8b09df454 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130210052327-7e1n1tzylg1288th
bzr revid: launchpad_translations_on_behalf_of_openerp-20130211053447-ptlkuaf14fy7vmdq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130209052939-jxwnthiw4qgjic5w
bzr revid: launchpad_translations_on_behalf_of_openerp-20130210052433-emt7s1kxk78bpbe3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130211053534-5pgh95oxsd26bdqv
2013-02-11 05:35:34 +00:00
Launchpad Translations on behalf of openerp b64db1c007 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054227-fy00xo21liqcoqz8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054231-c558abx56zwr0mg2
2013-02-07 05:42:31 +00:00
Launchpad Translations on behalf of openerp 2315050bab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220044654-aygk0cmaxl26bs0f
bzr revid: launchpad_translations_on_behalf_of_openerp-20121220045947-8j22pe4nm62kzq22
2012-12-20 04:59:47 +00:00
Launchpad Translations on behalf of openerp 56248183fc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
2012-12-19 05:22:38 +00:00
Raphael Collet 73980eba5f [MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
Launchpad Translations on behalf of openerp b2bb3eafbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Fabien Pinckaers b0cb3ed3fe [IMP] small css fixes
bzr revid: fp@tinyerp.com-20121215125849-0gtgfjpmnnwdkjrb
2012-12-15 13:58:49 +01:00
Fabien Pinckaers bdc7dcd539 [IMP] CSS of etherpad
bzr revid: fp@tinyerp.com-20121215110758-3ahwmk20uh5kt6g7
2012-12-15 12:07:58 +01:00
Christophe Matthieu d010441fe3 [IMP] pad: remove attributes for super
bzr revid: chm@openerp.com-20121213145855-0aq9wqtovyrxzxkw
2012-12-13 15:58:55 +01:00
Christophe Matthieu 23b6b96fbc [IMP] pad: add abord for $.get request
bzr revid: chm@openerp.com-20121213145714-b9d4f2u8iqdg8r1m
2012-12-13 15:57:14 +01:00
Christophe Matthieu 265b6d67df [MERGE] from trunk
bzr revid: chm@openerp.com-20121213141115-cxfplrgbo7dyhuf9
2012-12-13 15:11:15 +01:00
Launchpad Translations on behalf of openerp d6ea61789f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213044507-t1hpxi43gks88w2e
bzr revid: launchpad_translations_on_behalf_of_openerp-20121213050131-3r9t674ehhnkneky
2012-12-13 05:01:31 +00:00
Launchpad Translations on behalf of openerp 2e7f68e09f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212043903-maiyd94p4ifgdqew
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212044145-k216g0bcavdlf2o3
bzr revid: launchpad_translations_on_behalf_of_openerp-20121212045414-tgg69aaw4dz72b0p
2012-12-12 04:54:14 +00:00
Launchpad Translations on behalf of openerp cc69fe1b25 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
Vo Minh Thu 6072fd11af [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Fabien Pinckaers 85b0acf700 [IMP] typo
bzr revid: fp@tinyerp.com-20121208143135-djb4umfk5o6jiib4
2012-12-08 15:31:35 +01:00
Launchpad Translations on behalf of openerp c09b9cb5f9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207043623-mrfjgzunwq1dlmmh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207044755-avo3gbucdjj6i0ms
2012-12-07 04:47:55 +00:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Launchpad Translations on behalf of openerp 683f31e51b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Christophe Matthieu ffe7fd9bcc [FIX] etherpad: When a user access to the edit mode from a kanban view or list view, etherpad is dipslay on readonly mode but with the oe_editing class. Why: The deferer for read only arrive after the display of edit mode. Fix: check in the deferer if the etherpad is already in readonly mode.
bzr revid: chm@openerp.com-20121203085116-jn83em3pd5le28rp
2012-12-03 09:51:16 +01:00
Randhir Mayatra (OpenERP) 4f0d88eae7 [IMP] improve the code
bzr revid: rma@tinyerp.com-20121129053112-fiq8k4w56crv3q4x
2012-11-29 11:01:12 +05:30
Launchpad Translations on behalf of openerp 4b464deeee Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051532-an3wp6f216pkzxiz
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129052158-2gjacp96ppgmvr5t
2012-11-29 05:21:58 +00:00
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
Launchpad Translations on behalf of openerp 117bf937b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
Olivier Dony 771b216118 [I18N] Update translation templates in preparation for 7.0 release
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
niv-openerp 6bc1e836a7 [FIX] pad: very bad conception that produced html injection that produced a lot of incorrect css
bzr revid: nicolas.vanhoren@openerp.com-20121120155155-y1wd0px4trljf453
2012-11-20 16:51:55 +01:00
Thibault Delavallée d4df1e1998 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121108164753-mso6bdwoc0ihn7sk
bzr revid: tde@openerp.com-20121109094444-5vw7aojazupnudy6
2012-11-09 10:44:44 +01:00
Fabien Pinckaers 0c1bcadd23 [FIX] pad
bzr revid: fp@openerp.com-20121109081428-ha5sxo0wez8x3quh
2012-11-09 09:14:28 +01:00
Tejas Tank 8be63a0043 [FIX] Corrected etherpad rending issue.
bzr revid: tta@openerp.com-20121109065144-hut93odny1ur16db
2012-11-09 12:21:44 +05:30
Tejas Tank 71d81fff4d [IMP] Set api key in demo file and remove key from pad.py
bzr revid: tta@openerp.com-20121109063002-ej4bmzzxut5j12e7
2012-11-09 12:00:02 +05:30
Thibault Delavallée f00ae8a73b [FIX] Addons: fixed some import due to renaming.
bzr revid: tde@openerp.com-20121106123442-jqiq5myhal6ouodr
2012-11-06 13:34:42 +01:00
Fabien Meghazi 22ad7a70f7 [MERGE] trunk
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
Divyesh Makwana (Open ERP) 7873e7b2d3 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121031045834-wczrlhk4ro3ag5np
bzr revid: mdi@tinyerp.com-20121101042448-1hymng6jidkfynbf
bzr revid: mdi@tinyerp.com-20121102043710-vq1f08mni1wuoj4m
2012-11-02 10:07:10 +05:30
Fabien Meghazi a2715888c1 [IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'
bzr revid: fme@openerp.com-20121031103148-r1slfpl2kcnajjd3
2012-10-31 11:31:48 +01:00
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Divyesh Makwana (Open ERP) d3466a9624 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121030044702-as91g4l1lr89d8x1
2012-10-30 10:17:02 +05:30
Mayur Maheshwari (OpenERP) faa216451a [IMP]pad : fix pad issue
bzr revid: mma@tinyerp.com-20121029132527-bqw1y2hzikncxrpy
2012-10-29 18:55:27 +05:30
Mayur Maheshwari (OpenERP) fa6b3067a8 [IMP]pad : fix the pad issue
bzr revid: mma@tinyerp.com-20121029131938-0k92cijgqorcnjnh
2012-10-29 18:49:38 +05:30
Ajay Chauhan (OpenERP) 4229bb14f8 [IMP] pad: revert my change
bzr revid: cha@tinyerp.com-20121029062723-b0om6b3a5b35gh0z
2012-10-29 11:57:23 +05:30
Ajay Chauhan (OpenERP) 435a1bd673 [FIX] pad: solved the issue of getting traceback on duplication of task
bzr revid: cha@tinyerp.com-20121025125037-kulp10g5kx5m1d0f
2012-10-25 18:20:37 +05:30
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
niv-openerp 802eda5ad7 Ported field pad
bzr revid: nicolas.vanhoren@openerp.com-20121012121126-atu1vf14rc4fxu0g
2012-10-12 14:11:26 +02:00
Frédéric van der Essen 1322cd1a3d [MERGE] from trunk
bzr revid: fva@openerp.com-20120927132942-853bb3uptrp1x55d
2012-09-27 15:29:42 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Frédéric van der Essen aa17d5cf7a [MERGE] from trunk
bzr revid: fva@openerp.com-20120925135557-09s58wkbt038yxpo
2012-09-25 15:55:57 +02:00
Frédéric van der Essen a7f63f3fb2 [FIX] css: further etherpad fixes:
bzr revid: fva@openerp.com-20120924134600-5avqr2vohdsh7y9n
2012-09-24 15:46:00 +02:00
Antony Lesuisse 283131289d [MERGE] note: remove optionals tags, pad: fix lazy pad creation
bzr revid: al@openerp.com-20120920235343-tveo33j410atkt2y
2012-09-21 01:53:43 +02:00
Frédéric van der Essen 615cc75314 [MERGE] css improvements to mail, hr, and etherpad integration
bzr revid: fva@openerp.com-20120920155216-wzvpnk8rv4ltym5v
2012-09-20 17:52:16 +02:00
Frédéric van der Essen b9fd12a301 [FIX] fixed etherpad's css integration
bzr revid: fva@openerp.com-20120920144017-il5ck5997gjdn5e7
2012-09-20 16:40:17 +02:00
Christophe Matthieu f154707dcb [IMP]note : demo
bzr revid: chm@openerp.com-20120920120616-11khif6ezlacxxy0
2012-09-20 14:06:16 +02:00
Christophe Matthieu e57ae347a0 [IMP] pad : message insert into pad
bzr revid: chm@openerp.com-20120920105713-meckyb4pnlxbapzk
2012-09-20 12:57:13 +02:00
Christophe Matthieu 3863e439d8 [IMP]note: remove options tags, tags for all user inside header bar
bzr revid: chm@openerp.com-20120920075031-lx6k382cd8kcyct9
2012-09-20 09:50:31 +02:00
Christophe Matthieu 245002e48d [IMG] base_calendar, note_pad
bzr revid: chm@openerp.com-20120919143553-lmlvshitpkkftyln
2012-09-19 16:35:53 +02:00
niv-openerp 4a107613ca [FIX] pad: javascript error in pad.js
bzr revid: nicolas.vanhoren@openerp.com-20121029153653-m5f8uorbhqt4s8gp
2012-10-29 16:36:53 +01:00
Jigar Amin a4e2a7cf05 [MERGE] pad: Task Delegation traceback -ValueError: too many values to unpack
project_timesheet: Project Task work log with empty description show bad timesheet lines entry

bzr revid: jam@tinyerp.com-20121023070225-0mcejm4mypnvbha7
2012-10-23 12:32:25 +05:30
ajay javiya (OpenERP) ce3882d8d7 [FIX]:Task issue in project module
bzr revid: aja@tinyerp.com-20121023065037-2i16k4xlsczqj04y
2012-10-23 12:20:37 +05:30
Launchpad Translations on behalf of openerp 063c548209 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120911045051-qhkumfcarekjpsm0
2012-09-11 04:50:51 +00:00
Fabien Pinckaers 3754ded707 [IMP] pad demo daa
bzr revid: fp@openerp.com-20120905205539-sokhzgjpu0wi2pyo
2012-09-05 22:55:39 +02:00
Olivier Dony 424085389f [FIX] pad: fix case of missing pad server
Default to empty pad url when sever is not set, UI will gracefully handle this case

bzr revid: odo@openerp.com-20120830095821-2044b23scst5dktk
2012-08-30 11:58:21 +02:00
Antony Lesuisse 588f233f15 wip part1 (no setHTML) working
bzr revid: al@openerp.com-20120829123833-4b9kp33d9ne2gyom
2012-08-29 14:38:33 +02:00
Antony Lesuisse 2f81a1adc6 [MERGE] trunk
bzr revid: al@openerp.com-20120829093743-syqklh5mypeiqxjp
2012-08-29 11:37:43 +02:00
Antony Lesuisse 9f1633e4a2 todo
bzr revid: al@openerp.com-20120829093606-5oenal17oyhlvxeb
2012-08-29 11:36:06 +02:00
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
niv-openerp 65f532e001 [IMP] made a whole-application replace of $element by $el
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +02:00
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Antony Lesuisse 72c5fe278b generate url from the widget if needed
bzr revid: al@openerp.com-20120820234008-olfcnxj7np6hwwgz
2012-08-21 01:40:08 +02:00
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Antony Lesuisse a79139048d [FIX] pad everything, remove unused api
bzr revid: al@openerp.com-20120721192551-q6nbqn4xxau0e64x
2012-07-21 21:25:51 +02:00
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
Fabien Pinckaers d17e291031 [IMP] etherpad fullscreen
bzr revid: fp@openerp.com-20120717225636-bqudwmo6cve50fjn
2012-07-18 00:56:36 +02:00
Fabien Pinckaers 4c82865bfd [IMP] etherpad
bzr revid: fp@openerp.com-20120717222457-f652anzrzharlwkn
2012-07-18 00:24:57 +02:00
Fabien Pinckaers 36cde3d9fc [IMP] some cleaning in etherpad
bzr revid: fp@openerp.com-20120717221408-zk30i103f0erk4a3
2012-07-18 00:14:08 +02:00
Tejas Tank 45c50d3a31 merged lasted + resolve conflicts + etherpad with project.task
bzr revid: tta@openerp.com-20120717101845-52upauotn1sjfqio
2012-07-17 15:48:45 +05:30
Sanjay Gohel (Open ERP) b81c51c73c [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120716065703-gcmugagvaaq1xl4c
2012-07-16 12:27:03 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Quentin (OpenERP) ef74150d31 [IMP] settings: better form view for res.company
bzr revid: qdp-launchpad@openerp.com-20120713161158-w0e5268zip8drzi1
2012-07-13 18:11:58 +02:00
Ajay Chauhan (OpenERP) e0d24ed957 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713065810-91bvrnod20nr38gq
2012-07-13 12:28:10 +05:30
Sanjay Gohel (Open ERP) 12bae0d8f9 [IMP]improve company form view as per review. improve email_template,user form and all action window and also remove sheets from configuration
bzr revid: sgo@tinyerp.com-20120706123413-1n615yx09cw2kq36
2012-07-06 18:04:13 +05:30
Sanjay Gohel (Open ERP) 0fd2ca6bdc [IMP]Improve company view in settings and organise in group
bzr revid: sgo@tinyerp.com-20120703051546-2bxwnl0evv8qzirz
2012-07-03 10:45:46 +05:30
Launchpad Translations on behalf of openerp d4271f66c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120613045614-nvpnoumt1aazscag
bzr revid: launchpad_translations_on_behalf_of_openerp-20120614043456-3m7u51qfu23c0qhx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120614044123-deayo2v3jjc74u8f
2012-06-14 04:41:23 +00:00
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Tejas Tank ecc3903576 [IMP] Improve code.
bzr revid: tta@openerp.com-20120515122004-a7ru3nbu9ebc21pv
2012-05-15 17:50:04 +05:30
Tejas Tank 4aeccd8c32 Removed unwanted comment.
bzr revid: tta@openerp.com-20120515114250-724qkt8uv0sdpuag
2012-05-15 17:12:50 +05:30
Tejas Tank 6cfbb6cbfa pad height increased
bzr revid: tta@openerp.com-20120515113445-blgmm94w41gqqro3
2012-05-15 17:04:45 +05:30
Tejas Tank 13cce602fb Etherpad API Integraion, Set default blank pad, and user name per pad visit
bzr revid: tta@openerp.com-20120515111928-dgpejwc01nlyxemf
2012-05-15 16:49:28 +05:30
Tejas Tank 2a81f8e452 Etherpad API Integration.
bzr revid: tta@openerp.com-20120514134958-21spjsnqjitqw4ie
2012-05-14 19:19:58 +05:30
Tejas Tank 2af74107d7 Improvement with etherpad and with latest trunk code.
bzr revid: tta@openerp.com-20120511045856-yyrp8sfz6asnbujc
2012-05-11 10:28:56 +05:30
Tejas Tank 724d8dbaa9 removed pad from kanban, change title and improve css.
bzr revid: tta@openerp.com-20120509103947-9yn41ooq6kbfr5gd
2012-05-09 16:09:47 +05:30
Tejas Tank 9c66432d9a changed the pad url
bzr revid: tta@openerp.com-20120509045125-e0ok9uobvj8xkjwm
2012-05-09 10:21:25 +05:30
Tejas Tank edccdae511 Etherpad Page view css fix
bzr revid: tta@openerp.com-20120508100233-d0ez4wmu5koyzuq9
2012-05-08 15:32:33 +05:30
Tejas Tank 8311856d5d Set default pad url
bzr revid: tta@openerp.com-20120507073848-qn06nv6zjzhdvcdj
2012-05-07 13:08:48 +05:30
Tejas Tank fbf5976cd0 [ADD] pad.py a common feature for pad integration
bzr revid: tta@openerp.com-20120501125837-80ufu4upo60zpb0d
2012-05-01 18:28:37 +05:30
Tejas Tank 6f09e12c87 [IMP] Etherpad syn. with ir.attachement
bzr revid: tta@openerp.com-20120501125440-eh95szp968oncn0q
2012-05-01 18:24:40 +05:30
Tejas Tank 9cce3c670a code improved and merge with trunk
bzr revid: tta@openerp.com-20120427133241-8c5ian8e7p4bb642
2012-04-27 19:02:41 +05:30
Tejas Tank ddf8d19d8a etherpad.xml file removed
bzr revid: tta@openerp.com-20120427111922-ghu56jmsxtye3pdp
2012-04-27 16:49:22 +05:30
Tejas Tank 373e6fe2a1 web_etherpad.js file removed
bzr revid: tta@openerp.com-20120427111228-u1qukkmds8pmysnh
2012-04-27 16:42:28 +05:30
Tejas Tank 28b6a7b887 merge etherpad with pad module
bzr revid: tta@openerp.com-20120427104800-901vmhsz4o76q9va
2012-04-27 16:18:00 +05:30
Tejas Tank bf39e45f5f Removed unwanted comment.
bzr revid: tta@openerp.com-20120427085736-bu2nmx1ar2d76isc
2012-04-27 14:27:36 +05:30
Tejas Tank ae848b7fd9 merge with pad module and latest trunk too
bzr revid: tta@openerp.com-20120427085103-s2nf391at3nsmbdg
2012-04-27 14:21:03 +05:30
Launchpad Translations on behalf of openerp e9f015e217 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120424045336-z7vvlldbzqcxlzbg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120425044636-947k9ddma8u81o50
2012-04-25 04:46:36 +00:00
Antony Lesuisse 08901b1393 [FIX] pad action
bzr revid: al@openerp.com-20120419084650-clu7oke9rz6me6pi
2012-04-19 10:46:50 +02:00
Antony Lesuisse ff16b9c988 [FIX] pad
bzr revid: al@openerp.com-20120419082815-3rkd76h0bztnb3p1
2012-04-19 10:28:15 +02:00
Launchpad Translations on behalf of openerp d60ca9a5fa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120407045605-5anp5gdq7lknrlzu
bzr revid: launchpad_translations_on_behalf_of_openerp-20120409045650-vb086pw3whwuub1e
bzr revid: launchpad_translations_on_behalf_of_openerp-20120410045646-c2eyze1zzi2rjspi
2012-04-10 04:56:46 +00:00
Launchpad Translations on behalf of openerp 88c25488a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
Launchpad Translations on behalf of openerp 9f65e1565e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00