Commit Graph

349 Commits

Author SHA1 Message Date
Fabien Pinckaers 798e4156fa [IMP] sitemap cleaning: events
bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-11 16:33:14 +02:00
Fabien Pinckaers 80ea7fe099 [IMP] removing static style
bzr revid: fp@tinyerp.com-20140509202753-p5080kwk8dupfdrc
2014-05-09 22:27:53 +02:00
chm@openerp.com 74a6bde093 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
Fabien Meghazi 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
chm@openerp.com 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
chm@openerp.com e09a8934b4 [FIX] website_event: access right for portal user
bzr revid: chm@openerp.com-20140502162138-qp2kci9i1bncsj1i
2014-05-02 18:21:38 +02:00
Antony Lesuisse eb44c37dd9 [FIX] website_event missing javascript asset
bzr revid: al@openerp.com-20140501200150-5u3lfdqls3t3oeih
2014-05-01 22:01:50 +02:00
Antony Lesuisse 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
chm@openerp.com 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
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Fabien Meghazi 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
Fabien Meghazi 4f16d15120 [IMP] rename editor assets
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Fabien Meghazi 0ec498371e [FIX] translatable condition on *.editor.js assets
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
Xavier Morel 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
chm@openerp.com be5fe933ec [MERGE] from trunk
bzr revid: chm@openerp.com-20140408080736-6b70rlfsvj3to0od
2014-04-08 10:07:36 +02:00
Christophe Simonis 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
Denis Ledoux 73b3c851da [FIX] website*: remove unusable demo links from manifests
bzr revid: dle@openerp.com-20140403145128-9w92v4mmasz66mqj
2014-04-03 16:51:28 +02:00
chm@openerp.com 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
chm@openerp.com 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
chm@openerp.com 94cf489dfc [MERGE] from trunk
bzr revid: chm@openerp.com-20140327095038-ycs4991u11o9oywv
2014-03-27 10:50:38 +01:00
chm@openerp.com 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
chm@openerp.com b28a32f6ef [FIX] website: test_ui running
bzr revid: chm@openerp.com-20140326144442-ye2a51f03wyaxi8a
2014-03-26 15:44:42 +01:00
chm@openerp.com 62814f9c23 [FIX] website: activate new tour tests
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01:00
Dharmraj Jhala (OpenERP) c96f080e72 [IMP] improved code
bzr revid: dizzy.zala@gmail.com-20140321120550-8p0l6lh5iv45mvf7
2014-03-21 17:35:50 +05:30
Dharmraj Jhala (OpenERP) e925756b7f [IMP] improved typo
bzr revid: dizzy.zala@gmail.com-20140321100509-1htk580zquuov71m
2014-03-21 15:35:09 +05:30
chm@openerp.com 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
Dharmraj Jhala (OpenERP) 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
Dharmraj Jhala (OpenERP) 6f57d45b12 [IMP] improved code as suggested
bzr revid: dizzy.zala@gmail.com-20140319112737-b6vwgwff8w9ywy9f
2014-03-19 16:57:37 +05:30
Dharmraj Jhala (OpenERP) ac8b0fcfc5 [IMP] improved code as suggested
bzr revid: dizzy.zala@gmail.com-20140318130903-6u2t94bfvh98jby7
2014-03-18 18:39:03 +05:30
Dharmraj Jhala (OpenERP) 3566b69374 [MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140318065716-m8wxkwonpu7gpp3a
2014-03-18 12:27:16 +05:30
chm@openerp.com 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
chm@openerp.com d5ddf5152c [FIX] website: remove backslash from redirect with enable_editor
bzr revid: chm@openerp.com-20140314180029-iaeq4i6735pcw100
2014-03-14 19:00:29 +01:00
chm@openerp.com 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
chm@openerp.com 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
chm@openerp.com ba63094b9b [FIX] website_sale,website_event: can't create product and event. Why: controller and route are strict mode, remove / at the end of the route
bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
2014-03-13 14:20:13 +01:00
chm@openerp.com 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
chm@openerp.com 53f59c16d6 [MERGE] from trunk
bzr revid: chm@openerp.com-20140311154616-tb35jfweo3xuzqws
2014-03-11 16:46:16 +01:00
Christophe Simonis 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
Parth Gajjar (Open ERP) acbdc81d78 [IMP] added image if no country available
bzr revid: pga@tinyerp.com-20140307123256-9vz0xpuo97rh19jx
2014-03-07 18:02:56 +05:30
chm@openerp.com ce2b3215ab [FIX] website_event: tour does not run at installation
bzr revid: chm@openerp.com-20140307122951-al082ryupj64xk35
2014-03-07 13:29:51 +01:00
chm@openerp.com 29faa56d8e [FIX] website tour
bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
2014-03-06 17:11:04 +01:00
Parth Gajjar (Open ERP) 29d36f7dd9 [IMP] set flag image size
bzr revid: pga@tinyerp.com-20140305124400-xi1fqjuv85g0535l
2014-03-05 18:14:00 +05:30
Parth Gajjar (Open ERP) 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
Parth Gajjar (Open ERP) 35cdbec3d1 [IMP] removed extra attribute
bzr revid: pga@tinyerp.com-20140303090539-yb0mtx1082lcd6m2
2014-03-03 14:35:39 +05:30
Parth Gajjar (Open ERP) a87f1ab1ff [IMP] make event snippet not editable in edit mode
bzr revid: pga@tinyerp.com-20140303070305-3iybuo5fjsd5mbsc
2014-03-03 12:33:05 +05:30
Parth Gajjar (Open ERP) 13b76036f5 [IMP] Moved Country Events in Customize Menu
bzr revid: pga@tinyerp.com-20140228125653-cpi2nrrq78mejrlj
2014-02-28 18:26:53 +05:30
Parth Gajjar (Open ERP) 4268297466 [IMP] improved domain for event, Hide element on edit
bzr revid: pga@tinyerp.com-20140228122322-enn6p2x7n1c2shi0
2014-02-28 17:53:22 +05:30
Parth Gajjar (Open ERP) 6a3a62d94c [IMP] moved snippet to content, Get country with help of GeoIP module
bzr revid: pga@tinyerp.com-20140228094148-e2nr13o9e9u0vkor
2014-02-28 15:11:48 +05:30
Kersten Jeremy 01028e5260 [IMP] Remove the seconds on event demoo data
bzr revid: jke@openerp.com-20140228090844-akorvc0ve71x0i4j
2014-02-28 10:08:44 +01:00