 Fabien Meghazi
|
15f53fe69b
|
[REV] Revert previous commit. Will apply it when web/trunk-website-al will merge upstream
bzr revid: fme@openerp.com-20130731151430-6s7x8w0vb0sqskoc
|
2013-07-31 17:14:30 +02:00 |
|
|
Fabien Meghazi
|
bb6412a6f1
|
[IMP] forward 'debug' directive to embedded client
bzr revid: fme@openerp.com-20130731151103-f6spqkfl9pcekasj
|
2013-07-31 17:11:03 +02:00 |
|
|
Xavier Morel
|
f25335df31
|
[FIX] disable ckeditor's magicline plugin (not very useful and breaks droppables)
bzr revid: xmo@openerp.com-20130731150733-mna9qoygkn6qiers
|
2013-07-31 17:07:33 +02:00 |
|
|
Christophe Matthieu
|
7c2d3a871f
|
[IMP] website: carousel edition
bzr revid: chm@openerp.com-20130731150511-8wfza72kb6lynmor
|
2013-07-31 17:05:11 +02:00 |
|
|
Frédéric van der Essen
|
b645f4830a
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731150133-rk2gl2yn74725vb0
|
2013-07-31 17:01:33 +02:00 |
|
|
Frédéric van der Essen
|
fd0d98e9e8
|
made the banner beautiful
bzr revid: fva@openerp.com-20130731145327-efm61ao2oh4f043q
|
2013-07-31 16:53:27 +02:00 |
|
|
Antony Lesuisse
|
bf38db1eac
|
main template in one div
bzr revid: al@openerp.com-20130731144022-mu2fxz3y5vedoqs7
|
2013-07-31 16:40:22 +02:00 |
|
|
Christophe Matthieu
|
ed2f62ba6c
|
[HACK] website: hack for scrolling of pseudo snippet carousel. To do: change snippet
bzr revid: chm@openerp.com-20130731141424-pgobjw0yvri7sqaf
|
2013-07-31 16:14:24 +02:00 |
|
|
Fabien Meghazi
|
96d3080998
|
[HACK] Quick hack in order to disable parents and childs links of a raw editable element
bzr revid: fme@openerp.com-20130731140631-40a85qnk0ao54zlz
|
2013-07-31 16:06:31 +02:00 |
|
|
Christophe Matthieu
|
8863d65457
|
[IMP] website: change boutton layout for carousel
bzr revid: chm@openerp.com-20130731140324-d0ujwllud3155en2
|
2013-07-31 16:03:24 +02:00 |
|
|
Frédéric van der Essen
|
2593a645fe
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731134958-m04umqrjepb6duqi
|
2013-07-31 15:49:58 +02:00 |
|
|
Frédéric van der Essen
|
24b68f0610
|
fixing snippets (just enough for the video demo)
bzr revid: fva@openerp.com-20130731134057-clqxu1mj149dsbhz
|
2013-07-31 15:40:57 +02:00 |
|
|
Christophe Matthieu
|
0eae00ee9d
|
[FIX] website: apply noupdate tag on new created page
bzr revid: chm@openerp.com-20130731125817-g4itvqhkso129nuf
|
2013-07-31 14:58:17 +02:00 |
|
|
Christophe Matthieu
|
7c3ba997db
|
[FIX] website: create new page. Replace website.default_page by the path name
bzr revid: chm@openerp.com-20130731124027-7yuj9u50iozpyqb9
|
2013-07-31 14:40:27 +02:00 |
|
|
Fabien Meghazi
|
8bc3af2570
|
[FIX] branding opt-out for div#push-footer
bzr revid: fme@openerp.com-20130731123743-9emfvc5g2k5g5s5i
|
2013-07-31 14:37:43 +02:00 |
|
|
Xavier Morel
|
19966993f5
|
[MERGE] image upload in RTE, disable custom context menu
bzr revid: xmo@openerp.com-20130731121514-e0t7v9eippnv4jlo
|
2013-07-31 14:15:14 +02:00 |
|
|
Xavier Morel
|
6796ce09b8
|
[IMP] disable ckeditor's context menu
bzr revid: xmo@openerp.com-20130731121358-x400woct28kh79xf
|
2013-07-31 14:13:58 +02:00 |
|
|
Xavier Morel
|
19eb0a33e0
|
[ADD] images upload
bzr revid: xmo@openerp.com-20130731121343-0uy1cfga6rbilkj5
|
2013-07-31 14:13:43 +02:00 |
|
|
Christophe Matthieu
|
1bdca25cc3
|
[FIX] website: go to website => cycle auto reload
bzr revid: chm@openerp.com-20130731114949-h3lddpitkv6f0wmh
|
2013-07-31 13:49:49 +02:00 |
|
|
Christophe Matthieu
|
8c71de72ae
|
[FIX] website: go to website => cycle auto reload
bzr revid: chm@openerp.com-20130731102834-m8zox13t40imt8i7
|
2013-07-31 12:28:34 +02:00 |
|
|
Xavier Morel
|
c5f28af3fe
|
[WHATEVER] make snippet editor do stuff
bzr revid: xmo@openerp.com-20130731102248-kl5upc2w48h9bisv
|
2013-07-31 12:22:48 +02:00 |
|
|
Xavier Morel
|
444db71456
|
[HACK] filter snippets so ckeditor is not applied to them
bzr revid: xmo@openerp.com-20130731091513-u3fklrijeuc6l80a
|
2013-07-31 11:15:13 +02:00 |
|
|
Xavier Morel
|
7f74e4ade1
|
[FIX] disable automatic insertion of paragraphs in content sections by ckeditor
bzr revid: xmo@openerp.com-20130731090151-q0gqmjx50wf6nm2n
|
2013-07-31 11:01:51 +02:00 |
|
|
Christophe Matthieu
|
729f65bd71
|
[IMP] website: add menu item in backend
bzr revid: chm@openerp.com-20130731090625-6q7d2kmgaslvu3dl
|
2013-07-31 11:06:25 +02:00 |
|
|
Frédéric van der Essen
|
67051c3be5
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731075741-6bs9qdslevxzeesd
|
2013-07-31 09:57:41 +02:00 |
|
|
Xavier Morel
|
7a12d33498
|
[FIX] whitelist section, header and footer for edition
bzr revid: xmo@openerp.com-20130731075635-wr3tdl2p12j34cmw
|
2013-07-31 09:56:35 +02:00 |
|
|
Frédéric van der Essen
|
3e373984a4
|
making the editor bar the same height as the rest of openerp
bzr revid: fva@openerp.com-20130731075611-lurg5zye995r9te7
|
2013-07-31 09:56:11 +02:00 |
|
|
Frédéric van der Essen
|
7f8aacf82c
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731074933-sd1ngn65e0jusqww
|
2013-07-31 09:49:33 +02:00 |
|
|
Frédéric van der Essen
|
dc7230517d
|
temporary fix for p insertion in menu edition
bzr revid: fva@openerp.com-20130731074859-q55bbgqtrd3xsbqs
|
2013-07-31 09:48:59 +02:00 |
|
|
Antony Lesuisse
|
d616e2d5fe
|
m
bzr revid: al@openerp.com-20130731074829-koml85g6ofa9r1c0
|
2013-07-31 09:48:29 +02:00 |
|
|
Frédéric van der Essen
|
e7b14ae02e
|
fix banner insertion
bzr revid: fva@openerp.com-20130731074313-taa1d02lyc9tyz4a
|
2013-07-31 09:43:13 +02:00 |
|
|
Frédéric van der Essen
|
b5f4f5b3d0
|
fixing the banner
bzr revid: fva@openerp.com-20130731073548-g51heju7xpinmysq
|
2013-07-31 09:35:48 +02:00 |
|
|
Frédéric van der Essen
|
7a89ee8d68
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130730184923-at0b7xbs9gc50g10
|
2013-07-30 20:49:23 +02:00 |
|
|
Frédéric van der Essen
|
a26d3cdbae
|
styling improvements on ecommerce and blog
bzr revid: fva@openerp.com-20130730182433-33t3ggw722usd82w
|
2013-07-30 20:24:33 +02:00 |
|
|
Frédéric van der Essen
|
21cbfa2828
|
put back snippets.css and homepage fixes
bzr revid: fva@openerp.com-20130730161834-r71km6nl6f59fmr6
|
2013-07-30 18:18:34 +02:00 |
|
|
Frédéric van der Essen
|
195ebf72d0
|
replacing css madness by bootstrap, homepage is mostly ok, ecommerce is broken
bzr revid: fva@openerp.com-20130730160317-j5aj1ktxt3u5rlyf
|
2013-07-30 18:03:17 +02:00 |
|
|
Christophe Matthieu
|
5d90e20f8b
|
[FIX] website: error on click on Edit button. Fix: filter not(data-oe-type). xmo
bzr revid: chm@openerp.com-20130730152856-du26nlnqjd4evulg
|
2013-07-30 17:28:56 +02:00 |
|
|
Xavier Morel
|
9b49dfb46a
|
[FIX] RTE on links and 'correct' enabling of save button
bzr revid: xmo@openerp.com-20130730151544-m3ggaaoyckvhos65
|
2013-07-30 17:15:44 +02:00 |
|
|
Christophe Matthieu
|
4c1760cdf5
|
[IMP] website_crm: fix dom error (todo: fix parser)
bzr revid: chm@openerp.com-20130730151428-3i42sln7zxm31mit
|
2013-07-30 17:14:28 +02:00 |
|
|
Xavier Morel
|
4d41a7f389
|
[FIX] add event handlers on non-rte contenteditables to trigger enabling of save button, fixup filters
bzr revid: xmo@openerp.com-20130730150955-ttqovqamexqtd8r9
|
2013-07-30 17:09:55 +02:00 |
|
|
Christophe Matthieu
|
cd076c1c9a
|
[IMP] website: contactus
bzr revid: chm@openerp.com-20130730150725-iinv39k9krjh3cl0
|
2013-07-30 17:07:25 +02:00 |
|
|
Christophe Matthieu
|
327f943c45
|
[IMP] website: carousel image bg
bzr revid: chm@openerp.com-20130730144252-grypnxx2urswvzb6
|
2013-07-30 16:42:52 +02:00 |
|
|
Christophe Matthieu
|
1d0af41f61
|
[IMP] website: carousel
bzr revid: chm@openerp.com-20130730143643-1itg8hhwuchnb5k3
|
2013-07-30 16:36:43 +02:00 |
|
|
Christophe Matthieu
|
3c7fb776c8
|
[IMP] website home page: add banner with boostrap carousel
bzr revid: chm@openerp.com-20130730103213-4nst7sqqcz3lzir5
|
2013-07-30 12:32:13 +02:00 |
|
|
Xavier Morel
|
2a0dc6af7a
|
[ADD] quote, text justification, list indent/outdent
todo: really need contextual conditions on buttons
bzr revid: xmo@openerp.com-20130730094320-n352j55bo7bs3ubj
|
2013-07-30 11:43:20 +02:00 |
|
|
Christophe Matthieu
|
781ae74c18
|
[IMP] website_mail: button add a new blog; link on header and footer
bzr revid: chm@openerp.com-20130730085027-beo81wr0ru1m6q2d
|
2013-07-30 10:50:27 +02:00 |
|
|
Xavier Morel
|
8370ba6adc
|
[ADD] link/unlink commands
bzr revid: xmo@openerp.com-20130729152601-00gvds9r39mo2n2a
|
2013-07-29 17:26:01 +02:00 |
|
|
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 |
|
|
Christophe Matthieu
|
4ebaf63987
|
[IMP] website_mail: blog archive
bzr revid: chm@openerp.com-20130729105146-zbr3454gdmqkg81u
|
2013-07-29 12:51:46 +02:00 |
|