Commit Graph
44 Commits
Author SHA1 Message Date
Antony Lesuisse 6dd16f2613 [MERGE] trunk
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +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
Thibault Delavallée 84fbc3b7da [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120920144900-isobpji9066sftj1
2012-09-20 16:49:00 +02:00
niv-openerp da8ab5d399 [IMP] document_page: changed to use the html field
bzr revid: nicolas.vanhoren@openerp.com-20120920084253-v2wyiimgk4ez1jum
2012-09-20 10:42:53 +02:00
Sanjay Gohel (Open ERP) e6cdcb6b51 [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120917065740-w9a3xhe632368t2n
2012-09-17 12:27:40 +05:30
Sanjay Gohel (Open ERP) a807b57f4e [MERGE]merge with trunk addons
bzr revid: apa@tinyerp.com-20120911054811-24s3e1perqf7x1wo
bzr revid: apa@tinyerp.com-20120911084547-trlru6t8r1dv1yhd
bzr revid: apa@tinyerp.com-20120912050215-glxhb94pu2aed5fz
bzr revid: apa@tinyerp.com-20120913050959-re58fqvnaqrhgzg0
bzr revid: sgo@tinyerp.com-20120914053201-khnzm9ei7rpjcp7u
2012-09-14 11:02:01 +05:30
Jigar Amin - OpenERP d7dfc3dc1c [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
niv-openerp b10e31d204 [IMP] replaced wiki stuff by html field
bzr revid: nicolas.vanhoren@openerp.com-20120910142035-rzxwsv4nb3jfcf3o
2012-09-10 16:20:35 +02:00
niv-openerp 1c0dd3b016 [IMP] added arguments to widget html usage
bzr revid: nicolas.vanhoren@openerp.com-20120910135708-6wq2v7iet7i11624
2012-09-10 15:57:08 +02:00
Jigar Amin - OpenERP 8df390e16b Merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-tpa
bzr revid: jam@tinyerp.com-20120910090801-7wni3ektc673nxft
2012-09-10 14:38:01 +05:30
Amit Patel (OpenERP) 33b3c0e6a0 [MERGE]:tunk
bzr revid: apa@tinyerp.com-20120910051334-54gadrzcbjzk37wn
2012-09-10 10:43:34 +05:30
Antony Lesuisse f2ddf0ea65 [FIX] document_page wiki
bzr revid: al@openerp.com-20120909104340-z4c85dcq6s11v83y
2012-09-09 12:43:40 +02:00
Turkesh Patel (Open ERP) 7475938ec4 [IMP] remove warnings from document_page.
bzr revid: tpa@tinyerp.com-20120907112025-zv1sfm60ry7lojth
2012-09-07 16:50:25 +05:30
Sanjay Gohel (Open ERP) 9d871c5036 [MERGE][IMP]merge with mail-cleaning-fp and improve code
bzr revid: sgo@tinyerp.com-20120905093255-gs4vbp3gxav6iutt
2012-09-05 15:02:55 +05:30
vta vta@openerp.com b4b104e0d0 [FIX] Document page css.
bzr revid: vta@openerp.com-20120904115638-nccbm09g3cof803q
2012-09-04 13:56:38 +02:00
Sanjay Gohel (Open ERP) f99095ecd0 [MERGE]merge with mail-cleaning-fp n resolve conflicts
bzr revid: sgo@tinyerp.com-20120831090308-2k6uj5iy3tds1wm5
2012-08-31 14:33:08 +05:30
Launchpad Translations on behalf of openerp 4639967d0c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120831045649-sm7os4ihiv8fv422
2012-08-31 04:56:49 +00:00
Amit Patel (OpenERP) f64b778260 [MERGE]
bzr revid: apa@tinyerp.com-20120829065942-rz41bppw31sutj4j
2012-08-29 12:29:42 +05:30
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
Amit Patel (OpenERP) 99d98e963c [MERGe]
bzr revid: apa@tinyerp.com-20120827050858-5rlntcz476cha7p1
2012-08-27 10:38:58 +05:30
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
Amit Patel (OpenERP) 7b8f37932c [MERGE]
bzr revid: apa@tinyerp.com-20120823050617-295o33cjm876nw75
2012-08-23 10:36:17 +05:30
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
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Amit Patel (OpenERP) dce1caf5d1 [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120814130645-6qzuyrc6uc6u83p7
2012-08-14 18:36:45 +05:30
Vo Minh Thu 2376fe0add [MERGE] merged view changes: the type is now a functional field derived from the arch.
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Sanjay Gohel (Open ERP) b97e2ddd80 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120814071854-247rm43du32l47nu
2012-08-14 12:48:54 +05:30
Launchpad Translations on behalf of openerp cd04752f66 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120814044618-2edn0a32irj2dpr6
2012-08-14 04:46:18 +00:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Amit Patel (OpenERP) f6b813a0e5 [MERGE]
bzr revid: apa@tinyerp.com-20120813105201-2bbkzkbkxmfehdhn
2012-08-13 16:22:01 +05:30
Antony Lesuisse 9211174a6f [MERGE] document_page aka wiki
it still uses the wiki syntax, switch to full html will occur after the
autosizing of cleditor

bzr revid: al@openerp.com-20120812144730-nxgxz8c77afczfr9
2012-08-12 16:47:30 +02:00
Antony Lesuisse ddfd83d9ff fixes test
bzr revid: al@openerp.com-20120811185610-o95wfdvtwfg4f4g6
2012-08-11 20:56:10 +02:00
Antony Lesuisse d2a01d78a4 fixes css, demo, js
bzr revid: al@openerp.com-20120811183444-0wwagnum2tm964i6
2012-08-11 20:34:44 +02:00
Antony Lesuisse d8e8f22b3f fix css
bzr revid: al@openerp.com-20120810233534-dqcuim7ip990gj6c
2012-08-11 01:35:34 +02:00
Antony Lesuisse 1f4d92ba8b fix index
bzr revid: al@openerp.com-20120810231307-w9rgwiaybhm1gdyk
2012-08-11 01:13:07 +02:00
Antony Lesuisse 4e4a7dcbee document_page ready
bzr revid: al@openerp.com-20120810225046-qs3liea2s76lh6v0
2012-08-11 00:50:46 +02:00
Antony Lesuisse 4fb193140b page minor fixes
bzr revid: al@openerp.com-20120810003104-9kjue6bigt2ayfsu
2012-08-10 02:31:04 +02:00
Antony Lesuisse bda8f3fb7f page mostly ok
bzr revid: al@openerp.com-20120810000908-ujg81v4mgm22glem
2012-08-10 02:09:08 +02:00
Antony Lesuisse 6097630099 [MERGE] trunk
bzr revid: al@openerp.com-20120809134703-a048me2itv73dygr
2012-08-09 15:47:03 +02:00
Antony Lesuisse 9a5f47946d page work in progress view
bzr revid: al@openerp.com-20120809132901-0zjj2zeji8bsk962
2012-08-09 15:29:01 +02:00
Antony Lesuisse b9286a8eeb page work in progress model
bzr revid: al@openerp.com-20120809131141-m9xqa24u96sbgna7
2012-08-09 15:11:41 +02:00
Antony Lesuisse 62827193a9 wip fix part1
bzr revid: al@openerp.com-20120803171759-ihoxndrhdkpg62t9
2012-08-03 19:17:59 +02:00
Antony Lesuisse 788b1bdb5b [REM] correctly rename and remove wiki
bzr revid: al@openerp.com-20120803154641-ocbydlqt7ppjecwn
2012-08-03 17:46:41 +02:00