Commit Graph

214 Commits

Author SHA1 Message Date
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 7a49719d46 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
2013-01-18 07:10:51 +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
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 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
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 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