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 |