7715bf1823
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2
...
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
2014-04-09 18:31:32 +02:00
c28a5a1021
[FIX] pad: render_value binded on change effective_readonly event, so render value calls wait for each others
...
Proper fix than 9968 revid:dle@openerp.com-20140409160214-1anxi8z07xj49vsp
bzr revid: dle@openerp.com-20140409162932-y5fxd5wbojing2t2
2014-04-09 18:29:32 +02:00
83996269ca
[FIX] pad: render_value binded on change effective_readonly event, so render value calls wait for each others
...
bzr revid: dle@openerp.com-20140409160214-1anxi8z07xj49vsp
2014-04-09 18:02:14 +02:00
1e123f5be0
[FIX] pad: pad in readonly when opening form view in edit mode - opw 606208
...
bzr revid: acl@openerp.com-20140409114825-t10ps6o7qn7qbd7y
2014-04-09 13:48:25 +02:00
6a14fddc35
[MERGE] Forward port of saas-2 fixes up to rev 9152 rev-id odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
...
bzr revid: odo@openerp.com-20140314143911-c2mxesg31xezeyr9
2014-03-14 15:39:11 +01:00
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
ee8174806e
[MERGE] forward port of branch saas-2 up to revid 9149 chs@openerp.com-20140313163420-ifa4hyixj722d6jo
...
bzr revid: mat@openerp.com-20140313091920-bahej198pu339e28
bzr revid: chs@openerp.com-20140313170940-yoqg6izfw74s2i3a
2014-03-13 18:09:40 +01:00
b43ffa52c2
[FIX] pad: use server to get pad content
...
bzr revid: chs@openerp.com-20140313153535-ogyip9tfm2hkwn1f
2014-03-13 16:35:35 +01:00
c24633928f
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9129 dle@openerp.com-20140213115951-h7c2o65lgg26aosv
...
bzr revid: chs@openerp.com-20140212182315-clifgy95ug2rd6d8
bzr revid: dle@openerp.com-20140213120325-zq9bnl035i1s6xd4
2014-02-13 13:03:25 +01:00
e90a59aef6
[FIX] pad: font-awesomeize icon
...
bzr revid: chs@openerp.com-20140212181014-rk1qh1pcovtmjhqu
2014-02-12 19:10:14 +01:00
f4a61d46d0
[FIX] pad: hide chatter in fullscreen mode
...
lp bug: https://launchpad.net/bugs/1267108 fixed
bzr revid: chs@openerp.com-20140212134747-moiyebzdti4ieyc4
2014-02-12 14:47:47 +01:00
f207e8da28
[FIX] pad: add break-word css to avoid going out of the field in case of too long words (eg: urls) (opw 593426)
...
bzr revid: mat@openerp.com-20131127160300-yx42uee1xqx79ljl
2013-11-27 17:03:00 +01:00
d134cd6080
[FIX] line should break if url link is too long for readonly etherpad
...
bzr revid: rgaopenerp-20130701095502-c6pgr2dz7i7zmdop
2013-07-01 15:25:02 +05:30
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
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
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
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
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
b0cb3ed3fe
[IMP] small css fixes
...
bzr revid: fp@tinyerp.com-20121215125849-0gtgfjpmnnwdkjrb
2012-12-15 13:58:49 +01:00
bdc7dcd539
[IMP] CSS of etherpad
...
bzr revid: fp@tinyerp.com-20121215110758-3ahwmk20uh5kt6g7
2012-12-15 12:07:58 +01:00
d010441fe3
[IMP] pad: remove attributes for super
...
bzr revid: chm@openerp.com-20121213145855-0aq9wqtovyrxzxkw
2012-12-13 15:58:55 +01:00
23b6b96fbc
[IMP] pad: add abord for $.get request
...
bzr revid: chm@openerp.com-20121213145714-b9d4f2u8iqdg8r1m
2012-12-13 15:57:14 +01:00
265b6d67df
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20121213141115-cxfplrgbo7dyhuf9
2012-12-13 15:11:15 +01:00
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
4f0d88eae7
[IMP] improve the code
...
bzr revid: rma@tinyerp.com-20121129053112-fiq8k4w56crv3q4x
2012-11-29 11:01:12 +05:30
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
8be63a0043
[FIX] Corrected etherpad rending issue.
...
bzr revid: tta@openerp.com-20121109065144-hut93odny1ur16db
2012-11-09 12:21:44 +05:30
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
4a107613ca
[FIX] pad: javascript error in pad.js
...
bzr revid: nicolas.vanhoren@openerp.com-20121029153653-m5f8uorbhqt4s8gp
2012-10-29 16:36:53 +01:00
802eda5ad7
Ported field pad
...
bzr revid: nicolas.vanhoren@openerp.com-20121012121126-atu1vf14rc4fxu0g
2012-10-12 14:11:26 +02:00
aa17d5cf7a
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120925135557-09s58wkbt038yxpo
2012-09-25 15:55:57 +02:00
a7f63f3fb2
[FIX] css: further etherpad fixes:
...
bzr revid: fva@openerp.com-20120924134600-5avqr2vohdsh7y9n
2012-09-24 15:46:00 +02:00
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
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
b9fd12a301
[FIX] fixed etherpad's css integration
...
bzr revid: fva@openerp.com-20120920144017-il5ck5997gjdn5e7
2012-09-20 16:40:17 +02:00
e57ae347a0
[IMP] pad : message insert into pad
...
bzr revid: chm@openerp.com-20120920105713-meckyb4pnlxbapzk
2012-09-20 12:57:13 +02:00
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
245002e48d
[IMG] base_calendar, note_pad
...
bzr revid: chm@openerp.com-20120919143553-lmlvshitpkkftyln
2012-09-19 16:35:53 +02:00
3754ded707
[IMP] pad demo daa
...
bzr revid: fp@openerp.com-20120905205539-sokhzgjpu0wi2pyo
2012-09-05 22:55:39 +02:00
588f233f15
wip part1 (no setHTML) working
...
bzr revid: al@openerp.com-20120829123833-4b9kp33d9ne2gyom
2012-08-29 14:38:33 +02:00
2f81a1adc6
[MERGE] trunk
...
bzr revid: al@openerp.com-20120829093743-syqklh5mypeiqxjp
2012-08-29 11:37:43 +02:00
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
72c5fe278b
generate url from the widget if needed
...
bzr revid: al@openerp.com-20120820234008-olfcnxj7np6hwwgz
2012-08-21 01:40:08 +02:00
a79139048d
[FIX] pad everything, remove unused api
...
bzr revid: al@openerp.com-20120721192551-q6nbqn4xxau0e64x
2012-07-21 21:25:51 +02:00
d17e291031
[IMP] etherpad fullscreen
...
bzr revid: fp@openerp.com-20120717225636-bqudwmo6cve50fjn
2012-07-18 00:56:36 +02:00
4c82865bfd
[IMP] etherpad
...
bzr revid: fp@openerp.com-20120717222457-f652anzrzharlwkn
2012-07-18 00:24:57 +02:00
36cde3d9fc
[IMP] some cleaning in etherpad
...
bzr revid: fp@openerp.com-20120717221408-zk30i103f0erk4a3
2012-07-18 00:14:08 +02:00
4aeccd8c32
Removed unwanted comment.
...
bzr revid: tta@openerp.com-20120515114250-724qkt8uv0sdpuag
2012-05-15 17:12:50 +05:30
6cfbb6cbfa
pad height increased
...
bzr revid: tta@openerp.com-20120515113445-blgmm94w41gqqro3
2012-05-15 17:04:45 +05:30
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
Denis Ledoux
Anael Closson
Olivier Dony
Christophe Simonis
Martin Trigaux
RGA(OpenERP)
niv-openerp
Frédéric van der Essen
Christophe Matthieu
Fabien Pinckaers
Randhir Mayatra (OpenERP)
Tejas Tank
Fabien Meghazi
Antony Lesuisse
Fabien Pinckaers