Commit Graph
988 Commits
Author SHA1 Message Date
Fabien Meghazi 5f2dc489b2 [MERGE] upstream
bzr revid: fme@openerp.com-20131104114431-dhjp6iy1sfxq4cg1
2013-11-04 12:44:31 +01:00
Fabien Meghazi f880400e43 [IMP] Improved menu link dialog
bzr revid: fme@openerp.com-20131104113412-q5d8263741pq9wna
2013-11-04 12:34:12 +01:00
Xavier Morel 49381094a8 [IMP] error handling in website.render
Return responses with the correct status code instead of always
returning 200 on rendering errors from website.

bzr revid: xmo@openerp.com-20131104111021-inrsbawnakhsva1q
2013-11-04 12:10:21 +01:00
Christophe Matthieu fb8991d404 [FIX] website snippets: filter insead of siblings readXMLData. (fix vertical drop zone, activation snippets...)
bzr revid: chm@openerp.com-20131104102914-jltkz5u88heu87xd
2013-11-04 11:29:14 +01:00
Antony Lesuisse e51baab2f3 [FIX] robots.txt mimetype
bzr revid: al@openerp.com-20131102173140-b43am0wxsfbetezf
2013-11-02 18:31:40 +01:00
Antony Lesuisse c0dc6c81dc [FIX] qweb exception hiding
bzr revid: al@openerp.com-20131102171656-j4lqrx1gfosi8ofd
2013-11-02 18:16:56 +01:00
Fabien Meghazi cf58fd485b [IMP] first menu becomes root url
bzr revid: fme@openerp.com-20131031173428-c6l8b19ig5npwb9i
2013-10-31 18:34:28 +01:00
Fabien Meghazi 35d469d51f [FIX] Reuse website.editor.LinkDialog#bind_data()
bzr revid: fme@openerp.com-20131031165117-13yo8nrfg1ru4cp8
2013-10-31 17:51:17 +01:00
Fabien Meghazi 9f97b24318 [ADD] Edit menu entry
bzr revid: fme@openerp.com-20131031160211-zwxmdtokf59s5sq3
2013-10-31 17:02:11 +01:00
Fabien Meghazi 523b538307 [MERGE] upstream
bzr revid: fme@openerp.com-20131030160541-3k5qr0us9rkbp579
2013-10-30 17:05:41 +01:00
Fabien Meghazi aa2f9217c0 [IMP] Menu entry dialog
bzr revid: fme@openerp.com-20131030160405-crxjr6agtmf2x89p
2013-10-30 17:04:05 +01:00
Fabien Meghazi a87196eece [REM] Removed useless feature
bzr revid: fme@openerp.com-20131030151201-liz3qyn4mkv2ukc2
2013-10-30 16:12:01 +01:00
Fabien Meghazi b8d65ec78d [FIX] Edit menu shall not appear when not logged in
bzr revid: fme@openerp.com-20131030151143-2vsp68nb7r3r9v8a
2013-10-30 16:11:43 +01:00
ddm 68c7842977 [FIX] Multilang sitemap
bzr revid: ddm@openerp.com-20131030145050-khpfwu3nhsc6hcnz
2013-10-30 15:50:50 +01:00
Fabien Meghazi 90814d781a [MERGE] upstream
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
2013-10-30 15:48:13 +01:00
Fabien Meghazi 2e429fff8b [FIX] Load translation wizard could not properly redirect when only one language is installed
bzr revid: fme@openerp.com-20131030142955-482vt76w67zerui2
2013-10-30 15:29:55 +01:00
Fabien Meghazi 418e10c382 [IMP] Misc menu improvements
bzr revid: fme@openerp.com-20131030140216-f2fz7p3waur3l8j7
2013-10-30 15:02:16 +01:00
Xavier Morel 500804a7c8 [FIX] sitemap
add HTML sitemap, fix incorrect XML sitemap

bzr revid: xmo@openerp.com-20131030135750-7ljqx4u2qy4xhvm0
2013-10-30 14:57:50 +01:00
Fabien Meghazi fcdef0faaf [ADD] delete menu
bzr revid: fme@openerp.com-20131030105803-yq7r5lt9vtnd21p0
2013-10-30 11:58:03 +01:00
Xavier Morel 4007b79fb3 [FIX] move contenteditable manipulations from banner template to editor object
otherwise the banner sections stay editable when saved/outside of editable mode

bzr revid: xmo@openerp.com-20131030103048-6tdcvytrf60z89m2
2013-10-30 11:30:48 +01:00
ddm 655eed1395 [MERGE] trunk-website-aboutus-parallaxsnippet-bth
Improvements to the CMD 'About Us' page

bzr revid: ddm@openerp.com-20131030101334-8nvqusbvu5nvq5wv
2013-10-30 11:13:34 +01:00
Fabien Meghazi 0dab848b12 [MERGE] again
bzr revid: fme@openerp.com-20131030090041-18oxwobufevh9rfm
2013-10-30 10:00:41 +01:00
Fabien Meghazi f747a84131 [BRK] Disable automatic t-href on ir.ui.view#save() that breaks most of the snippets
Temporary desactivated because this breaks most of the snippets
Need to find another way to normalize multilang urls (postprocessing) ?

