 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
|
fa11f4b165
|
[MERGE] new banner design
bzr revid: fva@openerp.com-20130731150208-d2e9wo71ztr4psjj
|
2013-07-31 17:02:08 +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 |
|
|
Christophe Matthieu
|
5950ebdd23
|
[IMP] website_hr: begin
bzr revid: chm@openerp.com-20130731135434-am7nqltt16riikxa
|
2013-07-31 15:54:34 +02:00 |
|
|
Frédéric van der Essen
|
81ab06dd80
|
[MERGE] making snippets look cool enough for a video demo
bzr revid: fva@openerp.com-20130731135109-h2uynfn435ol950g
|
2013-07-31 15:51:09 +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 |
|
|
Frédéric van der Essen
|
8b073fa2b1
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731121304-npx5jvby2der0xad
|
2013-07-31 14:13:04 +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 |
|
|
Xavier Morel
|
023694bcab
|
[MERGE] from trunk
bzr revid: xmo@openerp.com-20130731113846-ji9exo91sms842ju
|
2013-07-31 13:38:46 +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 |
|
|
Christophe Matthieu
|
6d58cda2fa
|
[MERGE] with trunk-website-al
bzr revid: chm@openerp.com-20130731093853-ynkbq3zm7588d2rr
|
2013-07-31 11:38:53 +02:00 |
|
|
Christophe Matthieu
|
6a908b390e
|
[IMP] website_mail: remove useless div
bzr revid: chm@openerp.com-20130731093819-yvg0ahh1baj09uzl
|
2013-07-31 11:38:19 +02:00 |
|
|
Christophe Matthieu
|
8d3c6b5b79
|
[IMP] website_mail: layout comments on blog
bzr revid: chm@openerp.com-20130731092627-inzev1oqbn3gt63j
|
2013-07-31 11:26:27 +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 |
|
|
Christophe Matthieu
|
b466e934d9
|
[IMP] website_mail: clean css
bzr revid: chm@openerp.com-20130731091337-ni60flzow98mc4mz
|
2013-07-31 11:13:37 +02:00 |
|
|
Christophe Matthieu
|
c6df606576
|
[MERGE] with trunk-website-al
bzr revid: chm@openerp.com-20130731090746-r4uviyui176ngwbm
|
2013-07-31 11:07:46 +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 |
|
|
Frédéric van der Essen
|
800ba642ff
|
[MERGE] custom input background removal
bzr revid: fva@openerp.com-20130731082332-f72qrnsd7eubtftt
|
2013-07-31 10:23:32 +02:00 |
|
|
Frédéric van der Essen
|
e5e59bc141
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731082135-cm97mp7w5l3nwpib
|
2013-07-31 10:21:35 +02:00 |
|
|
Frédéric van der Essen
|
cd1fe5b566
|
remove custom input background
bzr revid: fva@openerp.com-20130731082117-r1qzq4b3mkcet2nl
|
2013-07-31 10:21:17 +02:00 |
|
|
Frédéric van der Essen
|
723da9a65d
|
[MERGE] quick fixes for the shopping cart display
bzr revid: fva@openerp.com-20130731081359-xx2nrwzgl96eiztq
|
2013-07-31 10:13:59 +02:00 |
|
|
Frédéric van der Essen
|
b358db5228
|
[MERGE] from upstream
bzr revid: fva@openerp.com-20130731081328-g6xnaaugia3866cn
|
2013-07-31 10:13:28 +02:00 |
|
|
Frédéric van der Essen
|
1a0976a764
|
quick fix for the shopping cart display
bzr revid: fva@openerp.com-20130731081304-1j2p1o13e061ka1q
|
2013-07-31 10:13:04 +02:00 |
|
|
Christophe Matthieu
|
140132c58f
|
[FIX] qweb.py: html rendering
bzr revid: chm@openerp.com-20130731080913-aev9gz72vyev9ryj
|
2013-07-31 10:09:13 +02:00 |
|
|
Frédéric van der Essen
|
d5bc41ad3c
|
[MERGE] making the editor top bar the same height as the openerp topbar
bzr revid: fva@openerp.com-20130731075820-8mp2a2rec44bv29u
|
2013-07-31 09:58:20 +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
|
2ab528a07f
|
[MERGE] fixing the navbar edition
bzr revid: fva@openerp.com-20130731075016-pt1xzxm2zo3sjafu
|
2013-07-31 09:50:16 +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
|
90787f3e41
|
[MERGE] banner insertion fixes
bzr revid: fva@openerp.com-20130731074348-m52hhdl1o553450k
|
2013-07-31 09:43:48 +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 |
|