72ff6562b6
[FIX] website_sale: fixed remaining TREE tag due to conflict
...
bzr revid: tde@openerp.com-20131113104333-5ulxae6vbcgc5al6
2013-11-13 11:43:33 +01:00
ac54e05a21
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131113093009-w6jih5xosequqowh
2013-11-13 10:30:09 +01:00
8a48f25446
[FIX] website_sale: list_view
...
bzr revid: chm@openerp.com-20131112172811-yc0tn0gfz2pvwpb0
2013-11-12 18:28:11 +01:00
557d887496
[IMP] preprocess static @href|src|action, static url doesn't need t-href anymore
...
you need to pull server branch
bzr revid: fme@openerp.com-20131112144442-y9bw5q6kkoym8o1i
2013-11-12 15:44:42 +01:00
35619dfe12
[MERGE] Sync with website-al main branch
...
bzr revid: tde@openerp.com-20131107172339-zjpa2xmtf2xql9eu
2013-11-07 18:23:39 +01:00
ec2a9776ab
[IMP] website_sale: move attributes under add to cart button in product view
...
bzr revid: chm@openerp.com-20131107164522-uauyelduq7o4sfj3
2013-11-07 17:45:22 +01:00
dd497b0ef2
[IMP] website_sale: change name of suggested product template
...
bzr revid: chm@openerp.com-20131107162916-ocm5q101psem5j2v
2013-11-07 17:29:16 +01:00
4ff0a207f6
[IMP] website_sale: some change for attributes
...
bzr revid: chm@openerp.com-20131107162101-82tl3ibbhxkbgjro
2013-11-07 17:21:01 +01:00
28b932a40d
[FIX] website_sale: highlight category
...
bzr revid: chm@openerp.com-20131107144828-0wa4vexo5nj41uh5
2013-11-07 15:48:28 +01:00
a4cea5c7eb
[IMP] website_sale: user can display filters without categories
...
bzr revid: chm@openerp.com-20131107143959-551ti1ces04toes0
2013-11-07 15:39:59 +01:00
821f703125
[IMP] use single template for search box in eCommerce
...
bzr revid: ddm@openerp.com-20131107135528-0hovrmuxk51xl8wo
2013-11-07 14:55:28 +01:00
25f6d1c83f
[IMP] website_sale: header change for user customization
...
bzr revid: chm@openerp.com-20131107135306-8jpe0gl4iqmgl51k
2013-11-07 14:53:06 +01:00
9ae2008115
[IMP] website: phone view, hide options and editor buttons
...
bzr revid: chm@openerp.com-20131107112533-o33ok38tbayrdbke
2013-11-07 12:25:33 +01:00
2ae05fb8de
[IMP] website_sale: display message when search returns no result
...
bzr revid: chm@openerp.com-20131107102935-r9212sq6avbhy2o2
2013-11-07 11:29:35 +01:00
b7a4c6d3f0
[FIX] eCommerve search + categories & filters
...
Hopefully this completely solves it. More testing required...
bzr revid: ddm@openerp.com-20131106175743-xxxswsc0vs5fh3x5
2013-11-06 18:57:43 +01:00
5f41d10ab5
[FIX] product links when browsing categories
...
bzr revid: ddm@openerp.com-20131105162558-4e1yua2hipvf5cly
2013-11-05 17:25:58 +01:00
b34bb11b2d
[FIX] avoid building urls manually if possible
...
bzr revid: ddm@openerp.com-20131105155627-ahyo9av7wh1aa7jl
2013-11-05 16:56:27 +01:00
fb5ae3cabf
[FIX] website_sale: mycart when the user haven't sale order
...
bzr revid: chm@openerp.com-20131105155410-pel99sbzka27zl4o
2013-11-05 16:54:10 +01:00
5ce1bfdddf
[FIX] more templates which aren't actually pages
...
bzr revid: xmo@openerp.com-20131105151404-olp8wvdqx9yxuxj9
2013-11-05 16:14:04 +01:00
bf602c18b7
[FIX] cart template is not a page
...
bzr revid: xmo@openerp.com-20131105094953-fdmm1j3k4z1abg92
2013-11-05 10:49:53 +01:00
f318f99825
[IMP] website_sale: attributes/filter, fix access right, add default value for filter (for custom user ecommerce with category,label...)
...
bzr revid: chm@openerp.com-20131105150928-ps01ziqnfgd9hu46
2013-11-05 16:09:28 +01:00
7f5a60f13c
[FIX] website_sale: update total when the user change a product quantity
...
bzr revid: chm@openerp.com-20131105132747-figm8j11d6ul1v0k
2013-11-05 14:27:47 +01:00
420cdb13a2
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131031102749-mzn5bqcunwuo1hsf
2013-10-31 11:27:49 +01:00
90814d781a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131030144813-xmjb6i9ayv23aqyi
2013-10-30 15:48:13 +01:00
3a1ed80b41
[FIX] creation of new products from products listing page
...
* fix creation controller to redirect to the id of the *product
template* implicitly created when the product is created, not to the
product, as "product" URLs actually display information about a
product template
* ensure the controller is only POST-ed to, not GET
* fix button to POST the creation request (use form and actual button,
not link)
* fix template (foreach -> t-foreach)
bzr revid: xmo@openerp.com-20131030133019-5pq3qekwu465x1k6
2013-10-30 14:30:19 +01:00
12801a8cbc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
2196a69a61
[FIX] eCommerce: duplicate product price
...
bzr revid: ddm@openerp.com-20131028145043-ek0rnvatu2ab4avx
2013-10-28 15:50:43 +01:00
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
15ec0ebb62
[MERGE] Sync with website-al
...
bzr revid: tde@openerp.com-20131024131445-zaxaw5rpu681gwoz
2013-10-24 15:14:45 +02:00
0467c8a5ab
[FIX] [WIP] website_sale: fix crash when having product templates without variant.
...
probably it should not be displayed, but as there does not seem to exist any
clue about what the controller / view should do, I added some protections.
[DOC] added some comments because some methods seems quite weird.
bzr revid: tde@openerp.com-20131024110453-uj4xnrtwst0fdcrb
2013-10-24 13:04:53 +02:00
3ff98b4050
[IMP] eCommerce: remove duplicate button
...
bzr revid: ddm@openerp.com-20131024092438-aelgmzbcpvwmf33p
2013-10-24 11:24:38 +02:00
bffc22b391
[IMP] Consistency
...
bzr revid: ddm@openerp.com-20131024092057-p26cnzy9q37zuc6s
2013-10-24 11:20:57 +02:00
d5379f3b7c
[FIX] eCommerce cart layout
...
Fixed 'Continue Shopping' button spacing when cart empty
bzr revid: ddm@openerp.com-20131023154639-j7385c9oaka2k3g1
2013-10-23 17:46:39 +02:00
7994ceb43d
[IMP] eCommerce: layout improvements
...
bzr revid: ddm@openerp.com-20131022142804-58oabf37w3zsg2pg
2013-10-22 16:28:04 +02:00
1888dea9b4
[IMP] eCommerce: Checkout summary moved to left (cf. apr's review)
...
bzr revid: ddm@openerp.com-20131022140119-82ex7kvrzeqc7jri
2013-10-22 16:01:19 +02:00
291ffdb515
[CMS] eCommerce: remove product list title (cf. apr's review)
...
bzr revid: ddm@openerp.com-20131022134409-g1qi25a96jvzby8s
2013-10-22 15:44:09 +02:00
31ba0b8b5a
[FIX] image t-field lost during a merge
...
bzr revid: xmo@openerp.com-20131022105955-i550clo5snyvnv26
2013-10-22 12:59:55 +02:00
2771c47379
[FIX] Ace: proper template naming
...
bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
2013-10-21 15:39:57 +02:00
666387a274
[WIP] payment_acquirer
...
bzr revid: chm@openerp.com-20131018111530-tjyhp3cu1qlabhij
2013-10-18 13:15:30 +02:00
36675c3663
[WIP] payment_acquirer
...
bzr revid: chm@openerp.com-20131017110046-1b5pmju5q8x3gaz5
2013-10-17 13:00:46 +02:00
6e4c0f9068
[WIP] website_sale use payment_acquirer
...
bzr revid: chm@openerp.com-20131016150837-1zo80gd1pmlvy2im
2013-10-16 17:08:37 +02:00
1cec2a5b6f
[REM] Obsolete route /admin
...
bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
2013-10-16 11:32:48 +02:00
f06566baa1
[IMP] website_sale: remove some args in t-keep-query xml attr
...
bzr revid: chm@openerp.com-20131015083010-sxslddq0l8hk174g
2013-10-15 10:30:10 +02:00
e6a831a1a2
[IMP] website: add facets/attributes on product template. Displayed in the left category menu in the ecommerce
...
bzr revid: chm@openerp.com-20131015082726-6f1tkyhoaju27p85
2013-10-15 10:27:26 +02:00
853cb1dd26
[MERGE] SEO meta data persistence. New template title handling
...
bzr revid: fme@openerp.com-20131014151509-6bnux7ncvqmy3tea
2013-10-14 17:15:09 +02:00
2cdaa44b9e
[FIX] wrong end tag during merge
...
bzr revid: xmo@openerp.com-20131014095820-njd1v48lgljrj2q0
2013-10-14 11:58:20 +02:00
631b1cbc09
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131014095642-qxl7ceqptfsj215l
2013-10-14 11:56:42 +02:00
2e352ce187
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
2013-10-14 10:54:59 +02:00
a21459d79f
[IMP] demo data
...
bzr revid: fp@openerp.com-20131013190105-5mwo51w7v62tkm89
2013-10-13 21:01:05 +02:00
1ad6132624
[IMP] span[text-decoration] -> del
...
bzr revid: xmo@openerp.com-20131011135550-q4s83cgbb7f8qgof
2013-10-11 15:55:50 +02:00
1208a5bcf5
[ADD] monetary widget use in website_sale
...
bzr revid: xmo@openerp.com-20131011131147-plqmc1r5ok4tcrge
2013-10-11 15:11:47 +02:00
6a37c2fb82
[IMP] Use view 'name' as title for main_object of type ir.ui.view
...
bzr revid: fme@openerp.com-20131010145525-417zbwltyqzbjolz
2013-10-10 16:55:25 +02:00
9b40e849d6
[WIP] new title managment in templates. expose main_object for seo
...
bzr revid: fme@openerp.com-20131010132907-xxmg96qmcw9j5f2d
2013-10-10 15:29:07 +02:00
7cfefd4795
[IMP] website_sale: small change in checkout view
...
bzr revid: chm@openerp.com-20131010085141-w6dfki153ob8ke4s
2013-10-10 10:51:41 +02:00
af5cc9c02a
[FIX] website_view: css price with position absolute for description
...
bzr revid: chm@openerp.com-20131009135914-nq5sr4qi7dc5wbsv
2013-10-09 15:59:14 +02:00
41bb68a87b
[FIX] website_view: css responsible < 600
...
bzr revid: chm@openerp.com-20131009134016-chus09j1h0zogbo2
2013-10-09 15:40:16 +02:00
6de0a5d34d
[FIX] website_sale: change view for new qweb security access
...
bzr revid: chm@openerp.com-20131009124848-1n3eiy7dbew6j2js
2013-10-09 14:48:48 +02:00
426757ad92
[ADD] linked image fields
...
bzr revid: xmo@openerp.com-20131008120456-r8tqd5iyq1zfsdvi
2013-10-08 14:04:56 +02:00
d96072fc3a
[IMP] website_sale: on error, label in red color
...
bzr revid: chm@openerp.com-20131003112720-maxy73xo323s3vgl
2013-10-03 13:27:20 +02:00
f5262b9c5c
[IMP] website_sale: icon for policies and Secure Payment; fix my cart label
...
bzr revid: chm@openerp.com-20131003112354-l146jewjuzhlzt7p
2013-10-03 13:23:54 +02:00
6f454c6b33
[IMP] website_sale: shop/mycart, My Cart, in the top
...
bzr revid: chm@openerp.com-20131003110411-9a1536dqwhuhabq7
2013-10-03 13:04:11 +02:00
16a3aa522b
[IMP] website_sale: variant change the price
...
bzr revid: chm@openerp.com-20131003104701-28mvvte5wa6q8mt7
2013-10-03 12:47:01 +02:00
adef9bc3df
[FIX] website_sale: edit, suggested products
...
bzr revid: chm@openerp.com-20131002162810-cjo5r9itmuc0x71o
2013-10-02 18:28:10 +02:00
61d6d2dacd
[FIX] crappy publisher change
...
bzr revid: chm@openerp.com-20131002154528-yno7lqkuddidjbis
2013-10-02 17:45:28 +02:00
2ae84ed2e2
[FIX] website_sale: access right for public access for price
...
bzr revid: chm@openerp.com-20131002083018-gavt68w57t9wneu5
2013-10-02 10:30:18 +02:00
d2a743cbde
[IMP] website_sale: context, routes
...
bzr revid: chm@openerp.com-20131002071239-4glhz7g8iz1r9gea
2013-10-02 09:12:39 +02:00
aea15f9f6f
[IMP] website snippet: new change background
...
bzr revid: chm@openerp.com-20131001120335-kwyyodiwturplyfy
2013-10-01 14:03:35 +02:00
08a6ca9d21
[FIX] website_sale: checkout view for public user
...
bzr revid: chm@openerp.com-20131001095117-q9ykymxb2haibi65
2013-10-01 11:51:17 +02:00
8a9938333b
[FIX] website_sale: responsible design of grid of products for firefox
...
bzr revid: chm@openerp.com-20131001090800-i97ojnj2lmi2hg4v
2013-10-01 11:08:00 +02:00
635999b9e9
[IMP] top badge for my cart
...
bzr revid: fp@tinyerp.com-20131001072057-m3551lf4l68b2w1o
2013-10-01 09:20:57 +02:00
656fcad3eb
[IMP] Payment Process Design
...
bzr revid: fp@openerp.com-20130930225105-0dses1tdzm2iysfp
2013-10-01 00:51:05 +02:00
27c9ab5737
[FIX] typo
...
bzr revid: fp@tinyerp.com-20130930083759-gjc0gnv96w0n4kju
2013-09-30 10:37:59 +02:00
3430cef9a4
[IMP] design shop
...
bzr revid: fp@openerp.com-20130929160635-ye56hhpj5ycbzltt
2013-09-29 18:06:35 +02:00
2ecb96c061
[IMP] html fix: row missing
...
bzr revid: fp@openerp.com-20130929154204-xodhyzau24ms0wr6
2013-09-29 17:42:04 +02:00
97c0c0d641
[IMP] Promo Ribbon for shop
...
bzr revid: fp@openerp.com-20130929153420-k01nqjj234tp6ovc
2013-09-29 17:34:20 +02:00
a5ac76bc2b
[FIX] website_sale: context pricelist and add demo data for discount
...
bzr revid: chm@openerp.com-20130927144636-hha4luhu6v4lvyc0
2013-09-27 16:46:36 +02:00
4950703cd3
[FIX] crappy view
...
bzr revid: xmo@openerp.com-20130927124406-5zftzi5g0m0g1lds
2013-09-27 14:44:06 +02:00
da8c4e1be1
[IMP] website_sale: sweeter style and size edition on view 'list'
...
bzr revid: chm@openerp.com-20130927103148-nwm0amgkn8buk4dd
2013-09-27 12:31:48 +02:00
73faaabdc8
[IMP] Product Sale Views Cleanup
...
bzr revid: fp@openerp.com-20130927054910-lppoqz4hxmomckeg
2013-09-27 07:49:10 +02:00
e7d55014a4
[MERGE] multilang
...
bzr revid: fme@openerp.com-20130926165324-2jfo9s8q3u4teor1
2013-09-26 18:53:24 +02:00
6d47823121
[IMP] website_sale multilang
...
bzr revid: fme@openerp.com-20130926145448-lvrfd6ma755jf549
2013-09-26 16:54:48 +02:00
9b538b3744
[FIX] website_sale: add to cart
...
bzr revid: chm@openerp.com-20130926140750-tmp5wexrpbkipt0w
2013-09-26 16:07:50 +02:00
9f58a5c082
[IMP] website_sale: add styles selector on product
...
bzr revid: chm@openerp.com-20130926130954-fxojimjdinepgpjq
2013-09-26 15:09:54 +02:00
c66c5d5b6a
[IMP] change publish button, fix website_sale product order + push top/bottom
...
bzr revid: chm@openerp.com-20130926111854-22ikjc2enj0hi0qu
2013-09-26 13:18:54 +02:00
b05cd31b59
[FIX] website_sale: add_to_cart inherit
...
bzr revid: chm@openerp.com-20130926091825-bfykta69vl3knbxh
2013-09-26 11:18:25 +02:00
cf79e61c36
[FIX] website_sale: inherit_option_id for list view and category view
...
bzr revid: chm@openerp.com-20130926075650-blc9d3fyj3gbcgoq
2013-09-26 09:56:50 +02:00
cd5a77788d
[IMP] website_sale: method get_bin_packing_products or get_products call inside the view
...
bzr revid: chm@openerp.com-20130926074644-d3bjd8te6ks82u7a
2013-09-26 09:46:44 +02:00
b8f1ffaafc
[IMP] website_sale: bin packing product for sweet layout
...
bzr revid: chm@openerp.com-20130925180538-qnq699csoof8jrt5
2013-09-25 20:05:38 +02:00
aae0a815d2
[IMP] replace instances of t[@t-field], they're a pain in the ass
...
bzr revid: xmo@openerp.com-20130925112803-ya54yb2kwdodj3y5
2013-09-25 13:28:03 +02:00
bd16487da1
[IMP] website_sale: change css and demo data
...
bzr revid: chm@openerp.com-20130924152639-v6hr0laatjcbxe39
2013-09-24 17:26:39 +02:00
0c040ae237
[MERGE] [IMP] [DEMO] event, website_event improvements
...
[IMP] [DEMO] event: cleaned demo data. Also renamed note field into description, and moved it out of groups_noone, in order to effectively use it to hold the html description of the event.
[IMP] event_sale: cleaned demo data
[ADD] website_mail: added mail_thread file that hold website_message_ids field, holding published comments. Use it for public objects. However as inheritance seems to be still buggy, this field is redefined in website_blog and website_event (at least) to be able to use it. Remove specific declarations when the bug is fixed.
[IMP] [ADD] website_event:
- added skeleton directory for doc
- added skeleton directory for tests
- added dependency towards website_mail module, to benefit from follow feature
- cleaned demo data
- use website_mail for follow / unfollow mechanism
- added website_message_ids field, use it in view
- some improvements in website view (title, event description)
[FIX] website_sales: somewhat fixed partner information fetch in checkout; whole code of those controllers is really obfuscated and very dubious.
bzr revid: tde@openerp.com-20130924130517-hzi2qm108ec65viq
2013-09-24 15:05:17 +02:00
ac2384ee47
[IMP] website_sale: basic cleaning of checkout method about getting partner data. In view, do not use get when the data, use brackets, this helps tracking issues in your process.
...
bzr revid: tde@openerp.com-20130924124253-gld6lwzm3dc8bhwn
2013-09-24 14:42:53 +02:00
8b06e72716
[FIX] block-level links
...
bzr revid: xmo@openerp.com-20130924112402-twcgdh0b18vzdwru
2013-09-24 13:24:02 +02:00
51fae1fcf8
[IMP] website_sale display only non empty category in non editable mode
...
bzr revid: chm@openerp.com-20130924102834-op0bm475w20x35j4
2013-09-24 12:28:34 +02:00
458121ab5c
[IMP] website_sale: when the products is displayed from a search, use the same size x,y for all products
...
bzr revid: chm@openerp.com-20130924084100-y6pgvislcpdo9izx
2013-09-24 10:41:00 +02:00
b1cf178978
[MERGE] website_sale: add layout options and css
...
bzr revid: chm@openerp.com-20130924083349-1woicpx50668272g
2013-09-24 10:33:49 +02:00
9bb4af7d9f
[IMP] website snippet: add comment for auto set snippet and remove data-snippet-id in website_sale view
...
bzr revid: chm@openerp.com-20130924082423-ylzeprl3w4tlb83e
2013-09-24 10:24:23 +02:00
8fc3877646
[IMP] Improved code to make small way to change to list view rather than writing the whole product template code twice.
...
bzr revid: psa@tinyerp.com-20130924064617-40ruht7l15c08p7y
2013-09-24 12:16:17 +05:30
c931f60bd3
[MERGE] MERGED trunk-website-al
...
bzr revid: psa@tinyerp.com-20130923133137-heq2s7r9hjlm150g
2013-09-23 19:01:37 +05:30
de41937cfb
[IMP] Improved the template id.
...
bzr revid: psa@tinyerp.com-20130923130238-4it782jesm211t6w
2013-09-23 18:32:38 +05:30
f06f48ce52
[IMP] added list grid for shop.
...
bzr revid: psa@tinyerp.com-20130923124752-dhg0aao3diuh1isn
2013-09-23 18:17:52 +05:30
89fc31a633
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
71ab933988
More customizable options:
...
Add to Cart must be in a inherit_option_id
Product sale_description must be in a inherit_option_id
bzr revid: psa@tinyerp.com-20130923111441-pxhn2u2ex1oh1cws
2013-09-23 16:44:41 +05:30
765aa3587f
[IMP] Missing title
...
bzr revid: fp@openerp.com-20130922205737-xef9mf20oanmsdgn
2013-09-22 22:57:37 +02:00
b705f1e627
[IMP] eCommerce Layouts
...
bzr revid: fp@openerp.com-20130922193356-gqfyqc9s8dg0wg8g
2013-09-22 21:33:56 +02:00
512a9970df
[IMP] Shop Improvements
...
bzr revid: fp@openerp.com-20130922172727-9zvivms9w9v5hv2q
2013-09-22 19:27:27 +02:00
a2376d8f08
[iMP] shops
...
bzr revid: fp@openerp.com-20130921233056-sy0oe5mzyetyn1lq
2013-09-22 01:30:56 +02:00
d391d7b67d
[IMP] Shop better design
...
bzr revid: fp@openerp.com-20130921232827-2wlkjwh48547jwue
2013-09-22 01:28:27 +02:00
1764bb9bde
[IMP] product categories hidden by default
...
bzr revid: fp@openerp.com-20130921061651-01mulu423e22kf5s
2013-09-21 08:16:51 +02:00
3dadd6e729
Added product snippet for test and added the data-snippet-id in product of resizing product.
...
bzr revid: psa@tinyerp.com-20130920070643-cmdq57j04hgx764c
2013-09-20 12:36:43 +05:30
674c2d7c33
[FIX] block-level link, incompatible with RTE
...
bzr revid: xmo@openerp.com-20130919121541-mj2l9o8wmxmk2l9v
2013-09-19 14:15:41 +02:00
355caa6580
Merged lp:~openerp-dev/openobject-addons/trunk-website-shop-fp
...
bzr revid: psa@tinyerp.com-20130919100105-kcl6ia2bwe5acjv0
2013-09-19 15:31:05 +05:30
b8c94e2957
[IMP] empty zone CSS
...
bzr revid: fp@tinyerp.com-20130919075309-irpuwo776frfwb12
2013-09-19 09:53:09 +02:00
2c7d428aee
[IMP] shop
...
bzr revid: fp@openerp.com-20130919055425-6puq8f4e7bawkyan
2013-09-19 07:54:25 +02:00
e0662b11d0
[FIX] wrap the wrapper in order to allow RTE on all of the page (except the toolbar)
...
CKEditor does not work directly on body, and it's a bad idea anyway
(editing the edition toolbar won't end well).
A big wrapper around all of the page's content can be used as RTE hook
to give access to the body as well as the header and footers.
bzr revid: xmo@openerp.com-20130918145028-6ppi9sro2un0quh5
2013-09-18 16:50:28 +02:00
47e3a0604c
[FIX] change block-level link to inline
...
Although HTML5 has added a concept of "transparent content model"[0]
where elements (such as links) can be block-level or inline depending
on their context (amongst a number of other dynamic content model
properties), most RTEs based their validation on a static DTD-type
content model and haven't been updated yet.
That's the case of CKEditor (and tinymce and aloha, it seems), and the
validator breaks block-level links. So don't use them.
[0] http://www.w3.org/TR/2011/WD-html5-20110525/content-models.html#transparent-content-models
bzr revid: xmo@openerp.com-20130917135656-g58xnx7f2avcuh9d
2013-09-17 15:56:56 +02:00
d29da6144d
[IMP] make products filler uneditable to avoid confusion
...
bzr revid: xmo@openerp.com-20130917131353-sn5mhmcvkp0l2dcz
2013-09-17 15:13:53 +02:00
19b0fa5a6a
[IMP] placeholder for inline fields is very hard to see when the field is empty, block-level fields are much better in that situation
...
bzr revid: xmo@openerp.com-20130917130126-s5lgxjv9ezefek1u
2013-09-17 15:01:26 +02:00
364995c7f4
[IMP] oe_structure, cleaning of wrap
...
bzr revid: fp@openerp.com-20130915172537-jbd04hmgqvzz71qb
2013-09-15 19:25:37 +02:00
19caff669a
[IMP] snippets misc improvements
...
bzr revid: fp@openerp.com-20130915110427-2r2fyzuthmlkh5ua
2013-09-15 13:04:27 +02:00
b7f3383c3c
[IMP] title node selection
...
bzr revid: fp@openerp.com-20130914221301-gnt115hzjv61slpe
2013-09-15 00:13:01 +02:00
922053531e
[MERGE] from parent
...
bzr revid: xmo@openerp.com-20130912141026-mmmyg91nwlzccr0g
2013-09-12 16:10:26 +02:00
4f93622697
[IMP] website: snippet editor and building block
...
bzr revid: chm@openerp.com-20130911130045-kpya856mndrao0fi
2013-09-11 15:00:45 +02:00
b3898c8d23
[IMP] website: snippet editor and building block
...
bzr revid: chm@openerp.com-20130911125632-ekcxa8b4lu5ml4eq
2013-09-11 14:56:32 +02:00
f7a14f2830
[HIDE] issue with ckeditor not handling block-level links
...
Instead of keeping them where they are, ckeditor propagates links to
closest inline elements (as pre-HTML5 parsing did), which breaks
e.g. product headers.
bzr revid: xmo@openerp.com-20130911084305-b5v36wlni620m7r3
2013-09-11 10:43:05 +02:00
c4a39548b2
[IMP] better name for global rendering variables
...
bzr revid: fme@openerp.com-20130910141502-ptz2vj1jckvh7urq
2013-09-10 16:15:02 +02:00
0e82448ed8
[IMP] Refactor code + WIP multiwebsite
...
bzr revid: fme@openerp.com-20130910134133-esdgbhbtt8eguapk
2013-09-10 15:41:33 +02:00
857e7a4f56
[FIX] make product prices editable (kinda-sorta)
...
bzr revid: xmo@openerp.com-20130910133123-h0dnnu076a0zeftw
2013-09-10 15:31:23 +02:00
f61e65539e
[IMP] website: auto open editor when create new product (use ?unable_editor in url)
...
bzr revid: chm@openerp.com-20130910122646-ug8dn61rqgbm3eq3
2013-09-10 14:26:46 +02:00
cb8bdad1ec
[FIX] website_sale: reduce qty
...
bzr revid: chm@openerp.com-20130910115159-qdmhi4rdmxqz5cm3
2013-09-10 13:51:59 +02:00
5943962ec1
[FIX] website_sale: display error with bootstrap 3
...
bzr revid: chm@openerp.com-20130905095933-1f6qabic7zeafn7a
2013-09-05 11:59:33 +02:00
7fee8f5609
[IMP] website: change footer xml
...
bzr revid: chm@openerp.com-20130905092927-2aixeyk1z5ot4oku
2013-09-05 11:29:27 +02:00
20e0db456f
[IMP] wwebsite: add option background and style in snippets carousel
...
bzr revid: chm@openerp.com-20130904140138-tvt640suoiln13fx
2013-09-04 16:01:38 +02:00
3e1302ee73
[IMP] website_sale: inherit product view to display more informations about website published products
...
bzr revid: chm@openerp.com-20130904095405-rrbt0ckedpg7ul90
2013-09-04 11:54:05 +02:00
7704ce7e03
[IMP] website_sale: add product in website
...
bzr revid: chm@openerp.com-20130904084958-6rq5xu0xjwzcv399
2013-09-04 10:49:58 +02:00
16995938b2
[FIX] website_sale: display product number for cart
...
bzr revid: chm@openerp.com-20130904064217-xrs3pqetmg67zlrj
2013-09-04 08:42:17 +02:00
2dfe9f2bed
[IMP] website_sale: add javascript for add/remove to basket for usability
...
bzr revid: chm@openerp.com-20130903123438-h0lg0ufouovc09f3
2013-09-03 14:34:38 +02:00
cabe9fe9f7
[FIX] website_sale: ellipsis
...
bzr revid: chm@openerp.com-20130903114201-an4018t32ym3l02m
2013-09-03 13:42:01 +02:00
1fbf4c6349
[IMP] website: publisher with css for activated and disabled
...
bzr revid: chm@openerp.com-20130903104115-9yukaqh0teh45ipf
2013-09-03 12:41:15 +02:00
2cccfcb556
[IMP] website_sale: Add to Basket and fix suggested
...
bzr revid: chm@openerp.com-20130903083639-ftnd8lxhbotq7czo
2013-09-03 10:36:39 +02:00
8314c4ef9d
[IMP] website_sale: prduct boxes have the same size
...
bzr revid: chm@openerp.com-20130903082814-uuh11ttoyvjpvjox
2013-09-03 10:28:14 +02:00
85736a0c6a
[IMP] website_sale: layout of publisher
...
bzr revid: chm@openerp.com-20130902155431-fkx8b29k7r1qpkp4
2013-09-02 17:54:31 +02:00
86631bae37
[IMP] website_sale: custom css for disable (not published) product
...
bzr revid: chm@openerp.com-20130902153030-5mv6u3ehqgemsbuh
2013-09-02 17:30:30 +02:00
fb84138df2
[FIX] website_sale: display add button if they are only one variant
...
bzr revid: chm@openerp.com-20130902151503-is98p513qutdxlrn
2013-09-02 17:15:03 +02:00
9183757380
[FIX] website_event vs website_sale: variation of ticket price with pricelist if the ticket have the same price of the product. If the price is different, do not change the price of the ticket
...
bzr revid: chm@openerp.com-20130902104646-argn1gu8rk2p1w7a
2013-09-02 12:46:46 +02:00
afc2ddd40c
[FIX] website_sale: checkout
...
bzr revid: chm@openerp.com-20130830144204-5x4k7345nmzni65c
2013-08-30 16:42:04 +02:00
1aea7145c7
[IMP] fixes bootstrap
...
bzr revid: fp@openerp.com-20130829220425-xxyub3uvrmdi13j4
2013-08-30 00:04:25 +02:00
607e6f73e4
[IMP] bootstrap 3 mobile menu
...
bzr revid: fp@openerp.com-20130829204553-qyfk30am8tj4bm5n
2013-08-29 22:45:53 +02:00
7768e28a7b
[IMP] Bootstrap 3
...
bzr revid: fp@tinyerp.com-20130829175831-9f3sh4631m0jmq88
2013-08-29 19:58:31 +02:00
e6da64b39e
[IMP] website_crm_partner_assign: imp views
...
bzr revid: chm@openerp.com-20130829150058-bmcedth32o4nrdvh
2013-08-29 17:00:58 +02:00
497c7addad
[IMP] Removed inline css for hierarchy and added a global css for that.
...
bzr revid: psa@tinyerp.com-20130829122222-h60648t5v28tmt90
2013-08-29 17:52:22 +05:30
1a7c0c53cc
[IMP]Improved Verical divider.
...
bzr revid: bth@tinyerp.com-20130829101048-8qk056y1tg61wu0e
2013-08-29 15:40:48 +05:30
8c19a10e98
[IMP]Improved css.
...
bzr revid: bth@tinyerp.com-20130829084858-fagqaiq6g8gzv8nh
2013-08-29 14:18:58 +05:30
8e2014209d
[IMP]IMproved nav tag to div tag and removed class from themes.
...
bzr revid: bth@tinyerp.com-20130829073759-fxn6o9jrq8uojbqr
2013-08-29 13:07:59 +05:30
4eee602d6e
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: bth@tinyerp.com-20130829063717-t8kqjombb25gqmsb
2013-08-29 12:07:17 +05:30
2fab26a2d2
[IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
...
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
82c3c6bc33
[IMP] website_event: inherit website_sale mycart to don't display reduction if it's an event ticket price
...
bzr revid: chm@openerp.com-20130828094118-bzqgyuxc1ztqun8n
2013-08-28 11:41:18 +02:00
5c985c0fcd
[IMP]Improved code for class and style.
...
bzr revid: bth@tinyerp.com-20130827134916-q97gti3g3iczwtnl
2013-08-27 19:19:16 +05:30
411ae838f9
[IMP]Improved code for website_sail module.
...
bzr revid: bth@tinyerp.com-20130827133426-p3flo3ojcnwd26le
2013-08-27 19:04:26 +05:30
cf2dab4851
[IMP]IMproved code or class and navigation.
...
bzr revid: bth@tinyerp.com-20130826134729-b0olyv7di2oq5xrk
2013-08-26 19:17:29 +05:30
3a0d36b4d4
[IMP] Imprved for Search box.
...
bzr revid: psa@tinyerp.com-20130826133129-6l5576r39qcjj73i
2013-08-26 19:01:29 +05:30
41a0186daa
[IMP]Improved the billing form
...
bzr revid: psa@tinyerp.com-20130826121509-fds3sx1sw8p1eedg
2013-08-26 17:45:09 +05:30
199e945460
[IMP]Little Improved
...
bzr revid: psa@tinyerp.com-20130826111437-640etfb9ypsipeyx
2013-08-26 16:44:37 +05:30
07d067a544
[IMP]Improved
...
bzr revid: psa@tinyerp.com-20130826110531-mnqj1q62l6epxvws
2013-08-26 16:35:31 +05:30
e6b47051ea
MERGED lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and resolved conflicts
...
bzr revid: psa@tinyerp.com-20130826093529-3o64l5r3osuxm6i4
2013-08-26 15:05:29 +05:30
011e195f3f
Improved code.
...
bzr revid: psa@tinyerp.com-20130826092641-mbirfw9t322wn9am
2013-08-26 14:56:41 +05:30
c4f58b7466
[IMP] improved css for checkout form and others.
...
bzr revid: psa@tinyerp.com-20130826074016-bejnsnij9ly9df93
2013-08-26 13:10:16 +05:30
af2306a29f
[IMP]Migrated website_contract into bootstrap 3.0.
...
bzr revid: bth@tinyerp.com-20130826070854-uin768rdyrdn0uxc
2013-08-26 12:38:54 +05:30
7e718a6804
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth
...
bzr revid: psa@tinyerp.com-20130826061942-dr9m4iv3jvtl77ib
2013-08-26 11:49:42 +05:30
ed6452c74f
[IMP]Improved label-default.
...
bzr revid: psa@tinyerp.com-20130826061024-q5y4t2emq55rpr5f
2013-08-26 11:40:24 +05:30
8f5068d8a1
[IMP] Improved code for 'website_sale' to make it compatible according to bootstrap 3.0
...
bzr revid: psa@tinyerp.com-20130826054441-g0xl17kvhcnbw3ck
2013-08-26 11:14:41 +05:30
5a90cb546d
[FIX] website_sale: return to product after add to cart
...
bzr revid: chm@openerp.com-20130823144133-6qkx8flsra72crb4
2013-08-23 16:41:33 +02:00
cf1780d251
[FIX] website_sale: set pricelist
...
bzr revid: chm@openerp.com-20130823143757-81cc0pzajetu55m8
2013-08-23 16:37:57 +02:00
3602641e1d
[WIP] website_contract: reference view
...
bzr revid: chm@openerp.com-20130823133604-ujkiu67hrjtj4qtg
2013-08-23 15:36:04 +02:00
651e511ed9
[IMP] website_sale: fix context value, get order line name insead of product name, wip payment
...
bzr revid: chm@openerp.com-20130823094017-90m72xi2oif4qkuj
2013-08-23 11:40:17 +02:00
370fa231bf
[IMP] website_sale: add price for variation and price_list for reduction
...
bzr revid: chm@openerp.com-20130822142735-n1aglt9wakj27dsb
2013-08-22 16:27:35 +02:00
98f19d8890
[IMP] Improved string interpolation in templates
...
bzr revid: fme@openerp.com-20130821145731-kkw9sxiv6oqz65qk
2013-08-21 16:57:31 +02:00
667dbbfdd9
[IMP] simplify ckeditor image and link dialogs
...
& add easy linking to existing site pages and attachments
bzr revid: xmo@openerp.com-20130821143816-0hvp0m0eklh6ti1m
2013-08-21 16:38:16 +02:00
e039e76883
[IMP] Improved template's t-foreach
...
You need to pull Rev#4980 of server/trunk-website-al
bzr revid: fme@openerp.com-20130821140953-zb2hdglg1nvp2ckq
2013-08-21 16:09:53 +02:00
7423dd5949
[REM] page flags on a bunch of templates which turn out not to be pages after all
...
bzr revid: xmo@openerp.com-20130821135931-6ezsw089sju2eyga
2013-08-21 15:59:31 +02:00
2731bc014c
[IMP] mark a bunch of templates as pages, mark all new pages as pages on creation
...
bzr revid: xmo@openerp.com-20130821121358-b6y5d1b8wgz8iyo0
2013-08-21 14:13:58 +02:00
05bb4f2dca
[IMP] website_sale: use product.template insead of product.product
...
bzr revid: chm@openerp.com-20130820141203-vkg93z9odh0rlf4d
2013-08-20 16:12:03 +02:00
55b1378e77
[IMP] website_sale: add product variants
...
bzr revid: chm@openerp.com-20130819131929-x75ib5y6dcu4bcu7
2013-08-19 15:19:29 +02:00
571d9044d6
[IMP] website_sale: add suggested products
...
bzr revid: chm@openerp.com-20130819104144-81w0c3cicdqdf9ix
2013-08-19 12:41:44 +02:00
6581346ef1
[IMP] website_sale: clean xml view
...
bzr revid: chm@openerp.com-20130814161545-qrjqztu13gemw5qk
2013-08-14 18:15:45 +02:00
30f643c641
[IMP] website: add '/website/image' controllers. Use img and google_map method in website_sale, website_event and website_hr
...
bzr revid: chm@openerp.com-20130814135741-t3bgdtzw2brq8edz
2013-08-14 15:57:41 +02:00
f78d8e22e0
[FIX] website: pager must add url extra params in genarated urls
...
bzr revid: chm@openerp.com-20130814105400-it4s51b6wwdiipb1
2013-08-14 12:54:00 +02:00
e16a75fdb6
[FIX] website_sale: domain with search product and category
...
bzr revid: chm@openerp.com-20130814103551-otfpqyxen93vlx11
2013-08-14 12:35:51 +02:00
6b61a0d7c6
[IMP] website_sale: layout of product categories is optionnal
...
bzr revid: chm@openerp.com-20130814095317-ww69p8d05peolygy
2013-08-14 11:53:17 +02:00
2d1ec50f37
[FIX] website: css for grid
...
bzr revid: chm@openerp.com-20130814090723-joipibbbz0x5k77y
2013-08-14 11:07:23 +02:00
39d5bced7f
[IMP] website: refact. javascript,xml for website publish button
...
bzr revid: chm@openerp.com-20130814083439-wvc07n0sg2vblq1y
2013-08-14 10:34:39 +02:00
ba0230fa53
[FIX] website_hr: add javascript tag, website_sale: t-if for display number of product
...
bzr revid: chm@openerp.com-20130813142743-gwmmm2ik495ospbq
2013-08-13 16:27:43 +02:00
c5d941ffc0
[FIX] website: website link menu and use url action
...
bzr revid: chm@openerp.com-20130813124306-slt7xvl7ox2919r7
2013-08-13 14:43:06 +02:00
e1958f2ad7
[IMP] website: change some name button in website addons
...
bzr revid: chm@openerp.com-20130813115247-b8rq6hytqbwn4eog
2013-08-13 13:52:47 +02:00
2903251c25
[IMP] website_sale: improve layout of my cart and checkout pages
...
bzr revid: chm@openerp.com-20130813103948-fqg91t8nhg3szbn5
2013-08-13 12:39:48 +02:00
59ba4e7561
[WIP] website_sale: refactoring and use inherit_option_id
...
bzr revid: chm@openerp.com-20130812163123-3ako1rggjnszzi2h
2013-08-12 18:31:23 +02:00
8523e66bc4
[IMP] website: create method pager and template pager. Used by website_sale and website_event
...
bzr revid: chm@openerp.com-20130812134312-jmy2je288b4ofazy
2013-08-12 15:43:12 +02:00
3f86396b4e
[IMP] website: move hearder and footer in layout
...
bzr revid: chm@openerp.com-20130812093255-3cbehw7nx0h57qca
2013-08-12 11:32:55 +02:00
2abdcf99bc
[FIX] website_sale: renames files
...
bzr revid: chm@openerp.com-20130812091249-oz2ji7m8remif0xo
2013-08-12 11:12:49 +02:00
Thibault Delavallée
Christophe Matthieu
Fabien Meghazi
ddm
Xavier Morel
Fabien Pinckaers
Fabien Pinckaers
Paramjit Singh Sahota
bth-openerp