Commit Graph

31 Commits

Author SHA1 Message Date
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Olivier Dony a9f98e4990 [FIX] pad: improve pad bootstrap, prevent creating useless empty pads, avoid edition warning in read-only mode for new pads, translate messages
Added a small method to detect the proper server configuration,
and make it degrade gracefully if the method is not present.
This avoids having to force a pad URL generation in order to
test the config (possibly creating useless pads).
Add a user-friendly message when the pad has not yet been
initialized for a given record, in read-only mode.

bzr revid: odo@openerp.com-20140314131849-rnjvk1pqpiyvtc1c
2014-03-14 14:18:49 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01: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
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
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
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +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
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
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
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
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 9f1633e4a2 todo
bzr revid: al@openerp.com-20120829093606-5oenal17oyhlvxeb
2012-08-29 11:36:06 +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
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 ecc3903576 [IMP] Improve code.
bzr revid: tta@openerp.com-20120515122004-a7ru3nbu9ebc21pv
2012-05-15 17:50:04 +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 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