828b7aef2f
[WIP] sitemap
2014-05-15 16:58:16 +02:00
2e0e242c82
[REV] Revert lazy sitemap
2014-05-14 17:11:16 +02:00
a20ccfc7d4
[FIX] lazy sitemap with generators
2014-05-14 15:48:51 +02:00
c3cfc4bc32
[MERGE] sitemap backport, merge trunk from 9438 til 9440
...
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
4118f9ed0a
[IMP] openerpframework moved in common asset bundle
2014-05-13 10:18:31 +02:00
1d08697bc1
[FIX] Do not display language choice if multilang=False
2014-05-12 17:42:01 +02:00
4a29752451
[IMP] openerpframework moved in common asset bundle
2014-05-12 17:19:34 +02:00
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
4c24985289
[ADD] alternate hreflang links in head for search engines
...
cf: https://support.google.com/webmasters/answer/189077?hl=en
bzr revid: fme@openerp.com-20140509122400-49sl631mwipx1039
2014-05-09 14:24:00 +02:00
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
46b422def0
[REM] useless id's in script and links
...
bzr revid: fme@openerp.com-20140430073104-qwb0opveyx5hnplg
2014-04-30 09:31:04 +02:00
a1d3b7d9ad
[REM] duplicates in assets
...
bzr revid: fme@openerp.com-20140430072102-2nzi1lcm95exb6v4
2014-04-30 09:21:02 +02:00
45aba13ed5
[FIX] bootstrap-tour removed
...
bzr revid: fme@openerp.com-20140429161604-dq0ny7bjioe6bjg3
2014-04-29 18:16:04 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
c92e1b6bcb
[IMP] Rename assets_frontend
...
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
2014-04-29 16:57:45 +02:00
fdaa70f319
[REM] language passed as query param for bundles controllers
...
'translatable' has been removed from assets templates, no need for this anymore
bzr revid: fme@openerp.com-20140428124513-vlbm1hjsv9989den
2014-04-28 14:45:13 +02:00
6d60aadfb8
[FIX] ace editor can't find it's assets if code is bundled
...
It's tries to find it's own <script> tag but fail to do so.
bzr revid: fme@openerp.com-20140425130229-koavz642l01txlxn
2014-04-25 15:02:29 +02:00
eae846f2c8
[FIX] remove @translatable conditions and de-activate group_website_designer specifics
...
Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion
bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
2014-04-25 14:49:13 +02:00
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
0ec498371e
[FIX] translatable condition on *.editor.js assets
...
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
74d4d1f58d
[CHG] bundlify website
...
CKEDITOR_BASEPATH has to be defined, by default ckeditor will load its files
relative to "itself" (the file which executes it). After bundling, the path is
incorrect and ckeditor looks for its files (e.g. en.js) in the wrong place.
bzr revid: xmo@openerp.com-20140418121503-4nsja7enutney2vn
2014-04-18 14:15:03 +02:00
c4164204b5
[FIX] Website - fix path of script watch.js
...
bzr revid: jke@openerp.com-20140416083411-a06k9sbiyda7zmrd
2014-04-16 10:34:11 +02:00
dbe1b81d15
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
2014-04-16 09:46:34 +02:00
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
9c739f12c2
[FIX] Remove watcher, need to be review because it breaks other tests.
...
bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao
2014-04-14 18:57:21 +02:00
faa899adde
[FIX] Reactive watcher
...
bzr revid: jke@openerp.com-20140414163412-88seef6j58xiamug
2014-04-14 18:34:12 +02:00
552a23a4bd
[FIX] Remove watcher
...
bzr revid: jke@openerp.com-20140414153537-0qjlnqqnk0q9utn0
2014-04-14 17:35:37 +02:00
a8ce5415ad
[FIX] Watch if jQuery is overwritted by another version in some script. If an override is detected, we check that all old function is always present else we add the missing.
...
The problem was that some websites uses externals libraries which use a jQuery more recent that our version. Jquery by default checks his own version and overwrite itself if the current version is lower.
Once user had their jquery overwritted, function dropdown was missing and it was impossible to the end user to get menu working again... and so impossible to remove the view with the front end.
bzr revid: jke@openerp.com-20140414151423-zhi3tjj52rihltzy
2014-04-14 17:14:23 +02:00
1b6585e614
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140414081610-h4qzg0okrwrxggar
2014-04-14 10:16:10 +02:00
1fc8f89bc1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140411082050-lr7vtew6yvsqaon6
2014-04-11 10:20:50 +02:00
e29174090a
[MERGE] Sync with trunk
...
bzr revid: richard_mathot_openerp-20140409194248-ii36xsv0lpr68rmt
2014-04-09 21:42:48 +02:00
673dc5b1d7
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
2014-04-08 15:24:12 +02:00
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
deae95f6af
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140402073422-u3ysvtln130z0kbr
bzr revid: rim@openerp.com-20140403084250-a3d5vmnsya7jx1qe
bzr revid: rim@openerp.com-20140407073946-nx1648yopw91m7v8
2014-04-07 09:39:46 +02:00
00803fd13a
[ADD] website: template reset confirmation
...
bzr revid: fme@openerp.com-20140401094233-9zcuc915l56a7h1h
2014-04-01 11:42:33 +02:00
f07e0ff8c5
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140401071752-mdhg7kjdhgvju1cb
2014-04-01 09:17:52 +02:00
880ac90e1b
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140331121654-jsdotezdyi9qwmeb
2014-03-31 14:16:54 +02:00
f1131d547b
[IMP] flat design, even for darken
...
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01:00
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
6e25b1fc3f
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140325152935-hifgmzdl63yhmkll
2014-03-25 16:29:35 +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
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
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
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
04e2c89c62
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140315102709-3zp27g8lyr3z36d1
2014-03-15 11:27:09 +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
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
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
dbd02d734b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140303131137-2shoyv0ywvgp5fx3
2014-03-03 14:11:37 +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
ee51fc0ca6
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140225093040-6k4kmj93uo2bk6t9
2014-02-25 10:30:40 +01:00
65dc368cdd
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140221145952-fh5i7k18egwo3l5t
2014-02-21 15:59:52 +01:00
7e2bf04b4a
[FIX] website: bootstrap is now in web module
...
bzr revid: chs@openerp.com-20140221104725-e1w0t9ety5oqjf0y
2014-02-21 11:47:25 +01:00
35b64811e9
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
4b72678bc7
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
...
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
77e89f6a81
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140220120929-lbhrdz5sv190ylhu
2014-02-20 13:09:29 +01:00
e776245b8b
[ADD] Added jquery.placeholder lib. because IE9 is not supporting the placeholders.
...
bzr revid: psa@tinyerp.com-20140220100716-01mjib3w692qdgi1
2014-02-20 15:37:16 +05:30
09397684b3
[FIX] website: change odrer of script tag because jquery-ui-1.9.1.custom overwrite jQuery and cancel some bootstrap method in edit mode
...
bzr revid: chm@openerp.com-20140218153451-uxd87o5b7zy3asvv
2014-02-18 16:34:51 +01:00
00c810ab14
[FIX] website: Don't allow to edit the menu inline. Users try to change the link, but it does not work. We can put a tooltip explaning they should use the content top menu to edit the menu; bootstrap tooltip don't available in edit mode.
...
bzr revid: chm@openerp.com-20140218145619-fboofhu111s3g45p
2014-02-18 15:56:19 +01:00
8830cb581c
[FIX] website: In the footer, users record their phone number inbetween the fa-phone and the t-field. As a result, they change the footer template, not the phone number of the company. This zone should be t-ignore to avoid this mistake.
...
bzr revid: chm@openerp.com-20140218110250-lvvem8ibkg3g8e8d
2014-02-18 12:02:50 +01:00
2445e9f0bc
[MERGE] trunk
...
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue
2014-02-16 11:36:09 +01:00
0ae6d1f4e7
[FIX] More accurate values for the demo paper format and website contact widget enhanced
...
bzr revid: openerp-sle@openerp-sle.home-20140213120739-4jh30s94scfr584e
2014-02-13 13:07:39 +01:00
eb4bdb1a49
[IMP] Website: contact widget has now an option to disable fontawesome markers
...
bzr revid: openerp-sle@openerp-sle.home-20140212220801-66kuwbz8d3piy2sa
2014-02-12 23:08:01 +01:00
ed785f0783
[FIX] website_sale: pager and breadcrum keep search and filter. Filter keep search and category. Links for category
...
bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
2014-02-12 12:55:16 +01:00
ac03ba3095
[FIX] website: pager don't keep searches
...
bzr revid: chm@openerp.com-20140212102805-5khiv3cgslci9che
2014-02-12 11:28:05 +01:00
1b52723e97
[IMP] website: remove bootstrap in addons/website and use bootstrap from web
...
bzr revid: chm@openerp.com-20140211110457-cmqdhbs6wugqt14x
2014-02-11 12:04:57 +01:00
7d1ba3329c
[FIX] website: contactus: address of the company above the phone, typo edit button
...
bzr revid: chm@openerp.com-20140211095933-s712ssydrv1d54nq
2014-02-11 10:59:33 +01:00
af58bb70bc
[MERGE] Merge trunk
...
bzr revid: rim@openerp.com-20140211072305-uzc1oocfn4jnuf8i
2014-02-11 08:23:05 +01:00
04a6074b1a
[MERGE] forward porting fixes from saas-3
...
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
2014-02-10 16:56:28 +01:00
d4c7de4b03
[FIX] work around distribute_branding
...
distribute_branding is applied after view inheritance is applied, and does not
take it in account. As a result, altering an existing view "from the top"
(e.g. adding a div element preceding an existing div) will alter the xpath
leading to whatever element we need to deal with.
Move fakebar injection to the bottom of the body, where it can't have any
impact on preceding node paths.
bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp
2014-02-10 14:28:55 +01:00
7b606a662b
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140210082325-orsule85beliwswl
2014-02-10 09:23:25 +01:00
87172d90d2
[MERGE] saas-3
...
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
2014-02-09 15:03:15 +01:00
1a7d7a3f55
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140207163324-0fj6qsqs79bvutx6
2014-02-07 17:33:24 +01:00
5f92743b18
[IMP] logo by default (easier to configure)
...
bzr revid: fp@tinyerp.com-20140207134836-pjub0d84nxmgb560
2014-02-07 14:48:36 +01:00
b21bb08c22
[ADD] website: test login, backend, go back, branding, edit, logout
...
bzr revid: chm@openerp.com-20140207125231-3zd0i1axdwuht5g4
2014-02-07 13:52:31 +01:00
e8964f896c
[FIX] website: tour, test and test_runner
...
bzr revid: chm@openerp.com-20140206140746-jmeyx8q9qxv7sz1j
2014-02-06 15:07:46 +01:00
d819d494f1
[IMP] website: add debugger template used to create nex tours/tests (display in customize menu in debug mode)
...
bzr revid: chm@openerp.com-20140206135036-geq8fubtz39pxp20
2014-02-06 14:50:36 +01:00
18d9e91394
[IMP] make editor bar appear faster to avoid impression of slowness and reflow
...
bzr revid: xmo@openerp.com-20140204153616-swho76l8v3s4p1dq
2014-02-04 16:36:16 +01:00
319185a1ed
[FIX] Remove redundant microdata
...
bzr revid: ddm@openerp.com-20140203131454-7h3t2x4ff1z085xi
2014-02-03 14:14:54 +01:00
0733d51365
[IMP] Organization microdata
...
bzr revid: ddm@openerp.com-20140203124718-8ogunilwsvm42ikt
2014-02-03 13:47:18 +01:00
7f0c30580b
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140131154544-tfcci0uo0q6652jh
bzr revid: rim@openerp.com-20140202135602-82pcqeqqtdp6h9fr
2014-02-02 14:56:02 +01:00
5451f5587d
[REV] Bring back QWebExceptions
...
bzr revid: fme@openerp.com-20140131113611-wee3xvnvzw9smq2r
2014-01-31 12:36:11 +01:00
7b70388235
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140131075821-qx8cc0ybtxqr7219
2014-01-31 08:58:21 +01:00
974c666bcd
[REV] website qweb dont change exception types
...
bzr revid: al@openerp.com-20140131011427-3bome249kut8fs3t
2014-01-31 02:14:27 +01:00
1931c307a2
[IMP] Improved qweb exeptions handling
...
bzr revid: fme@openerp.com-20140130212053-fkb9ug49qun54ehi
2014-01-30 22:20:53 +01:00
fc979b9a7a
[FIX] url_for()
...
bzr revid: fme@openerp.com-20140130195043-pkfkmqg80c2yk5p5
2014-01-30 20:50:43 +01:00
51af63eeb7
[FIX] margin left fa-envelop
...
bzr revid: fp@tinyerp.com-20140130182558-63lw9szcro3qmjee
2014-01-30 19:25:58 +01:00
fb69a8bf70
[IMP] website: use company logo
...
bzr revid: chs@openerp.com-20140130181210-y5zbmtc0fimcn9ia
2014-01-30 19:12:10 +01:00
afdc063112
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140130073558-afmllqhuwghv374g
2014-01-30 08:35:58 +01:00
632c014b76
[FIX] fix werkzeug dependency on debian, misc changes
...
- add an more friendly syntax for images /website/image/<model>/<id>/<field>
- reorder methods based on their use case
- move new page to /website namespace
bzr revid: al@openerp.com-20140129163809-d4z4f8t3h11n5ozv
2014-01-29 17:38:09 +01:00
f88389bbeb
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140129083209-w119hzabepx233af
2014-01-29 09:32:09 +01:00
326c35aecd
[IMP] Merge bananas and cumcumbers in order to prepare the t-href|t-action removal
...
bzr revid: fme@openerp.com-20140128201417-1elmttz8qen9q3ws
2014-01-28 21:14:17 +01:00
8c00a0125c
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140128143445-tse97tsr0yvubv0y
2014-01-28 15:34:45 +01:00
7c90d3afa5
[FIX] website page creation
...
bzr revid: al@openerp.com-20140128140017-r8yy8tzsvo4y0e92
2014-01-28 15:00:17 +01:00
c43fff5627
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140128125340-j6ennyh75o2js7e9
2014-01-28 13:53:40 +01:00
Fabien Meghazi
Fabien Pinckaers
Antony Lesuisse
Christophe Simonis
Xavier Morel
Kersten Jeremy
chm@openerp.com
Richard Mathot (OpenERP)
Simon Lejeune
Christophe Matthieu
Paramjit Singh Sahota
openerp-sle
Frédéric van der Essen