odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
90,583 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

178 Commits

Author SHA1 Message Date
Antony Lesuisse 2d296cb779 [MERGE] ir-ui-view split active and show_customize 
Split the ternary field application in active and show_customize, all four
possible value are now needed for the customize theme popup.
 2014-08-31 16:56:44 +02:00
Fabien Meghazi 5e6e1303e3 [IMP] pretty urls for /website/image 2014-08-28 16:37:38 +02:00
Olivier Dony e11eddf753 [MERGE] Forward-port of saas-5 up to 20cc18d 2014-08-13 20:46:47 +02:00
Denis Ledoux fe83c11301 [MERGE] forward port of branch saas-4 up to b49755b 
The forward port of the fix 3609ba10f2 will be done separately, as the mrp scheduler has been completely refactored from saas-5.

Conflicts:
	addons/l10n_be_coda/wizard/account_coda_import.py
	addons/point_of_sale/static/src/xml/pos.xml
	addons/procurement/schedulers.py
 2014-08-13 10:45:36 +02:00
Denis Ledoux fc74431c1a [MERGE] forward port of branch saas-4 up to 7ecaab9 2014-08-12 16:27:57 +02:00
Fabien Pinckaers f43e349d85 [IMP] Footer message according to installed apps 2014-08-12 13:06:08 +02:00
Jeremy Kersten 541cfc93a3 [FIX] website_event: show online in event in all country. Add filter online event. Keep the date between filter. 2014-08-11 17:15:57 +02:00
Simon Lejeune 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
Christophe Matthieu a7816a827f [FIX] website_sale: assets xml id and jquery selector (unbind click for login page) 2014-06-25 15:05:48 +02:00
Xavier Morel a9a83d00c9 [REM] python-qweb support for as-less foreach 2014-06-05 17:49:08 +02:00
Richard Mathot bd2473f8dc [FIX] stupid typo 2014-06-02 17:01:44 +02:00
Richard Mathot 8dc0503aa5 [FIX] website*: make custom footer independant of main layout 2014-06-02 16:56:36 +02:00
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Fabien Pinckaers 80ea7fe099 [IMP] removing static style 
bzr revid: fp@tinyerp.com-20140509202753-p5080kwk8dupfdrc
 2014-05-09 22:27:53 +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 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 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
Dharmraj Jhala (OpenERP) e925756b7f [IMP] improved typo 
bzr revid: dizzy.zala@gmail.com-20140321100509-1htk580zquuov71m
 2014-03-21 15:35:09 +05:30
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 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 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
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
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
Parth Gajjar (Open ERP) c40b4fe69b Merged with trunk addons 
bzr revid: pga@tinyerp.com-20140228055230-8i4lacpmxeebpymf
 2014-02-28 11:22:30 +05:30
Fabien Pinckaers 100cc571cd [IMP] Event Security Fix + Publish Track 
bzr revid: fp@tinyerp.com-20140227131144-8rq3woldpl1zbppj
 2014-02-27 14:11:44 +01:00
Parth Gajjar (Open ERP) d4e7b18a55 [ADD] added snippet for country event, script for finding coordinates from brwoser, And display events from users country 
bzr revid: pga@tinyerp.com-20140226113121-vni0182v0cc2u3d4
 2014-02-26 17:01:21 +05:30
Christophe Matthieu 22a27ed953 [MERGE] Microformats (microdata) support for improved SEO. 
Supported formats:
 - Organization
   https://support.google.com/webmasters/answer/146861?hl=en&ref_topic=1088474
   http://schema.org/Organization
 - Event
   https://support.google.com/webmasters/answer/164506?hl=en&ref_topic=1088474
   http://schema.org/Event
 - Product+Offer
   https://support.google.com/webmasters/answer/146750#offer_properties
   http://schema.org/Product
   http://schema.org/Offer

Tested with http://www.google.com/webmasters/tools/richsnippets

bzr revid: chm@openerp.com-20140207113721-klunj6bf9qp4b2cx
 2014-02-07 12:37:21 +01:00
Fabien Pinckaers 9fd6c5fb80 [IMP] typo 
bzr revid: fp@tinyerp.com-20140205085915-jq2cno7crgt9ec02
 2014-02-05 09:59:15 +01:00
Fabien Pinckaers df24894325 [IMP] event empty message 
bzr revid: fp@tinyerp.com-20140205085600-90w1r2zigefst1sv
 2014-02-05 09:56:00 +01:00
ddm@openerp.com 6a20494b50 [IMP] Microdata for event list page 
bzr revid: ddm@openerp.com-20140203144608-l2yb7o5o9uq74hor
 2014-02-03 15:46:08 +01:00
ddm@openerp.com e31d566ff0 [IMP] Event microdata support 
bzr revid: ddm@openerp.com-20140203140829-if35stozydxwk5xw
 2014-02-03 15:08:29 +01:00
Fabien Pinckaers cf2349d63c [FIX] Create an event 
bzr revid: fp@tinyerp.com-20140130181638-ww2dor24eshzc81c
 2014-01-30 19:16:38 +01:00