Commit Graph
247 Commits
Author SHA1 Message Date
Fabien Meghazi df63fcba81 [MERGE] upstream
bzr revid: fme@openerp.com-20140122102232-77lvvwpzet58sa7p
2014-01-22 11:22:32 +01:00
Christophe Matthieu d67fa22ea1 [FIX] website_event: test tour
bzr revid: chm@openerp.com-20140121172708-bht8omflwve3kibz
2014-01-21 18:27:08 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
2014-01-21 13:39:12 +01:00
Fabien Meghazi c1f0fb5ed1 [MERGE] upstream
bzr revid: fme@openerp.com-20140120161145-ntxx6y01vekk3tg2
2014-01-20 17:11:45 +01:00
Fabien Meghazi 14bb6060d7 [REM] Removed @website.route() decorator
Need trunk-website-al Rev#5151

bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
2014-01-20 16:37:33 +01:00
Christophe Matthieu 5d78f8f064 [FIX] website: import full_path
bzr revid: chm@openerp.com-20140121100524-elxz0n8qfve1iefr
2014-01-21 11:05:24 +01:00
Christophe Matthieu 849fc19aa1 [FIX] website: import openerp.addons.website_blog.tests
bzr revid: chm@openerp.com-20140121093415-ork5jis48mmq4dp8
2014-01-21 10:34:15 +01:00
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
2014-01-20 19:26:43 +01:00
Christophe Matthieu cf79ae7635 [FIX] website: access for portal user
bzr revid: chm@openerp.com-20140117154648-sxfisxqcv8o3fvzt
2014-01-17 16:46:48 +01:00
Christophe Matthieu 163364e5fe [FIX] website_event: event.event.ticket access right
bzr revid: chm@openerp.com-20140117143752-0jpkcbhjsyavl08j
2014-01-17 15:37:52 +01:00
Christophe Matthieu 4ff74cbf99 [IMP] website: editor menus is displayed in function of users groups (event, blog...)
bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
2014-01-16 19:05:35 +01:00
Fabien Meghazi 96c79572f8 [FIX] test ui should use /login route for auto login
bzr revid: fme@openerp.com-20140115161318-v8ksw0u0u1mpgn0x
2014-01-15 17:13:18 +01:00
Christophe Matthieu 52e4cb3f99 [IMP] website_job: no job offer found message, better template, and fix type
bzr revid: chm@openerp.com-20140115160219-mqh0sx869zfwk1g7
2014-01-15 17:02:19 +01:00
Christophe Matthieu 025a94ad2f [IMP] website_event: no event found message
bzr revid: chm@openerp.com-20140115154941-cz9ijtlaf961p72g
2014-01-15 16:49:41 +01:00
ddm@openerp.com 44adcd9f2d [FIX] ugly race condition hack
bzr revid: ddm@openerp.com-20140110132734-n0ip9wyinw19c76e
2014-01-10 14:27:34 +01:00
ddm@openerp.com 715f5355e0 [FIX] remove ugly non-fix
bzr revid: ddm@openerp.com-20140109134446-1hy61f37dqclt3g4
2014-01-09 14:44:46 +01:00
ddm@openerp.com 38ffa6f93e [IMP] event UI tests
bzr revid: ddm@openerp.com-20140108171225-tzarqg6xy8a7sez3
2014-01-08 18:12:25 +01:00
Christophe Matthieu 1f5b6ecf17 [FIX] website_event: filter on events
bzr revid: chm@openerp.com-20140108130645-7m13ssq3jlbehs5h
2014-01-08 14:06:45 +01:00
Christophe Matthieu 3f0f6b820b [FIX] website: Access rights and Access for: website_crm_partner_assign, website_customer, website_event, website_event_track, website_membership, website_partner, website_sale
bzr revid: chm@openerp.com-20140107135933-h622wxwfhwoulg7q
2014-01-07 14:59:33 +01:00
Christophe Matthieu c4ea06327c [FIX] website: typo
bzr revid: chm@openerp.com-20140106103855-vjd6ro0w4m0xkfrc
2014-01-06 11:38:55 +01:00
ddm 3a8cc41c8e [FIX] Fixed popovers in event tour
bzr revid: ddm@openerp.com-20131231102916-et2mbmtym6mm604s
2013-12-31 11:29:16 +01:00
Thibault Delavallée c1fb818999 [REV] Reverted commit 10363
bzr revid: tde@openerp.com-20131224151201-g8luax3t431t7ky4
2013-12-24 16:12:01 +01:00
Thibault Delavallée f5f055340f [MERGE] Merged demo homepage improvements
bzr revid: tde@openerp.com-20131224100630-x0r20pj1v2y1g5pg
2013-12-24 11:06:30 +01:00
Paramjit Singh Sahota 18d8368ee1 [MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6
2013-12-24 11:01:25 +05:30
Fabien Pinckaers 0851024ede [IMP] Removing default application of filters
bzr revid: fp@tinyerp.com-20131222224753-6nekdnpihl2c9qfc
2013-12-22 23:47:53 +01:00
Fabien Pinckaers e52b050b2e [IMP] Removing default application of filters
bzr revid: fp@tinyerp.com-20131222224604-8hun4wxupejuglo4
2013-12-22 23:46:04 +01:00
Thibault Delavallée 7a564f261e [IMP] [FIX] [ADD] website_sale, website_sale_delivery: delivery + ecommerce code cleaning
- added a website_order_line on sale.order model, that are the lines to display
and use in the front-end. This allows to display only products (and not delivery
costs), and to have a correct badge for the number od products.
- cleaned ecommerce website code and method name. Still some cleaning to do
I think.
- fixed some issues in partner and shipping info management, now using CheckoutInfo
more cleanly
- fixed the process of choosing the carrier

bzr revid: tde@openerp.com-20131218132150-f4br0099p2caf43i
2013-12-18 14:21:50 +01:00
Fabien Meghazi defdd6e565 [ADD] main_object for events
bzr revid: fme@openerp.com-20131216110234-iup1hiz57b68j8g7
2013-12-16 12:02:34 +01:00
ddm ff25c7a85a [FIX] Main object for events (promote)
bzr revid: ddm@openerp.com-20131216105403-0x6p1gg4ef0zjvid
2013-12-16 11:54:03 +01:00
Christophe Matthieu 6d6693c8a3 [FIX] website_event: add to cart
bzr revid: chm@openerp.com-20131212121734-zfz35ve6x2m99rar
2013-12-12 13:17:34 +01:00
Christophe Matthieu ee370a837c [IMP] website: Removing unnecessary spaces at beginning of line
bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
2013-12-12 11:58:21 +01:00
Christophe Matthieu fa217bba33 [IMP] website_sale, website_event: layout
bzr revid: chm@openerp.com-20131212101258-tzzyyuz74ysmfn6s
2013-12-12 11:12:58 +01:00
ddm 5c36fdc60c [FIX] Fix publish in blog+event tutorials
bzr revid: ddm@openerp.com-20131212101134-vhppxic7pz45ox7l
2013-12-12 11:11:34 +01:00
ddm 64794a8c3b [FIX] Restore tutorial on module install
bzr revid: ddm@openerp.com-20131212095950-3675vfd0tjpzlsug
2013-12-12 10:59:50 +01:00
ddm 9e28c3f96c [FIX] Event tour
bzr revid: ddm@openerp.com-20131211182010-foz36z3jrvnkc67v
2013-12-11 19:20:10 +01:00
Christophe Matthieu 17e132bb01 [FIX] website: order of script for editor and tours
bzr revid: chm@openerp.com-20131211153345-6hand0upjjqba85f
2013-12-11 16:33:45 +01:00
Christophe Matthieu 5217c8ebe8 [IMP] website: remove secure_layout. Inherit with groups for js editor
bzr revid: chm@openerp.com-20131211144402-lpanprv3u362qvd7
2013-12-11 15:44:02 +01:00
Christophe Matthieu 8f2f589561 [FIX] website: typo, partner order, event demo data
bzr revid: chm@openerp.com-20131211112617-11kdph7cieews0y8
2013-12-11 12:26:17 +01:00
ddm 6893a6ab15 [IMP] Improve automated tests
bzr revid: ddm@openerp.com-20131210163522-p23703mcu8pfdsl0
2013-12-10 17:35:22 +01:00
ddm 5f0fcfb9be [IMP] Tour improvements => automated tests
bzr revid: ddm@openerp.com-20131209112534-3ysihjgm20jj3d9k
2013-12-09 12:25:34 +01:00
ddm 74ed3d2e5f [FIX] Make tour declarative to enable autotests
bzr revid: ddm@openerp.com-20131206133239-mrhduf2fi0sm8sh7
2013-12-06 14:32:39 +01:00
Christophe Matthieu d0b813a016 [IMP] fix website_hr_recruitment, website_event, and create contact qweb widget
bzr revid: chm@openerp.com-20131206133003-to4lbgoynvviifq5
2013-12-06 14:30:03 +01:00
Christophe Matthieu b2bd96340f [FIX] website: create button and help (fix inherit_id in modules)
bzr revid: chm@openerp.com-20131205165340-ty0xybh7uz859gnm
2013-12-05 17:53:40 +01:00
Fabien Meghazi 7a3b490f46 [IMP] preload records and throw 404 if not exists for blog, event, product
bzr revid: fme@openerp.com-20131205155450-y6joi29l2cn9amkn
2013-12-05 16:54:50 +01:00
Christophe Matthieu b1765e2834 [IMP] website: slip layout
bzr revid: chm@openerp.com-20131204161754-5dq4bt7gghnk878c
2013-12-04 17:17:54 +01:00
Fabien Meghazi 6745bb3fed [FIX] font-awesome icons migration to v4
bzr revid: fme@openerp.com-20131203141632-ubc35ca7d4l80s7m
2013-12-03 15:16:32 +01:00
Fabien Meghazi a7738ab2ea [IMP] Reorder menu
bzr revid: fme@openerp.com-20131203120910-yv82gwref4uikn7b
2013-12-03 13:09:10 +01:00
ddm 63f63ef470 [IMP] Tour: advance on any snippet drop
bzr revid: ddm@openerp.com-20131203094704-h995gaoo7onhlqpv
2013-12-03 10:47:04 +01:00
Fabien Meghazi d376bd55ca [IMP] url slug in templates
bzr revid: fme@openerp.com-20131202125723-aw66fidrinaolgyo
2013-12-02 13:57:23 +01:00
Christophe Matthieu c1f306dd96 [WIP] website: add website_button widget in backend to publish and go back to the website. (need bootstrap 3 for layout)
bzr revid: chm@openerp.com-20131202124504-78zvm5t0p1hpsn53
2013-12-02 13:45:04 +01:00