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
Darshan Kalola (OpenERP)
acd7451951
[IMP]added stage_id in demo data of event_track and removed registration & cofee talk from demo data.
...
bzr revid: dka@tinyerp.com-20140314062619-ei0o78n9szqyl9wt
2014-03-14 11:56:19 +05:30
Darshan Kalola (OpenERP)
af01232ec0
[IMP]improved speaker name, added class text-muted and make it small.
...
bzr revid: dka@tinyerp.com-20140314055628-4e9vv5e15ybrftw5
2014-03-14 11:26:28 +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)
92d336bb7e
[REM~]
...
bzr revid: vme@tinyerp.com-20140314052114-ynikfc502x9oay3g
2014-03-14 10:51:14 +05:30
Vidhin Mehta (OpenERP)
237f94797d
[IMP]link each track to talk, remove link with room name.
...
bzr revid: vme@tinyerp.com-20140314051852-g5ae2nn1aanb8zd2
2014-03-14 10:48:52 +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)
49c965aed1
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20140313092609-jsjt19yw2eczb1jq
2014-03-13 14:56:09 +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)
08823a3640
[IMP]track can't overlapped now, contraint added, change in demo data.
...
bzr revid: vme@tinyerp.com-20140313084226-dx4tkrhi6ju0th8y
2014-03-13 14:12:26 +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
Launchpad Translations on behalf of openerp
584a88294f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140313061654-qs7tba29pn3cenc7
2014-03-13 06:16:54 +00:00
Antony Lesuisse
84bd0f0581
[MERGE] db dump/restore new zip based file format
...
bzr revid: al@openerp.com-20140312182118-4u93tqmlfvofrz8p
2014-03-12 19:21:18 +01:00
Antony Lesuisse
b0888ec29b
[MERGE] db dump/restore new zip based file format
...
bzr revid: al@openerp.com-20140312181724-hs26iumd4na2avns
2014-03-12 19:17:24 +01:00
Antony Lesuisse
96db6703dd
[MERGE] db dump/restore zip-based format.
...
The new format uses plain text sql and includes the filestore.
The old pg_dump format is still supported for db restore.
bzr revid: al@openerp.com-20140312174233-0ulbcwn784ujuk6p
2014-03-12 18:42:33 +01:00
Fabien Meghazi
b4ffbb4b35
[FIX] website#ir.http: do not postprocess arguments on non website_enabled endpoints
...
bzr revid: fme@openerp.com-20140312143539-bzf54zlzeawqkfuo
2014-03-12 15:35:39 +01:00
Xavier Morel
8ad325614d
[FIX] sprurious widgetification and editability of icon elements
...
* tighten widget match: don't match elements with .fa which are also "view
section" roots (~ editing hosts) as the classes themselves out not be
editable and the result will thus be odd
* correspondingly, only associate the icon "change" button to instances of the
``icons`` widget, other elements bearing ``.fa`` are not editable and should
be excluded.
bzr revid: xmo@openerp.com-20140312141910-a2apy22qj4wwxsne
2014-03-12 15:19:10 +01:00
chm@openerp.com
44523f4679
[IMP] website_crm: contact form improvement
...
get argument are processed and set into input fields + hidden fields
save some datas from http headers
controller should save all the submitted vars
bzr revid: chm@openerp.com-20140312140232-nhdkhjc38xnviu1d
2014-03-12 15:02:32 +01:00
Kersten Jeremy
cf4a211a09
[FIX] Uncomment tests which fail
...
bzr revid: jke@openerp.com-20140312114057-sdlbvs3knty4czon
2014-03-12 12:40:57 +01:00
Kersten Jeremy
282b9624e4
[FIX] Reactivate tests js which have been commented !
...
bzr revid: jke@openerp.com-20140312102554-fcdixi03bw5rqqj1
2014-03-12 11:25:54 +01:00
Launchpad Translations on behalf of openerp
a2e0cd3414
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140312045830-wc9c4o7r7l84luq8
2014-03-12 04:58:30 +00:00
Simon Lejeune
66c594fe6d
[MERGE][FIX] Download of a report was broken because of a slash at the end of the route used by 'get_file'
...
bzr revid: sle@openerp.com-20140311180929-ih40j1fx1tsloync
2014-03-11 19:09:29 +01:00
Simon Lejeune
5f417a7397
[FIX] Removed the ending slash of download attachment routes
...
bzr revid: sle@openerp.com-20140311171219-j80lkmaezfezptxx
2014-03-11 18:12:19 +01:00
chm@openerp.com
595c21fe5d
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140311154800-tdw1fcknbb42nvph
2014-03-11 16:48:00 +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
Christophe Simonis
96f744b271
[MERGE] forward port of branch saas-3 up to revid 5088 chs@openerp.com-20140311095550-lg3nvvjyojvgp2po
...
bzr revid: chs@openerp.com-20140311133850-11bw9vv90e40clw1
2014-03-11 14:38:50 +01:00
Christophe Simonis
c3827cb8f7
[MERGE] forward port of branch saas-3 up to revid 3967 jke@openerp.com-20140311093515-02xw8phrcqhgz6zx
...
bzr revid: chs@openerp.com-20140311132200-1bln6gaj80njyh18
2014-03-11 14:22:00 +01:00
chm@openerp.com
3ceefde489
[FIX] website editor: check if link and fa is editable and display change button
...
bzr revid: chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
2014-03-11 14:08:52 +01:00
Kersten Jeremy
849d0ad860
[TEST] Log for debug
...
bzr revid: jke@openerp.com-20140311122729-ullchqwem8725iw2
2014-03-11 13:27:29 +01:00
Kersten Jeremy
09e5ec2345
[TEST] Log for debug
...
bzr revid: jke@openerp.com-20140311105910-v1k3l0r8ga1lubp6
2014-03-11 11:59:10 +01:00
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
chm@openerp.com
d1798dcb36
[FIX] website_crm: textarea don't keep value when they are an error because the view use t-attf insead of value inside textarea tags
...
bzr revid: chm@openerp.com-20140311103537-mp6x2v015tyuimux
2014-03-11 11:35:37 +01:00
chm@openerp.com
697b72befc
[IMP] website_crm: prefill form with query strig value
...
bzr revid: chm@openerp.com-20140311102946-l4razug7j701mska
2014-03-11 11:29:46 +01:00
Christophe Simonis
e634545617
[FIX] http: ensure to clean the request cursor before calling the route function.
...
The route function can be call more than once in case of database error,
breaking the request cursor. By rollbacking it, we force the creation of a new transaction.
bzr revid: chs@openerp.com-20140311095550-lg3nvvjyojvgp2po
2014-03-11 10:55:50 +01:00
Vidhin Mehta (OpenERP)
346fd24b1d
[IMP]Remove global variable.
...
bzr revid: vme@tinyerp.com-20140311093753-4y0y8s9ct01hy7y1
2014-03-11 15:07:53 +05:30
Kersten Jeremy
f8bad6f814
[FIX] Fix bug for duration, duration are computed according to if the event is an alll day or not
...
bzr revid: jke@openerp.com-20140311093515-02xw8phrcqhgz6zx
2014-03-11 10:35:15 +01:00
Vidhin Mehta (OpenERP)
40d60c0bde
[IMP]Complete algo for timetable.
...
bzr revid: vme@tinyerp.com-20140311093058-80ot2az38sg4dc92
2014-03-11 15:00:58 +05:30
chm@openerp.com
3353305a6f
[FIX] website_sale: remove filter of rows process grid, layout need to create empty tr for rowspan
...
bzr revid: chm@openerp.com-20140311093050-4p75rrdh5bg8mpqy
2014-03-11 10:30:50 +01:00
Kersten Jeremy
86f48a1a79
[TYPO] Typo in calendar template
...
bzr revid: jke@openerp.com-20140311081025-b9r08awsiwi068fw
2014-03-11 09:10:25 +01:00
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
Vidhin Mehta (OpenERP)
3c1cd3d5ae
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20140311055038-51s9igqkkdj0ty69
2014-03-11 11:20:38 +05:30
Antony Lesuisse
096432ff73
[REV] reverting xmo@openerp.com-20140310115334-vjh7gx5oizdm6s67
...
This api change breaks jsfile tests (example test_ui_load.js). The api is broken
but the proper fix would be to avoid accessing phantom.args from PhantomTest
bzr revid: al@openerp.com-20140310184636-8r9x81xi1zqhcsek
2014-03-10 19:46:36 +01:00
chm@openerp.com
b77521ae7f
[FIX] website_crm: update post value and not values object
...
bzr revid: chm@openerp.com-20140310164204-q0nm93jmq10aa20x
2014-03-10 17:42:04 +01:00
chm@openerp.com
d41ea1cfdc
[FIX] website_sale: grid view remove rowspan if colspan=4
...
bzr revid: chm@openerp.com-20140310163329-nglj6dxpulzcl5qn
2014-03-10 17:33:29 +01:00
chm@openerp.com
9aa0baf7dd
website_crm: contact form improvement
...
get argument are processed and set into input fields + hidden fields
save some datas from http headers
controller should save all the submitted vars
bzr revid: chm@openerp.com-20140310162626-libizyxlycvuwo7h
2014-03-10 17:26:26 +01:00
Christophe Simonis
d6b93c8b24
[FIX] point_of_sale: use correct method to redirect to login page
...
bzr revid: chs@openerp.com-20140310153838-svwzew0vuk0khlxz
2014-03-10 16:38:38 +01:00
Christophe Simonis
20efa0e287
[FIX] web: redirect to original page after login
...
bzr revid: chs@openerp.com-20140310153639-ntfa8cvm4loecm9a
2014-03-10 16:36:39 +01:00
chm@openerp.com
832e6ad2d6
[FIX] website_sale: resize big image if size 1x1 for loading faster; (don't use image_medium who break some layout customisation like 'image full'
...
bzr revid: chm@openerp.com-20140310152847-xjilnu4cxhs3c73b
2014-03-10 16:28:47 +01:00