195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
a7816a827f
[FIX] website_sale: assets xml id and jquery selector (unbind click for login page)
2014-06-25 15:05:48 +02:00
bad13f0234
merge upstream
2014-06-23 10:07:56 +02:00
890a9ac652
[IMP] website: set geoip in user session
2014-06-18 14:50:24 +02:00
bc3fc54fac
[IMP] Tour: add tour in web module; tour became available in backend.
2014-06-18 12:25:13 +02:00
a9a83d00c9
[REM] python-qweb support for as-less foreach
2014-06-05 17:49:08 +02:00
bd2473f8dc
[FIX] stupid typo
2014-06-02 17:01:44 +02:00
8dc0503aa5
[FIX] website*: make custom footer independant of main layout
2014-06-02 16:56:36 +02:00
c05584a4d9
[FIX] website_sale and website_event imports
...
missing import prevent cli help display
2014-05-29 23:19:24 +02:00
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
ffb18d0af3
Broken @route arguments for events pages
2014-05-20 10:15:49 +02:00
a54b9ffe36
[FIX] website_event: Increase number of displayed events
2014-05-16 13:54:50 +02:00
9fc6ff1f55
[FIX] website_event: when website_event is installed, event and event type should by readable (acl) by anyone
...
This means, public users, but all users that are neither public user nor event user
2014-05-16 10:44:20 +02:00
e6e5ac048b
[FIX] broken routes for pages
2014-05-14 12:11:24 +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
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +02:00
798e4156fa
[IMP] sitemap cleaning: events
...
bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-11 16:33:14 +02:00
80ea7fe099
[IMP] removing static style
...
bzr revid: fp@tinyerp.com-20140509202753-p5080kwk8dupfdrc
2014-05-09 22:27:53 +02:00
74a6bde093
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
b0cbaf330a
[IMP] website: load website.xml templates only in editable mode
...
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
2014-05-05 13:38:00 +02:00
41ade23b09
[FIX] website_sale & website_event: create product (redirect with slug)
...
bzr revid: chm@openerp.com-20140505095724-mc9k6d2yf68ln9nq
2014-05-05 11:57:24 +02:00
e09a8934b4
[FIX] website_event: access right for portal user
...
bzr revid: chm@openerp.com-20140502162138-qp2kci9i1bncsj1i
2014-05-02 18:21:38 +02:00
eb44c37dd9
[FIX] website_event missing javascript asset
...
bzr revid: al@openerp.com-20140501200150-5u3lfdqls3t3oeih
2014-05-01 22:01:50 +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
c4d91f3b39
[FIX] website: can't drop share button when website_event is installed because the selector snippet_options overwrite a selector
...
bzr revid: chm@openerp.com-20140430103029-z89tu4hp14gvs31k
2014-04-30 12:30:29 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +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
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +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
be5fe933ec
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
73b3c851da
[FIX] website*: remove unusable demo links from manifests
...
bzr revid: dle@openerp.com-20140403145128-9w92v4mmasz66mqj
2014-04-03 16:51:28 +02:00
ab903b9f68
[FIX] website_event: return empty string in Local Events snippet if GeoIP is not installed
...
bzr revid: chm@openerp.com-20140327111006-ca2lbv2jxluxlw27
2014-03-27 12:10:06 +01:00
85cdf2a990
[FIX] website_event: import GeoIP if GeoIP is not installed
...
bzr revid: chm@openerp.com-20140327105831-6qwvs32aa6hj3nk2
2014-03-27 11:58:31 +01:00
94cf489dfc
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140327095038-ycs4991u11o9oywv
2014-03-27 10:50:38 +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
b28a32f6ef
[FIX] website: test_ui running
...
bzr revid: chm@openerp.com-20140326144442-ye2a51f03wyaxi8a
2014-03-26 15:44:42 +01:00
62814f9c23
[FIX] website: activate new tour tests
...
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01:00
c96f080e72
[IMP] improved code
...
bzr revid: dizzy.zala@gmail.com-20140321120550-8p0l6lh5iv45mvf7
2014-03-21 17:35:50 +05:30
e925756b7f
[IMP] improved typo
...
bzr revid: dizzy.zala@gmail.com-20140321100509-1htk580zquuov71m
2014-03-21 15:35:09 +05:30
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
9f51a6d453
[IMP] removed terminal slash from url and route
...
bzr revid: dizzy.zala@gmail.com-20140320063728-kuie1id6t7shvbc7
2014-03-20 12:07:28 +05:30
6f57d45b12
[IMP] improved code as suggested
...
bzr revid: dizzy.zala@gmail.com-20140319112737-b6vwgwff8w9ywy9f
2014-03-19 16:57:37 +05:30
ac8b0fcfc5
[IMP] improved code as suggested
...
bzr revid: dizzy.zala@gmail.com-20140318130903-6u2t94bfvh98jby7
2014-03-18 18:39:03 +05:30
3566b69374
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
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
Simon Lejeune
Christophe Matthieu
Xavier Morel
Richard Mathot
Antony Lesuisse
Christophe Simonis
Christophe Simonis
Fabien Meghazi
Denis Ledoux
Fabien Meghazi
Fabien Pinckaers
chm@openerp.com
Christophe Simonis
Dharmraj Jhala (OpenERP)