b6ba6d9a9c
[FIX] website: create new page redirect to error 404
...
bzr revid: chm@openerp.com-20140331144123-p3unfkbqm5c0y1sx
2014-03-31 16:41:23 +02:00
583a47b7b9
[IMP] website: media editor: add embed video
...
bzr revid: chm@openerp.com-20140331135558-ulr1nzhwwvcnwswm
2014-03-31 15:55:58 +02:00
e0d33ad3c5
[FIX] website editor: shop tour and media editor for field image
...
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
2014-03-31 15:33:40 +02:00
e81c205b18
[FIX] website: snippet: link carousel-control
...
bzr revid: chm@openerp.com-20140331130304-v1winnhp41agb030
2014-03-31 15:03:04 +02:00
ed037b8a94
[REM] removed bootstrap sources
...
bzr revid: fp@tinyerp.com-20140331124809-t15wswgjj0c6if3y
2014-03-31 14:48:09 +02:00
8bde127659
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140331122509-vkpy077tp216molq
2014-03-31 17:55:09 +05:30
880ac90e1b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140331121654-jsdotezdyi9qwmeb
2014-03-31 14:16:54 +02:00
655142b04b
[IMP] website: media editor: add search result for images
...
bzr revid: chm@openerp.com-20140331120906-0qqa40xbvek27z4j
2014-03-31 14:09:06 +02:00
1c4b7e9f6f
[FIX] website: snippet slider slide button
...
bzr revid: chm@openerp.com-20140331115139-oa8va3ceikgc5b8w
2014-03-31 13:51:39 +02:00
4281a3f89f
[FIX] website: snippet typo of resize button
...
bzr revid: chm@openerp.com-20140331101043-0mf3c6pndz133huy
2014-03-31 12:10:43 +02:00
fa6cb6d6a2
[FIX] website media editor button position
...
bzr revid: chm@openerp.com-20140331100110-ue68pnnzaxusfu1u
2014-03-31 12:01:10 +02:00
f97a237b4b
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331095253-zftyl4uvd56mpovj
2014-03-31 11:52:53 +02:00
e94c9eea4e
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140331081027-v1eikz3ei78xjjqz
2014-03-31 10:10:27 +02:00
ff1588a46d
[IMP] added new supportable languages, bog solved in config dialog, improved count words dialog
...
bzr revid: pga@tinyerp.com-20140331070625-qtr7l45lnca5rfze
2014-03-31 12:36:25 +05:30
c4896f801c
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq
2014-03-31 09:49:56 +05:30
fd43cecbda
[REM] remove duplicate snippet: portfolio - image gallery
...
bzr revid: fp@tinyerp.com-20140330190548-cmgypctw8ymzs4yf
2014-03-30 21:05:48 +02:00
62ff59ba9f
[IMP] removing glyphicons from bootstrap less
...
bzr revid: fp@tinyerp.com-20140330131040-3athcual00brty26
2014-03-30 15:10:40 +02:00
1c3835c83c
[IMP] bootstrap less sources
...
bzr revid: fp@tinyerp.com-20140329202446-tz8b2rvenc6s3ds5
2014-03-29 21:24:46 +01:00
2478af1b16
[IMP] better button snippet
...
bzr revid: fp@tinyerp.com-20140329192911-i75v53f0gos8fybm
2014-03-29 20:29:11 +01:00
f1131d547b
[IMP] flat design, even for darken
...
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01:00
1a33fb64d5
[WIP] website: media editor
...
bzr revid: chm@openerp.com-20140328154715-alyj4kh33w6v8pgm
2014-03-28 16:47:15 +01:00
31269ba52f
[IMP] website: media editor doubleclick for video and begin to use snippet builder
...
bzr revid: chm@openerp.com-20140328141619-x9okgixai2v5dekr
2014-03-28 15:16:19 +01:00
3de6738dbb
merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140328131822-0kc0f5j5qhupkhbr
2014-03-28 18:48:22 +05:30
b0625b1191
[IMP] website: add video media editor
...
bzr revid: chm@openerp.com-20140328104453-2faynhhc1wi5598l
2014-03-28 11:44:53 +01:00
e63646130e
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
2014-03-28 09:58:15 +05:30
e289e23298
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge
2014-03-27 18:14:17 +01:00
c8d0175e61
[IMP] website media editor: change template
...
bzr revid: chm@openerp.com-20140327160324-yb1cwpsgqymxsf83
2014-03-27 17:03:24 +01:00
cf311bda60
[MERGE] remote module import
...
bzr revid: fme@openerp.com-20140327141233-i7xu8ism7howhflv
2014-03-27 15:12:33 +01:00
2de4260240
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140327113805-2ie66rru6o10nv38
2014-03-27 17:08:05 +05:30
c15e5b5163
[WIP] website media editor
...
bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2
2014-03-27 11:51:03 +01:00
94cf489dfc
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140327095038-ycs4991u11o9oywv
2014-03-27 10:50:38 +01:00
740e35e56d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140327094902-nko6rc1cs97b4sd1
2014-03-27 10:49:02 +01:00
c1b6589851
[IMP] website_event: widget to promote Events with country flag
...
bzr revid: chm@openerp.com-20140327093517-8ppcxypc6krxc2fi
2014-03-27 10:35:17 +01:00
b7fbef1241
[FIX] Serve ir.attachment with SUPERUSER_ID
...
We are not supposed to have a user id here
bzr revid: fme@openerp.com-20140326184022-1hulv7t5y6vuvr9y
2014-03-26 19:40:22 +01:00
9bb510938f
[WIP] website: media editor for image
...
bzr revid: chm@openerp.com-20140326160701-6wf21suhkv4rimyw
2014-03-26 17:07:01 +01:00
a7dc05bf6e
[WIP] website: add media editor template
...
bzr revid: chm@openerp.com-20140326155822-f4wascgyrm7ffeg8
2014-03-26 16:58:22 +01:00
eb5cbea318
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
368bf4dff6
[FIX] website editor: color of style button
...
bzr revid: chm@openerp.com-20140326143655-33sm4i67zjn03o2c
2014-03-26 15:36:55 +01:00
aa63c56462
[IMP] website editor: add style button on image
...
bzr revid: chm@openerp.com-20140326141629-diz4rk0789no7yyl
2014-03-26 15:16:29 +01:00
b39be63a8b
[IMP] website: fix and add rotationStep option for jsuery transfo
...
bzr revid: chm@openerp.com-20140326124339-ll12dxd2qyo3gpi3
2014-03-26 13:43:39 +01:00
473243270b
[MERGE] merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140326112709-m1iqkkmjt1xtmio1
2014-03-26 16:57:09 +05:30
99ac3ff81b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140326105539-9hf1x7u6lvh2hq2f
2014-03-26 11:55:39 +01:00
26692117b6
[ADD] website: add jQuery.transfo.js to transform dom (rotation, scale, translate)
...
bzr revid: chm@openerp.com-20140326105345-rq58x39zl6wi6a7s
2014-03-26 11:53:45 +01:00
dbd36f318c
[FIX] Rem old merged code (SHOULD NOT BE MERGED INTO TRUNK)
...
bzr revid: rim@openerp.com-20140326084646-0vutq1anyeju3w2y
2014-03-26 09:46:46 +01:00
864892d6ce
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
2014-03-26 11:18:41 +05:30
0fe55dddc1
[IMP] Added a mimetype field in ir.attachment
...
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04:13 +01:00
6e25b1fc3f
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
2014-03-25 16:29:35 +01:00
0d4d9af5f4
[FIX] website: fix and activate frontend test
...
bzr revid: chm@openerp.com-20140325140328-3f5is66d0petqrl6
2014-03-25 15:03:28 +01:00
329c19f94e
[FIX] Fix url slug check bug in multilang=True
...
bzr revid: fme@openerp.com-20140325140026-0qdx9zl21za8gto9
2014-03-25 15:00:26 +01:00
f76a734e90
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140325114109-lts5z42lq9xlgqx0
2014-03-25 17:11:09 +05:30
8435da41bc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140325103928-ja3bqy6xmyp91gva
2014-03-25 11:39:28 +01:00
27f38edb25
[FIX] dirty saas-3 fix for url lang switching with model converters
...
bzr revid: fme@openerp.com-20140325100722-temaci88fowcr2m5
2014-03-25 11:07:22 +01:00
631532072d
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140325085451-rscgni01o54123fm
2014-03-25 09:54:51 +01:00
13d7cfe86c
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
fa46f255f2
[IMP] wording
...
bzr revid: fp@tinyerp.com-20140324203540-rx76yaqaw3p9aql9
2014-03-24 21:35:40 +01:00
6889165eb1
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324164409-452kibtg3l7rd0nj
2014-03-24 17:44:09 +01:00
9556cadbff
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +01:00
bb8b7ea2d9
[ADD] website ir_http: serve binary ir.attchments with urls
...
bzr revid: fme@openerp.com-20140324151728-hpegewvf3b38ndyi
2014-03-24 16:17:28 +01:00
9285813da9
[IMP] website images: only checksum ir.attachment for empty urls
...
bzr revid: fme@openerp.com-20140324151447-a3mkncjh0b7k16hg
2014-03-24 16:14:47 +01:00
e5f645df4d
[FIX] website: snippet editor: forward port of branch saas-3
...
bzr revid: chm@openerp.com-20140324145416-qn2fvylylxtgu39a
2014-03-24 15:54:16 +01:00
50fda546e2
[REF] Moved qweb contact from website to base and removed the from_html method (it never worked)
...
bzr revid: sle@openerp.com-20140324135933-f21heo0sz0tzjbv3
2014-03-24 14:59:33 +01:00
5692dbdb5e
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324135220-j0abaam1n4ue03l7
2014-03-24 14:52:20 +01:00
449ca3ab18
[IMP] website snippet: add example in documentation
...
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
ba55fcf1d0
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324130119-xbnejtayna8haykk
2014-03-24 14:01:19 +01:00
69e6a7a808
[IMP] send source url in gengo comment, and save page on gengo post
...
bzr revid: pga@tinyerp.com-20140324111253-xts034vw3rjjl1cb
2014-03-24 16:42:53 +05:30
bf0d35dbdd
[IMP] merged gengo translator with main translator, removed 'Restart Job' from wizard,removed constraint from base_gengo
...
bzr revid: pga@tinyerp.com-20140324103631-j4cswrlk5huuibt5
2014-03-24 16:06:31 +05:30
aa9387e845
[FIX] don't mark view sections as dirty just because the snippets thing has inserted drop zones in it
...
bzr revid: xmo@openerp.com-20140324101850-el3cfs0x4uln3u7v
2014-03-24 11:18:50 +01:00
62814f9c23
[FIX] website: activate new tour tests
...
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01:00
843ac33ad9
[IMP] clean css
...
bzr revid: fp@tinyerp.com-20140322185641-qy57fotd1uvztffy
2014-03-22 19:56:41 +01:00
d03a8e8fcd
[IMP] removed history wizard, avatar handling
...
bzr revid: fp@tinyerp.com-20140322175329-s0uum9gircwryg09
2014-03-22 18:53:29 +01:00
24d37e2844
[FIX] website tour: template loading hide the real error
...
bzr revid: chm@openerp.com-20140321134546-i5nw73en8thzrwc2
2014-03-21 14:45:46 +01:00
f9b0c7469a
[IMP] website tour: change syntax
...
bzr revid: chm@openerp.com-20140321134207-y54uj2fynl5p0e8a
2014-03-21 14:42:07 +01:00
89a6bd0649
[IMP] website tour: fix auto test
...
bzr revid: chm@openerp.com-20140321123722-dmfdckh59cvot00i
2014-03-21 13:37:22 +01:00
6b5986e34d
[FIX] ir_http website postprocess args: do not redirect if the only difference between the url and the post-processed url is the url-enconding of some characters
...
bzr revid: sle@openerp.com-20140321120133-0k1zjsrtgwrw6oon
2014-03-21 13:01:33 +01:00
d8f27686e5
[IMP] website tour: fix test tour
...
bzr revid: chm@openerp.com-20140321115724-iwu17fkzdzaksmrs
2014-03-21 12:57:24 +01:00
429324999c
[IMP] website tour: remove tag script and css to lib bootstrap
...
bzr revid: chm@openerp.com-20140321112344-mwh2p8pp02j9sdq0
2014-03-21 12:23:44 +01:00
254b3a29fa
[IMP] website tour: auto set backdrop if no selector element
...
bzr revid: chm@openerp.com-20140321111815-t0312xxl7l83w9rx
2014-03-21 12:18:15 +01:00
58b6aeb01d
[IMP] website tour: remove bootstrap Tour lib
...
bzr revid: chm@openerp.com-20140321110750-ew8rj3nv2jcort1x
2014-03-21 12:07:50 +01:00
a56dc53bea
[REM] 4-spaces indent for web view pretty-print-before-save routine
...
Didn't quite work right: on the layout, it would exponentially increase
leading spaces in text nodes. Combined with a bug injecting snippets marks in
the footer (and thus invalidating and re-saving the layout at each snippet
addition) this could blow up the layout template and rendered page to >20MB.
Just keep lxml's standard 2-spaces indent.
LXML is unable to pretty print the layout anyway.
bzr revid: xmo@openerp.com-20140321075419-9w88h232r928xv5f
2014-03-21 08:54:19 +01:00
30853afd18
[FIX] website: prevent animations in edit mode
...
bzr revid: dle@openerp.com-20140321150800-q8p8hn8a7aozcya4
2014-03-21 16:08:00 +01:00
abfccd8936
[WIP] website tour: bootstrap-tour - v0.9.1
...
bzr revid: chm@openerp.com-20140320151542-blfr1rs1j24xanh8
2014-03-20 16:15:42 +01:00
ac8babe0e5
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320120758-ojgqpqb8sakdhkbb
2014-03-20 17:37:58 +05:30
e45d9bc7b0
[IMP] removed unnecessary code
...
bzr revid: pga@tinyerp.com-20140320094434-4zp7x6dmd27wfza2
2014-03-20 15:14:34 +05:30
a378f547f4
[IMP] minor changes
...
bzr revid: pga@tinyerp.com-20140320092643-1pw62dmbj9h6sjh4
2014-03-20 14:56:43 +05:30
0b75d4ea04
[IMP] website: remove bootstrap_tour_stub
...
bzr revid: chm@openerp.com-20140320085606-qrghlkev6i9pu9bw
2014-03-20 09:56:06 +01:00
60bdd78706
[IMP] website tour: refactoring and change api for create tour and test
...
bzr revid: chm@openerp.com-20140320083055-z5ys4oey5brd439v
2014-03-20 09:30:55 +01:00
b7a68828ed
[IMP] improved statistics, added sendbox options for testing, improved UI
...
bzr revid: pga@tinyerp.com-20140320071028-adyh8d89o7dij81o
2014-03-20 12:40:28 +05:30
b8d87606f0
[IMP] added gengo statistics, displayed inprogress elements
...
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
2014-03-19 19:01:21 +05:30
00aa1b69dc
[FIX] website tour: don't hide error in test mode if openerp don't exist
...
bzr revid: chm@openerp.com-20140319102348-rb1tkgd14nca6o15
2014-03-19 11:23:48 +01:00
b80d06d327
[FIX] website tour: reset tour before console.log 'ok' or 'error' who close phantomjs tour
...
bzr revid: chm@openerp.com-20140319092012-v83w99ts6z0apgl0
2014-03-19 10:20:12 +01:00
e07861bb19
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
a762af1f21
[FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
...
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
ecc7c1fbd3
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140319072330-lvlrxsqq667hfu28
2014-03-19 08:23:30 +01:00
ed2743f755
merge upstream
...
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
c49befd59f
[ADD] added website_gengo module
...
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
99a3c45976
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
...
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
1395c9ee0e
[IMP] website: snippet editor: change size automatic button into a cross between resize handler
...
bzr revid: chm@openerp.com-20140318130414-yb29wtm7oo4bammz
2014-03-18 14:04:14 +01:00
f9579073fe
[FIX] website: color of Edit Master link for themes. CSS less specific
...
bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
2014-03-18 12:14:42 +01:00
abe8e7208e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140318102102-ug0ny6q360i4o1e6
2014-03-18 11:21:02 +01:00
77622d3b24
[FIX] Fix css which make unusable the option dropdown for unpublished product. When an user was hover on a product not published and was trying to go in submenu, he had lost cursor, because he was changing div due to opacoty little than 1.
...
bzr revid: jke@openerp.com-20140318092341-ncgb173y0xfiaj87
2014-03-18 10:23:41 +01:00
39f3264e53
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140318075419-qkw5odjmgi58n0rj
2014-03-18 08:54:19 +01:00
3566b69374
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
5196cd6e8c
[FIX] website: set inherit_branding in test contexts to trigger generation of relevant edition attributes
...
bzr revid: xmo@openerp.com-20140317152502-6a2agi1xjooi516e
2014-03-17 16:25:02 +01:00
d87bc392ce
[IMP] website snippet option: rename data-class into data-value
...
bzr revid: chm@openerp.com-20140317144254-18cscu2yx5thmb89
2014-03-17 15:42:54 +01:00
b8071f8bc7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140317142550-53fky76kjdc04s4h
2014-03-17 15:25:50 +01:00
d3111df3aa
[FIX] website: The user does not see the content menu because of the tutorial is hover
...
bzr revid: chm@openerp.com-20140317141324-th65fhx512h2p1fa
2014-03-17 15:13:24 +01:00
cd4f83122a
[FIX] reduce span of paragraph spacer thing to not break layout
...
bzr revid: xmo@openerp.com-20140317135144-hvuxshfp4cjudnbh
2014-03-17 14:51:44 +01:00
25732de9ce
[FIX] website tour: typo for banner (from usertest feedback)
...
bzr revid: chm@openerp.com-20140317133700-8xrneej6aytua4j4
2014-03-17 14:37:00 +01:00
4c5d238191
[FIX] website translation won't properly find inherited view's id
...
bzr revid: fme@openerp.com-20140317132416-nu10ltrskc8d0orf
2014-03-17 14:24:16 +01:00
d3c7750b96
[FIX] inject WORD JOINER inside p so they don't seemingly disappear after saving
...
bzr revid: xmo@openerp.com-20140317124056-kg2jngp2mg769v7m
2014-03-17 13:40:56 +01:00
19aacaaea8
[FIX] website: readability block with container css
...
bzr revid: chm@openerp.com-20140317114956-j5sqt6flie5fla31
2014-03-17 12:49:56 +01:00
44bebab682
[FIX] website: typo: message let the user think that he can change the mobile view while he cannot
...
bzr revid: chm@openerp.com-20140317114938-3ghhwm0km3u5wyu1
2014-03-17 12:49:38 +01:00
8ffc4d0a5a
[ADD] support for presized fields in website/image
...
also add presized field to attachments (automatically computed from datas)
bzr revid: xmo@openerp.com-20140317104251-ddsa9cfpq1vkk2k1
2014-03-17 11:42:51 +01:00
eddd7884d0
[IMP] website tour: add href when time overlaps
...
bzr revid: chm@openerp.com-20140317094543-xwxmx63emzn5gmrh
2014-03-17 10:45:43 +01:00
89eb355069
[FIX] website tour: create a stub for bootstrap tour in automatic/test mode (need for full test and hide real bug for tour test)
...
bzr revid: chm@openerp.com-20140317083442-imylv9v5fafjxhwr
2014-03-17 09:34:42 +01:00
83f4c339b7
[IMP] website: tour: create a stub for bootstrap tour in automatic/test mode (because no need all time, and hide sometime the real bug)
...
bzr revid: chm@openerp.com-20140317080313-e8uern0s3wwua52h
2014-03-17 09:03:13 +01:00
6fc418883e
[FIX] website: route and redirect: remove all backslash from url
...
bzr revid: chm@openerp.com-20140317080145-6l5mk4q05uf639li
2014-03-17 09:01:45 +01:00
1729719437
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140317080052-p47866nl325thwmx
2014-03-17 09:00:52 +01:00
c93b466d32
[FIX] website tour, prepare for manual injection
...
- reorder website.js in a choerent way
- remove injectable website.tour.test.js
We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.
bzr revid: al@openerp.com-20140316165442-p82wqwv82559oact
2014-03-16 17:54:42 +01:00
0772c99bcb
[FIX] website test, remove useless test, waitfor banner fix
...
bzr revid: al@openerp.com-20140316144546-agpgmlwxa532xxmb
2014-03-16 15:45:46 +01:00
e23ce63133
[FIX] website tests crawler, admin password != super admin password
...
bzr revid: al@openerp.com-20140316142302-7xm0sputqgadihs0
2014-03-16 15:23:02 +01:00
d5c63e3205
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20140316122101-angijeo5fmr5j8v7
2014-03-16 13:21:01 +01:00
675a71b2b8
[IMP] attachments on messages
...
bzr revid: fp@tinyerp.com-20140316113742-odae0ph3a1qrqn12
2014-03-16 12:37:42 +01:00
04e2c89c62
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140315102709-3zp27g8lyr3z36d1
2014-03-15 11:27:09 +01:00
b220dc926e
[FIX] website: can't see edit button because css with overflow hidden for all tag. Aplly css only on carousel, paralax and blockquote
...
bzr revid: chm@openerp.com-20140314163639-l086jn568rtti5mv
2014-03-14 17:36:39 +01:00
410ec52276
[MERGE] website: add optional 'action' in managment edit button to laod one specific backend view
...
bzr revid: chm@openerp.com-20140314162909-ff0obqbw6j7lalmz
2014-03-14 17:29:09 +01:00
353bbdc2c3
[FIX] website: route and redirect: remove all backslash from url
...
bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy
2014-03-14 17:23:46 +01:00
79e1813d6e
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140314151011-xhhsovbsg1r0sbwk
2014-03-14 16:10:11 +01:00
264186541b
[IMP] website: remove css .fa and write important in font fa in web branch
...
bzr revid: chm@openerp.com-20140314150446-9g4n4ixws4cedfxp
2014-03-14 16:04:46 +01:00
8820d9f188
[FIX] website: can't edit baner image. Add contentEditable on image tag.
...
bzr revid: chm@openerp.com-20140314143049-8sp1q32i4x4q76ga
2014-03-14 15:30:49 +01:00
10af6ef168
[rev] website: remove js fix from this branch
...
bzr revid: chm@openerp.com-20140314142244-efpgx9cohx3k337s
2014-03-14 15:22:44 +01:00
62f0b963af
[ADD] missing css file
...
bzr revid: chm@openerp.com-20140314141910-f19pz5js5yatw2y4
2014-03-14 15:19:10 +01:00
8b94f855b6
[FIX] website theme css
...
bzr revid: chm@openerp.com-20140314134642-2yhbgcd5gxb4xw0r
2014-03-14 14:46:42 +01:00
51a0bb001b
[IMP] website snippet: add onfocus, onblur, onclone and onremove on snippet options; fix banner id
...
bzr revid: chm@openerp.com-20140314113510-dqj70i85z41q5j0k
2014-03-14 12:35:10 +01:00
aa412d99ec
[FIX] website tour: create a stub for bootstrap tour in automatic/test mode
...
bzr revid: chm@openerp.com-20140313142258-wblpqpwp9oubboc9
2014-03-13 15:22:58 +01:00
9496d823e9
[FIX] website: snippet dropdown options
...
bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
2014-03-13 14:05:56 +01:00
2390c9179b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140312140429-4x94dc1x70yfik1w
bzr revid: chm@openerp.com-20140313122048-1zrqhq6dbtv8jpad
2014-03-13 13:20:48 +01:00
e9fc839785
[FIX] website: css themes
...
bzr revid: chm@openerp.com-20140313102140-37okt41sx5nchx50
2014-03-13 11:21:40 +01:00
caa33bbbbf
[FIX] website: edit banner image
...
bzr revid: chm@openerp.com-20140313102119-nh6byvyeosqsosfn
2014-03-13 11:21:19 +01:00
b1cd54f5e9
[FIX] CSS of link style pane
...
bzr revid: xmo@openerp.com-20140313093822-kpkufmmya0e21my2
2014-03-13 10:38:22 +01:00
cd0434fb2a
[IMP] context-sensitivity of toolbar commands (kinda, attempted)
...
bzr revid: xmo@openerp.com-20140313093707-gpaz7gmsd5zt2ck5
2014-03-13 10:37:07 +01:00
0308b7968c
[IMP] don't allow HTML formatting in non-HTML fields
...
bzr revid: xmo@openerp.com-20140313093202-02s734ucabvkckli
2014-03-13 10:32:02 +01:00
4093259ec2
[WIP] website: fix css layout for themes
...
bzr revid: chm@openerp.com-20140312175519-o1ld0jo983ao7aaa
2014-03-12 18:55:19 +01:00
0bae967baa
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140312154854-gtq7v1dxfnunkcz6
2014-03-12 16:48:54 +01:00
b4ffbb4b35
[FIX] website#ir.http: do not postprocess arguments on non `website_enabled` endpoints
...
bzr revid: fme@openerp.com-20140312143539-bzf54zlzeawqkfuo
2014-03-12 15:35:39 +01:00
8ad325614d
[FIX] sprurious widgetification and editability of icon elements
...
* tighten widget match: don't match elements with .fa which are also "view
section" roots (~ editing hosts) as the classes themselves out not be
editable and the result will thus be odd
* correspondingly, only associate the icon "change" button to instances of the
``icons`` widget, other elements bearing ``.fa`` are not editable and should
be excluded.
bzr revid: xmo@openerp.com-20140312141910-a2apy22qj4wwxsne
2014-03-12 15:19:10 +01:00
d6fc0c259e
[FIX] website: snippet overlay position
...
bzr revid: chm@openerp.com-20140312130939-6k15igo39ybuu81s
2014-03-12 14:09:39 +01:00
4d125a3b52
[IMP] website: simplify code share button; wip: fix overlay
...
bzr revid: chm@openerp.com-20140312093440-4uzrpkguzu0fc5p5
2014-03-12 10:34:40 +01:00
384f398090
[IMP] website: publish button use action for url to backend
...
bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
2014-03-11 18:19:41 +01:00
53f59c16d6
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
3ceefde489
[FIX] website editor: check if link and fa is editable and display change button
...
bzr revid: chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
2014-03-11 14:08:52 +01:00
e5fbd2ba1a
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140310163630-xoqbu4y5wr9ptj7h
2014-03-10 17:36:30 +01:00
8694a48ef1
[IMP] website: use mailto for share snippet insead of mail form
...
bzr revid: chm@openerp.com-20140310141947-zs9ltuzx48k5ej5x
2014-03-10 15:19:47 +01:00
7e8b25dbee
[IMP] website: create share snippet. TODO: controller to send mail or mailto href
...
bzr revid: chm@openerp.com-20140310135434-7xt2sy89if9116l3
2014-03-10 14:54:34 +01:00
5e036bbf7c
[FIX] Properly redirect in case of invalid url slugs
...
Use werkzeug's api instead of doing hackish url replacement
bzr revid: fme@openerp.com-20140310130530-e86cdwhdca9cs9g3
2014-03-10 14:05:30 +01:00
0560bd631a
[TYPO] website: snippet Style Readability rename into Narrow
...
bzr revid: chm@openerp.com-20140307132247-k442d541jqti8yqv
2014-03-07 14:22:47 +01:00
e5f1cb5a4e
[FIX] website: allow fixed size of a slider with 3 slides of distinct size => add resize option on slider
...
bzr revid: chm@openerp.com-20140307132213-tg3jl2mybbpd0kg3
2014-03-07 14:22:13 +01:00
9f23642476
[FIX] Change 'Administration' to 'My Account' to switch between website and portal - backend and frontend
...
bzr revid: jke@openerp.com-20140307131017-nhqlnhnsgeprtblc
2014-03-07 14:10:17 +01:00
0a85dc580b
[FIX] website tour: change tour to use the features widget instead of the 3 columns one; fix 'Customize banner's text' step.
...
bzr revid: chm@openerp.com-20140307111314-3lklte4vzz8smgc4
2014-03-07 12:13:14 +01:00
74bb1d6e95
[FIX] website tour
...
bzr revid: chm@openerp.com-20140307101325-qrpn41ue1yxbfgcs
2014-03-07 11:13:25 +01:00
34f05212b7
[FIX] website: snippet & bootstrap for event view
...
bzr revid: chm@openerp.com-20140306162420-rvrjia8cx6y8yxd1
2014-03-06 17:24:20 +01:00
29faa56d8e
[FIX] website tour
...
bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
2014-03-06 17:11:04 +01:00
5f3f09329f
[IMP] website: snippet : website.snippet.animationRegistry.follow
...
bzr revid: chm@openerp.com-20140306140323-o2e77a66eu28bddu
2014-03-06 15:03:23 +01:00
73446943f5
[FIX] website snippet: clean_for_save; display email in subscribe snippet
...
bzr revid: chm@openerp.com-20140306134746-oi0p580c3s3t2a24
2014-03-06 14:47:46 +01:00
58a5f90758
[IMP] website: dynamic website_mail snippet with js
...
bzr revid: chm@openerp.com-20140306130240-cpsd5mssziuvrpf8
2014-03-06 14:02:40 +01:00
7cf77276fb
[IMP] website snippet: add Configurable follow snippet
...
bzr revid: chm@openerp.com-20140305175411-in3oodk778dxvu0k
2014-03-05 18:54:11 +01:00
10084e14db
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140305153023-au4xq3ykk0qupzof
2014-03-05 16:30:23 +01:00
8df09c6c6a
[FIX] website: snippet: display image editor button in snippet. Don't remove overlay (editor is used to clean snippets for save view)
...
bzr revid: chm@openerp.com-20140305132422-sfmlq8giol53rqjm
2014-03-05 14:24:22 +01:00
14bd7add4b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140304155535-2d5tpkaxh57cjjq4
2014-03-04 16:55:35 +01:00
8ab5f3979b
[ADD] deduplication of website images being uploaded
...
There is a deduplication in ir.attachment, but it's only for FS-stored content
*and* it only deduplicates storage not models (as there are access rights
issues involved).
The goal here is to always return the same attachment when a user uploads the
exact same image multiple times (because it's simpler or whatever).
Initially tried to use a binary field & digest(), but search() blows up
because it tries to utf-8 encode raw binary data. So use char & hexdigest
instead.
_compute_checksum returns None if the provided attachment data does not look
like a website image attachment.
Unhandled: multiple existing matches, maybe a UNIQUE constraint on the
checksum field would be a good idea just in case.
cherrypicked from saas-3's xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f
which had to be backed out (as the patch adds a new stored field)
bzr revid: xmo@openerp.com-20140304133117-r88p9zl2tc9tsh75
2014-03-04 14:31:17 +01:00
a0feb7c3c9
[REV] backout xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f, schemas should not be altered in saas-3
...
bzr revid: xmo@openerp.com-20140304132101-qysq310wp1oo859n
2014-03-04 14:21:01 +01:00
e78a3b18cc
[ADD] tentative removal of attachments
...
Attachments ought be removed only if they are not used in an existing page/web
view.
Theoretically this could be set directly in unlink(), but:
* that would make a nice error message significantly harder
* the expenses of performing a text search in all view archs would be a bit expensive
Notes:
* the views set could be reduced to only "web" views
* the search is likely sensible to false negatives e.g. different order of
query parameters. It *will* remove images still being used.
bzr revid: xmo@openerp.com-20140304110716-u14w6uo8fbkfa42i
2014-03-04 12:07:16 +01:00
cc70d1d22e
[IMP] replaced calendar icon with map and cloud, top and bottom margin added, domain added for confirmed events, used font-awesome instead of block-country_event.png
...
bzr revid: pga@tinyerp.com-20140304070104-3pb9hpnkgke6peu9
2014-03-04 12:31:04 +05:30
a99a15c960
[ADD] deduplication of website images being uploaded
...
There is a deduplication in ir.attachment, but it's only for FS-stored content
*and* it only deduplicates storage not models (as there are access rights
issues involved).
The goal here is to always return the same attachment when a user uploads the
exact same image multiple times (because it's simpler or whatever).
Initially tried to use a binary field & digest(), but search() blows up
because it tries to utf-8 encode raw binary data. So use char & hexdigest
instead.
_compute_checksum returns None if the provided attachment data does not look
like a website image attachment.
Unhandled: multiple existing matches, maybe a UNIQUE constraint on the
checksum field would be a good idea just in case.
bzr revid: xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f
2014-03-03 16:38:55 +01:00
ec68d3d8bd
[IMP] don't duplicate website_url function field of attachments
...
bzr revid: xmo@openerp.com-20140303142401-2jaxc3m31tmqw9qa
2014-03-03 15:24:01 +01:00
68749a0683
[IMP] website: snippet: remove data-snippet-id and add auto resize on resising option
...
bzr revid: chm@openerp.com-20140303142017-jcb3401wpiuvbc1n
2014-03-03 15:20:17 +01:00
9d00835b2c
[FIX] order of attachments in 'existing images' sub-dialog: put last uploaded first
...
bzr revid: xmo@openerp.com-20140303135426-evouhwgjtwku3v2b
2014-03-03 14:54:26 +01:00
dbd02d734b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140303131137-2shoyv0ywvgp5fx3
2014-03-03 14:11:37 +01:00
4a80c007e3
[IMP] website: snippet selector
...
bzr revid: chm@openerp.com-20140303121945-d2ynze1vja5v0d7d
2014-03-03 13:19:45 +01:00
2569e07191
[IMP] website: snippet don't use snipet id
...
bzr revid: chm@openerp.com-20140303113946-d70yd8nmew1k3z37
2014-03-03 12:39:46 +01:00
70d3570846
[FIX]website: do not send False value to google map api to retrieve the image. Otherwise, you are in the middle of the ocean.
...
bzr revid: dle@openerp.com-20140228170900-lagmopkmkb58exqr
2014-02-28 18:09:00 +01:00
2d903bcbb8
[FIX]website: stop animation on focus (clean fix)
...
bzr revid: dle@openerp.com-20140228163112-hru06zno1sl919uq
2014-02-28 17:31:12 +01:00
abcd7e4926
[FIX] website snippet: When duplicating a column, the column becomes a col-md-1 instead of keeping existing width
...
bzr revid: chm@openerp.com-20140228132507-0s6y5k3vkbmusvf1
2014-02-28 14:25:07 +01:00
ce1ff0a854
[FIX] website snippet: Fix parallax with retro-compatibility; Crappy fix for carousel because bootstrap active cycling when user click on a bullet and don't stop when user edit a snippet inside a slider.
...
bzr revid: chm@openerp.com-20140228131738-il41640r8x9zesll
2014-02-28 14:17:38 +01:00
c11f4f9352
[FIX] website: snippet: continue slide cycling when the user edit the content
...
bzr revid: chm@openerp.com-20140228095531-8c735qyacmffryno
2014-02-28 10:55:31 +01:00
c40b4fe69b
Merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140228055230-8i4lacpmxeebpymf
2014-02-28 11:22:30 +05:30
ff97011b3a
[MERGE] Trunk
...
bzr revid: sle@openerp.com-20140227164907-pvd92tw2bmg4d0w8
2014-02-27 17:49:07 +01:00
d96cf8c54c
[FIX] website: editor: can not edit a label in edit mode, must prevent the default click
...
bzr revid: chm@openerp.com-20140227140043-8iko13704pci9823
2014-02-27 15:00:43 +01:00
f462d1564f
[FIX] website: bootstrap: Fixed the sliding issue of carousel library in IE9. The transition was not working in any snippet.
...
bzr revid: chm@openerp.com-20140227133347-6pk45n7ibyrx8imf
2014-02-27 14:33:47 +01:00
6b857b6eeb
[FIX] whitespace/indent lost by RTE
...
Didn't manage to find RTE settings to avoid losing leading whitespace of
lines, so reindeint arch after doing all integration, right before saving back
to view's field.
* html.fromstring(parser=HTMLParser(remove_blank_text=True) does not seem to
work, so serialize to XML, and parse back with
remove_blank_text. remove_blank_text necessary for lxml's pretty_print to
work correctly.
* pretty_print only & always uses 2 spaces/indent level. Our files (and the
HTML editor's Format button) uses 4 spaces -> need a second pass to double
indents.
bzr revid: xmo@openerp.com-20140227125934-q8j3z440px2ic6kx
2014-02-27 13:59:34 +01:00
89de7d9f25
[MERGE] Merged lp:~openerp/openobject-addons/saas-3
...
bzr revid: psa@tinyerp.com-20140227114202-g2yw8pmsn4v0lm05
2014-02-27 17:12:02 +05:30
6a777b9e62
[FIX] website editor: Editor bar is showing border in ie.
...
bzr revid: chm@openerp.com-20140227111726-s1545ii3exjqjkxz
2014-02-27 12:17:26 +01:00
5f70ca61b6
[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug
...
bzr revid: chm@openerp.com-20140227111038-0hodseqys6pnz841
2014-02-27 12:10:38 +01:00
2868e9a6ac
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140227101725-7egd9xq859jasnhj
2014-02-27 11:17:25 +01:00
01a898ab8b
[FIX] website snippet: pointer-ie
...
bzr revid: chm@openerp.com-20140227100917-wq54xrkgii7uhacl
2014-02-27 11:09:17 +01:00
d263942189
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140227093043-y4dj5naxd0wve2ri
2014-02-27 10:30:43 +01:00
c8ebe2dc8a
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140226175612-4xi5b8sa2h2jp37n
2014-02-26 18:56:12 +01:00
cfeac71d6a
[FIX] website: editor: pointer-events:none for ie doesn't work (because ie). Change snippet overlay to fix this ie bug
...
bzr revid: chm@openerp.com-20140226175558-2gyix2zgdawf87yz
2014-02-26 18:55:58 +01:00
chm@openerp.com
Fabien Pinckaers
Parth Gajjar (Open ERP)
ajay javiya (OpenERP)
Fabien Meghazi
Richard Mathot (OpenERP)
Simon Lejeune
Christophe Simonis
Xavier Morel
Denis Ledoux
Dharmraj Jhala (OpenERP)
Kersten Jeremy
Antony Lesuisse
Christophe Matthieu
Paramjit Singh Sahota