bzr revid: fme@openerp.com-20131030085425-inwkihpwqmierodx
2013-10-30 09:54:25 +01:00
Fabien Meghazi 12801a8cbc [MERGE] upstream
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
Fabien Meghazi 4ae5425fb8 [FIX] Buggy qweb template loading
bzr revid: fme@openerp.com-20131029161128-ko0ocpa0h6kziooh
2013-10-29 17:11:28 +01:00
Fabien Meghazi 07b9cf0f02 [IMP] Save menu is working
bzr revid: fme@openerp.com-20131029143346-nu9skoj5s06hwgw6
2013-10-29 15:33:46 +01:00
Fabien Meghazi 7ac3061c42 [WIP] Edit menu dialog
bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
2013-10-29 12:24:50 +01:00
Fabien Meghazi af4b4b94be [ADD] new_window field in website.menu
bzr revid: fme@openerp.com-20131029112221-7h39wlmbxb8xwm94
2013-10-29 12:22:21 +01:00
Fabien Meghazi 2d0158d8cc [ADD] Menu drag'n dro
bzr revid: fme@openerp.com-20131029083718-e6jrinmh6z48vn5j
2013-10-29 09:37:18 +01:00
bth-openerp fe5a0843d0 [IMP]oe_small class appied on background of parallax.
bzr revid: bth@tinyerp.com-20131029072856-3zow9iscbw6qoutd
2013-10-29 12:58:56 +05:30
bth-openerp 2d3cafbe2a [MERGE]Merge trunk-website-al.
bzr revid: bth@tinyerp.com-20131029065923-v1oizv7bf8f5krj5
2013-10-29 12:29:23 +05:30
Fabien Meghazi 2fc5da3f95 [WIP] Add menu
bzr revid: fme@openerp.com-20131028162815-2nou1okxovo8thkr
2013-10-28 17:28:15 +01:00
Fabien Meghazi b7ed1d3e6d [FIX] Translation shall not prevent website administration
bzr revid: fme@openerp.com-20131028162704-gm1o64e6ww1zurj2
2013-10-28 17:27:04 +01:00
Fabien Meghazi 82c749c91d [IMP] Refactor LinkDialog -> RTELinkDialog
bzr revid: fme@openerp.com-20131028162623-i2a4cixspm8q1crx
2013-10-28 17:26:23 +01:00
Fabien Meghazi 4f3e17ba33 [ADD] jquery-sortable
bzr revid: fme@openerp.com-20131028152725-70hqe2xjeuuhqt2i
2013-10-28 16:27:25 +01:00
Xavier Morel 0db0f20bda [ADD] WIP link combo
bzr revid: xmo@openerp.com-20131028152342-5clhbwwwfcdxxxq0
2013-10-28 16:23:42 +01:00
bth-openerp 36991e7019 [MERGE]Merge trunk-website-al branch.
bzr revid: bth@tinyerp.com-20131028132942-o6uk559f2lgjyrk8
2013-10-28 18:59:42 +05:30
Fabien Meghazi 26e62b0e0e [IMP] Menu tree from client side
bzr revid: fme@openerp.com-20131028112350-9or1z3e3ndgk4mfg
2013-10-28 12:23:50 +01:00
Fabien Meghazi 321bf56b99 [MERGE] upstream
bzr revid: fme@openerp.com-20131028091527-hbki8epj0oh4s821
2013-10-28 10:15:27 +01:00
Fabien Meghazi eb7b1362cd [WIP] Menu working from database (not yet multi-website)
bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
2013-10-25 17:24:46 +02:00
Xavier Morel 4c88701f3d [FIX] change access rights for customize_template_*
bzr revid: xmo@openerp.com-20131025095952-9ditm4q3fwr9auto
2013-10-25 11:59:52 +02:00
Fabien Meghazi ec09c0fa2c [ADD] Added website_id in client side context.
This allow us to comply to the 'ids' argument of website's model method (if needed)

bzr revid: fme@openerp.com-20131025074343-6nqgte7lzj7uhopj
2013-10-25 09:43:43 +02:00
Fabien Meghazi a597cc59ef [WIP] menus
bzr revid: fme@openerp.com-20131024141840-ihp2i6huzdlamf94
2013-10-24 16:18:40 +02:00
Xavier Morel c8dd901b04 [FIX] todo/notes
bzr revid: xmo@openerp.com-20131024141024-3kdx3jfcsn8vzsyg
2013-10-24 16:10:24 +02:00
Xavier Morel a2a3f46d72 [FIX] 'inline' set_image_data
bzr revid: xmo@openerp.com-20131024135730-321532upt3aq5esw
2013-10-24 15:57:30 +02:00
Xavier Morel 39fb50d43d [REM] explicit cache clearing, fixing ir.translation instead
bzr revid: xmo@openerp.com-20131024131613-6hebrxi5dbbs82ph
2013-10-24 15:16:13 +02:00
Xavier Morel c38f729543 [FIX] auth of pagenew
bzr revid: xmo@openerp.com-20131024111710-5ghadng4we3p2cgg
2013-10-24 13:17:10 +02:00
Xavier Morel b702a9887c [IMP] remove /website/attachment, make attachments go through /website/image
bzr revid: xmo@openerp.com-20131024103401-yik03je9qm1ge0tp
2013-10-24 12:34:01 +02:00
Thibault Delavallée fc513a2a1f [IMP] website: publish management
'Edit' using a wrench is removed, replaced by an entry in the options menu.
The button text size is also increased, because currently in xsmall it is not
matching the website look.

Also re-indented the template.

bzr revid: tde@openerp.com-20131024093420-3vye9g2j11b3y602
2013-10-24 11:34:20 +02:00
Xavier Morel 1eb3d3269c [ADD] parsing of localized date & datetime t-fields
turns out we use a bunch of them in the events section thing

bzr revid: xmo@openerp.com-20131023145729-tglusl27mt6ajwzn
2013-10-23 16:57:29 +02:00