Xavier Morel
|
c7f80314cf
|
[MERGE] ckeditor-based RTE
bzr revid: xmo@openerp.com-20130729145626-mytt2mkshcirz63b
|
2013-07-29 16:56:26 +02:00 |
|
Xavier Morel
|
3a8f51385d
|
[ADD] toolbar subgroups, hooks for styling lists correctly, more widgets
bzr revid: xmo@openerp.com-20130729143842-k4r7e42hhvw1y1xu
|
2013-07-29 16:38:42 +02:00 |
|
Xavier Morel
|
7294033e1f
|
[IMP] disable RTE on t-record results (data-oe-type)
bzr revid: xmo@openerp.com-20130726134459-8mb3p4eh2ob8rxyq
|
2013-07-26 15:44:59 +02:00 |
|
Xavier Morel
|
5176607c2a
|
[IMP] make spans editable (though not RTE, not supported) & use t-record for company name
bzr revid: xmo@openerp.com-20130726113742-ix2f4tyy0xvoy9lq
|
2013-07-26 13:37:42 +02:00 |
Christophe Matthieu
|
8bc4e0e8a4
|
[IMP] remove client action goBack and add client action redirect
bzr revid: chm@openerp.com-20130726092643-onck6ad1e2aj7gbo
|
2013-07-26 11:26:43 +02:00 |
|
Xavier Morel
|
7d59a7355f
|
[IMP] remove sharedspace plugin, disable ckeditor's own toolbar, build toolbar from scratch
bzr revid: xmo@openerp.com-20130725145505-sb8ul41fd3nfmhwc
|
2013-07-25 16:55:05 +02:00 |
|
Xavier Morel
|
f3aabcc256
|
[ADD] fixed toolbar positioning for ckeditor
bzr revid: xmo@openerp.com-20130724144851-40f69hkuantjbgtg
|
2013-07-24 16:48:51 +02:00 |
|
Xavier Morel
|
5c20973bf9
|
[IMP] disable ACF to fix ckeditor removing nodes and classes, breaking layout and styling
bzr revid: xmo@openerp.com-20130724125435-02c8j92p0tq894nq
|
2013-07-24 14:54:35 +02:00 |
|
Xavier Morel
|
d8792fc1a9
|
[ADD] basic ckeditor integration
bzr revid: xmo@openerp.com-20130724123626-c220vibm5mvukudv
|
2013-07-24 14:36:26 +02:00 |
|
Xavier Morel
|
c3e11ba9ca
|
[FIX] various warnings
bzr revid: xmo@openerp.com-20130724100813-8z0k9lf03qjp0fzm
|
2013-07-24 12:08:13 +02:00 |
|
Christophe Matthieu
|
2f97f8b5b7
|
[IMP] website_sale: default value in checkout
bzr revid: chm@openerp.com-20130723151607-w4blimvr7f40rlzg
|
2013-07-23 17:16:07 +02:00 |
|
Christophe Matthieu
|
38c30dc063
|
[MERGE] from parent
bzr revid: chm@openerp.com-20130723134315-sw5mkmw95n9hb3pc
|
2013-07-23 15:43:15 +02:00 |
|
Christophe Matthieu
|
840f1923a6
|
[IMP] website_sale: checkout + action return
bzr revid: chm@openerp.com-20130723133923-umjm1uqk8y5xalf6
|
2013-07-23 15:39:23 +02:00 |
Fabien Meghazi
|
1a30a11926
|
[IMP] Hardcode css and jquery for website. Temporary revert aloha to raw contentEditable
bzr revid: fme@openerp.com-20130723131543-gyn4dcuy2rp2m3v2
|
2013-07-23 15:15:43 +02:00 |
|
Fabien Meghazi
|
17536f7a15
|
[FIX] concurrency save
bzr revid: fme@openerp.com-20130703120114-js4vbbtwgettn9th
|
2013-07-03 14:01:14 +02:00 |
Antony Lesuisse
|
d7a782a884
|
fix save
bzr revid: al@openerp.com-20130703015109-clb9v3n8yawg5ew8
|
2013-07-03 03:51:09 +02:00 |
|
Antony Lesuisse
|
a415c9c39b
|
sniipet hack hgack
bzr revid: al@openerp.com-20130702221104-if76w1j5bu3tjest
|
2013-07-03 00:11:04 +02:00 |
|
Antony Lesuisse
|
2663e21f50
|
snippet part3 + fix alhoa hightlight
bzr revid: al@openerp.com-20130702210035-44jka7w1ijc9vak8
|
2013-07-02 23:00:35 +02:00 |
|
Antony Lesuisse
|
9317633c7a
|
snippet part2 + fix edtiable
bzr revid: al@openerp.com-20130702194540-afw5419mqgrht5r0
|
2013-07-02 21:45:40 +02:00 |
Christophe Simonis
|
69aeff7d6f
|
[FIX] website: reload after edit
bzr revid: chs@openerp.com-20130702193959-10qsbx0nc2by2ow4
|
2013-07-02 21:39:59 +02:00 |
|
Antony Lesuisse
|
06d65b090a
|
snippet part0
bzr revid: al@openerp.com-20130702185106-98ac5l76kyx4kaq8
|
2013-07-02 20:51:06 +02:00 |
|
Christophe Simonis
|
7a6a492f00
|
[FIX] website: correct element to save
bzr revid: chs@openerp.com-20130702184823-ly4eubnypr1m8pvz
|
2013-07-02 20:48:23 +02:00 |
|
Antony Lesuisse
|
2b5cf63ed7
|
m
bzr revid: al@openerp.com-20130702171614-opy0xy7l1h3r330u
|
2013-07-02 19:16:14 +02:00 |
|
Antony Lesuisse
|
dd472d11da
|
it works
bzr revid: al@openerp.com-20130702145548-m9oaw33dhtb96u0z
|
2013-07-02 16:55:48 +02:00 |
|
Fabien Meghazi
|
92b20e6ee1
|
[WIP] Disable xpath
bzr revid: fme@openerp.com-20130702124125-hy5f7w3996ai73u6
|
2013-07-02 14:41:25 +02:00 |
|
Fabien Meghazi
|
fec0b5e391
|
[FIX] stuff
bzr revid: fme@openerp.com-20130702123228-2dzs7g9dm6gpldw3
|
2013-07-02 14:32:28 +02:00 |
|
Fabien Meghazi
|
fe95430451
|
[BREAK] a bit more
bzr revid: fme@openerp.com-20130702115808-8j0xbgnswa5yyetp
|
2013-07-02 13:58:08 +02:00 |
|
Fabien Meghazi
|
ec3777f6b1
|
[CRASH] Add random crashes and misc problems
bzr revid: fme@openerp.com-20130702112314-ix21cj8ca26fpui8
|
2013-07-02 13:23:14 +02:00 |
|
Antony Lesuisse
|
137024efe6
|
use aloha temporarly
bzr revid: al@openerp.com-20130702103634-xg1x9h1j1eyox8fo
|
2013-07-02 12:36:34 +02:00 |
|
Antony Lesuisse
|
814fdf3d2b
|
make oe_editable visible
bzr revid: al@openerp.com-20130701142840-s1pz9s2qwbf6o9yj
|
2013-07-01 16:28:40 +02:00 |
|
Fabien Meghazi
|
6dd657f253
|
[IMP] Webeditor as a webclient module (with more hackery)
bzr revid: fme@openerp.com-20130627161536-cp6mdz8junts3316
|
2013-06-27 18:15:36 +02:00 |