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

57 Commits

Author SHA1 Message Date
Olivier Dony f15cbd6520 [MERGE] Forward-port saas-4 bugfixes up to ad4c6ca 2014-06-12 18:54:36 +02:00
Olivier Dony 6b85d80f23 [FIX] Wrap werkzeug.utils.escape() to accomodate signature change in 0.9 
We always want to escape quotes (") as part of the process of
generating HTML output. This option (quote=True) turned into
an implicit flag with a DeprecationWarning in werkzeug 0.9.0
It is likely to disappear in a future release of werkzeug too.
A wrapper avoids this warning without loss of compatibility
 2014-06-10 18:46:40 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Richard Mathot 37d6fe344b [FIX] website_event_track: display speakers name to public users 2014-05-21 17:10:50 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis 040c93026a [MERGE] merge bzr trunk addons branch 2014-05-20 18:10:36 +02:00
Vicente Jimenez Aguilar 3b859c219f Default event track is half hour not 30 hours 
This is a leftover from revision 9304
where the duration property of events changed unit
from minutes to hours but the defualt value remained 30.
 2014-05-19 14:04:01 +02:00
Fabien Meghazi 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
Fabien Meghazi 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
Xavier Morel 36bb8acfab [IMP] website_event_track: simplify event_agenda 2014-05-13 10:49:24 +02:00
Fabien Pinckaers 798e4156fa [IMP] sitemap cleaning: events 
bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
 2014-05-11 16:33:14 +02:00
Fabien Pinckaers 8970cefdd1 [IMP] track duration in hours 
bzr revid: fp@tinyerp.com-20140409184334-ehkhowyhyqw6cdmx
 2014-04-09 20:43:34 +02:00
Fabien Pinckaers 65908c769b [IMP] Event Agenda: merge with cleaning 
bzr revid: fp@tinyerp.com-20140409172600-bwy97j8kr8dzrgg9
 2014-04-09 19:26:00 +02:00
Vidhin Mehta (OpenERP) 6a58964065 [MERGE]Trunks. 
bzr revid: vme@tinyerp.com-20140403072700-9p2m0jmtp28xwpxd
 2014-04-03 12:57:00 +05:30
Vidhin Mehta (OpenERP) 3357b38143 [Refacotere]Code. 
bzr revid: vme@tinyerp.com-20140403071711-5dclywkcojrqu7dj
 2014-04-03 12:47:11 +05:30
Vidhin Mehta (OpenERP) 763b1475a9 [IMP]Minor improvements. 
bzr revid: vme@tinyerp.com-20140325131433-qf26x8kueone81tj
 2014-03-25 18:44:33 +05:30
Vidhin Mehta (OpenERP) 279be8cb26 [IMP]code refactore python. 
bzr revid: vme@tinyerp.com-20140325065616-u4gksi76xtb6ajhw
 2014-03-25 12:26:16 +05:30
Vidhin Mehta (OpenERP) 5755070df3 [IMP]talks count. 
bzr revid: vme@tinyerp.com-20140324085647-ms5rrfwvpj0t1apn
 2014-03-24 14:26:47 +05:30
Vidhin Mehta (OpenERP) af8149264a [REM]unnecessary code. 
bzr revid: vme@tinyerp.com-20140324052855-atpcer0b8vt0v356
 2014-03-24 10:58:55 +05:30
Vidhin Mehta (OpenERP) d43c76de65 [REM]remove timezone from frontend. 
bzr revid: vme@tinyerp.com-20140324052004-441bz8g24kix3fei
 2014-03-24 10:50:04 +05:30
Vidhin Mehta (OpenERP) 2d3656fd35 [IMP]show timezone option, select bydefault and change timezone value according to selection. 
bzr revid: vme@tinyerp.com-20140321064541-zvrnx1b9azgrjkh7
 2014-03-21 12:15:41 +05:30
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
Vidhin Mehta (OpenERP) cfa67eeace [IMP]Filter records in which start date and duration are null also duration is 0. 
bzr revid: vme@tinyerp.com-20140314122303-q7hgy4a3ij91yfxu
 2014-03-14 17:53:03 +05:30
Vidhin Mehta (OpenERP) 54fd56bd7d [FIX]minor. 
bzr revid: vme@tinyerp.com-20140314103626-o5dqmk1a3ffl2ire
 2014-03-14 16:06:26 +05:30
Vidhin Mehta (OpenERP) cfa7e909c1 [IMP]format for date 
bzr revid: vme@tinyerp.com-20140314072056-kictunm2cx3jonvq
 2014-03-14 12:50:56 +05:30
Darshan Kalola (OpenERP) 9374159c00 [IMP]improved typo, display time slot in one line and used define color when location_id = False. 
bzr revid: dka@tinyerp.com-20140314071608-3al2qurbjwq65o9b
 2014-03-14 12:46:08 +05:30
Vidhin Mehta (OpenERP) 9a9aa166ac [IMP]if not publish than red icon. 
bzr revid: vme@tinyerp.com-20140314064536-j2w3tlvomcfmci11
 2014-03-14 12:15:36 +05:30
Vidhin Mehta (OpenERP) 8cccfb7e3f [IMP]user superuserid. 
bzr revid: vme@tinyerp.com-20140314052730-7ktkfem61ze5d6ri
 2014-03-14 10:57:30 +05:30
Vidhin Mehta (OpenERP) 0628fca1fc [IMP]add talks 
bzr revid: vme@tinyerp.com-20140313133224-jmzacgnqlxee32y5
 2014-03-13 19:02:24 +05:30
Vidhin Mehta (OpenERP) 03ca05f638 [IMP] start date and end date can't be same, track must have secret key. 
bzr revid: vme@tinyerp.com-20140313101559-q3h08sxbvuy3j7ov
 2014-03-13 15:45:59 +05:30
Vidhin Mehta (OpenERP) 8152dff1c1 [ADD]comment 
bzr revid: vme@tinyerp.com-20140313092428-rvyc6zz8nubfsg3g
 2014-03-13 14:54:28 +05:30
Vidhin Mehta (OpenERP) 5587ede447 [IMP]complete algo,template and working well timetable. 
bzr revid: vme@tinyerp.com-20140313064737-r49q62owvgaltmuq
 2014-03-13 12:17:37 +05:30
Darshan Kalola (OpenERP) 13c55facde [IMP]event-track: implement color code for event and added color in demo data of event_track. 
bzr revid: dka@tinyerp.com-20140311104223-whztnya4fwf8i0c9
 2014-03-11 16:12:23 +05:30
Vidhin Mehta (OpenERP) 346fd24b1d [IMP]Remove global variable. 
bzr revid: vme@tinyerp.com-20140311093753-4y0y8s9ct01hy7y1
 2014-03-11 15:07:53 +05:30
Vidhin Mehta (OpenERP) 40d60c0bde [IMP]Complete algo for timetable. 
bzr revid: vme@tinyerp.com-20140311093058-80ot2az38sg4dc92
 2014-03-11 15:00:58 +05:30
Vidhin Mehta (OpenERP) f9575281f2 [IMP]IMplement alog half.(other part in progress.) 
bzr revid: vme@tinyerp.com-20140311065252-glvmfxhfqfahs5hf
 2014-03-11 12:22:52 +05:30
Darshan Kalola (OpenERP) cda569e361 [IMP]added speakers in event_track demo data and display speaker after event title. 
bzr revid: dka@tinyerp.com-20140307122642-j8dfijlsa2jzl962
 2014-03-07 17:56:42 +05:30
Vidhin Mehta (OpenERP) 71503bc1ce [IMP]Improvement in event. 
bzr revid: vme@tinyerp.com-20140307085248-ohtrossx8hbdbi72
 2014-03-07 14:22:48 +05:30
Fabien Pinckaers 566cb4c8ef [IMP] speakers on tracks 
bzr revid: fp@tinyerp.com-20140130225152-m35doytzau5f86d1
 2014-01-30 23:51:52 +01:00
Fabien Pinckaers 6babc654da [FIX] description of tracks 
bzr revid: fp@tinyerp.com-20140130175153-0uy7z55pjbt058gj
 2014-01-30 18:51:53 +01:00
Fabien Pinckaers f7f61a4bfe [FIX] talk proposal 
bzr revid: fp@tinyerp.com-20140130165111-wqbxtvkqpx08fgwv
 2014-01-30 17:51:11 +01:00
Fabien Pinckaers 3b48a82af5 [FIX] events 
bzr revid: fp@tinyerp.com-20140130163321-f86eq7obsua6x6z9
 2014-01-30 17:33:21 +01:00
Fabien Meghazi d6690455e9 [REM] Removed preload_records 
This feature will be stripped down and moved to server's ir.http#_dispatch()

bzr revid: fme@openerp.com-20140123150448-3hhlj4vytr82k88n
 2014-01-23 16:04:48 +01:00
Fabien Meghazi 14bb6060d7 [REM] Removed @website.route() decorator 
Need trunk-website-al Rev#5151

bzr revid: fme@openerp.com-20140120153733-ve3dn2kwvha7n3yl
 2014-01-20 16:37:33 +01:00
Christophe Matthieu 3f0f6b820b [FIX] website: Access rights and Access for: website_crm_partner_assign, website_customer, website_event, website_event_track, website_membership, website_partner, website_sale 
bzr revid: chm@openerp.com-20140107135933-h622wxwfhwoulg7q
 2014-01-07 14:59:33 +01:00
Fabien Pinckaers 301085c8fe [IMP] Agenda 
bzr revid: fp@tinyerp.com-20131222183632-jkzhe3muu8gz2h9o
 2013-12-22 19:36:32 +01:00
Fabien Pinckaers a2d100783b [IMP] Tracks 
bzr revid: fp@tinyerp.com-20131222164711-hwlqosx7gbd60rf8
 2013-12-22 17:47:11 +01:00
Fabien Pinckaers 9cc6b3c30f [IMP] event tracks, done track submission, a few data, some fixes 
bzr revid: fp@tinyerp.com-20131222144057-8vxt7mouxako39wp
 2013-12-22 15:40:57 +01:00
Fabien Meghazi 68f0397609 [IMP] preload all objects 
bzr revid: fme@openerp.com-20131217150211-zquu7nn05g23m4r4
 2013-12-17 16:02:11 +01:00
ddm 599b34d78d [FIX] Snafu 
bzr revid: ddm@openerp.com-20131216112211-t8tvnamftce80qjd
 2013-12-16 12:22:11 +01:00