Commit Graph

172 Commits

Author SHA1 Message Date
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
Christophe Simonis 1091b24a0c [MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
Christophe Simonis 1953aa442f [MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
2014-05-07 17:33:48 +02:00
Denis Ledoux 883f695b67 [FIX] auth_oauth: missing field body in formview
The body is the field used to actually display the 'log in with ...'
As not shown in the view, when adding a new provider, this field was empty and therefore wasnt visible on the login form...

bzr revid: dle@openerp.com-20140507102414-vz7ur7zvh4ptuk2e
2014-05-07 12:24:14 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Christophe Simonis 3a7e003656 [MERGE] forward port of branch saas-3 up to revid 9394 chs@openerp.com-20140410103638-x7vajn70ewsfp0ck
bzr revid: chs@openerp.com-20140410110424-enhdg6pufhii56ni
2014-04-10 13:04:24 +02:00
Denis Ledoux ff76882701 [FIX] auth_oauth: avoid infinite loop while trying to sign in
bzr revid: dle@openerp.com-20140407155919-vm32q6nvcit59026
2014-04-07 17:59:19 +02:00
Denis Ledoux 6027657e3e [FIX] auth_oauth: redirect to url before sign in
bzr revid: dle@openerp.com-20140407150027-z46yxuh3a9uqoz26
2014-04-07 17:00:27 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01: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
Fabien Meghazi a8f513f4f2 [MERGE] upstream
bzr revid: fme@openerp.com-20140312152942-egbzui0drs85wt7i
2014-03-12 16:29:42 +01:00
Fabien Meghazi 2ed053642a [IMP] oaut & signup, redirect if already logged in
bzr revid: fme@openerp.com-20140312112141-uvo89w4ovmzq5ozq
2014-03-12 12:21: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
Kersten Jeremy 590b50f548 [FIX] Compare the real pathname with the new url and not the object windows.location
bzr revid: jke@openerp.com-20140305164321-xw05yeun302rizm4
2014-03-05 17:43:21 +01:00
Christophe Simonis 2ab0441ec2 [FIX] auth_oauth: reset openerp oauth client_id when generating new dbuuid
bzr revid: chs@openerp.com-20140305114110-ym3c0x3muc34ep7b
2014-03-05 12:41:10 +01:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Fabien Meghazi 312991ca1e [FIX] ensure_db() on inherited /web/login controllers
bzr revid: fme@openerp.com-20140227164141-1sblr0g6ta66q1em
2014-02-27 17:41:41 +01:00
Fabien Meghazi 152e70e9fa [IMP] seperation of auth_signup's reset password and signup routes
bzr revid: fme@openerp.com-20140227154955-tnxyzw1ynuwlo5mj
2014-02-27 16:49:55 +01:00
Kersten Jeremy 49a92c376a [FIX] Fix loop when parse hash into get param with no hash
bzr revid: jke@openerp.com-20140227130705-jlvl157aio3o4df3
2014-02-27 14:07:05 +01:00
Fabien Meghazi 2868e9a6ac [MERGE] upstream
bzr revid: fme@openerp.com-20140227101725-7egd9xq859jasnhj
2014-02-27 11:17:25 +01:00
Fabien Meghazi 35a7182893 [MERGE] upstream
bzr revid: fme@openerp.com-20140225104654-d1ni7z5t8w0qc7mw
2014-02-25 11:46:54 +01:00
Fabien Meghazi 6f670c58ce [REM] Removed lazy response usage
bzr revid: fme@openerp.com-20140219103032-5pc50taemkc6x0qo
2014-02-19 11:30:32 +01:00
Fabien Meghazi 33bfec2174 [IMP] Make auth_oauth depends of auth_signup, merge and remove auth_oauth_signup link module
bzr revid: fme@openerp.com-20140212101547-i4bcz9lcrut11kpu
2014-02-12 11:15:47 +01:00
Christophe Simonis 04e783e880 [FIX] auth_oauth: decorator @fragment_to_query_string must redirect to same route
bzr revid: chs@openerp.com-20140211145529-cp1rhf3hbhvq4sg4
2014-02-11 15:55:29 +01:00
Fabien Meghazi e974e1fbea [REM] remove disable_db and ensure_db() from addons
bzr revid: fme@openerp.com-20140130092308-s24a7h2mhzuaasf1
2014-01-30 10:23:08 +01:00
Denis Ledoux 0306adbfe3 [FIX] *: using werkzeug.url_encode instead of urllib.urlencode because urliblib.encode does not accept unicode
bzr revid: dle@openerp.com-20140129121316-b5f5e4r6fz9l80kq
2014-01-29 13:13:16 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Fabien Meghazi 031523fa5b [FIX] use of http#ensure_db in auth_* modules
bzr revid: fme@openerp.com-20140128211723-3135gyn0raxjz8qc
2014-01-28 22:17:23 +01:00
Christophe Simonis c5d7340e9b [FIX] auth_oauth: do not shadow non-oauth errors
bzr revid: chs@openerp.com-20140128181156-489gcdkiq0yaopda
2014-01-28 19:11:56 +01:00
Fabien Meghazi f959685bc7 [IMP] auth_oauth_singup converted to server side controllers
bzr revid: fme@openerp.com-20140128104559-fafi73deyiplw7tx
2014-01-28 11:45:59 +01:00
Fabien Meghazi 35383bdc39 [FIX] auth_oauth
bzr revid: fme@openerp.com-20140128085945-r5mrypiyinxs2s3h
2014-01-28 09:59:45 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Fabien Meghazi 289074e0c8 [IMP] auth_oauth converted to server side views
bzr revid: fme@openerp.com-20140127181606-236dvru2tcvg42qo
2014-01-27 19:16:06 +01:00
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00:00
Fabien Meghazi 2c02157b7b [ADD] Comment some Login addons javascript until they are remade server side
bzr revid: fme@openerp.com-20140114090819-vfswqeuqg2bg3ybu
2014-01-14 10:08:19 +01:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Christophe Simonis 2172b12817 [FIX] auth_oauth: decorator @fragment_to_query_string accept positional arguments
bzr revid: chs@openerp.com-20131114184550-6zm3gzxfqn2d9dwt
2013-11-14 19:45:50 +01:00
Launchpad Translations on behalf of openerp 2a6e668f74 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113052604-53vea9wu1njlqbsg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114052303-klxv7xa52p3ejjud
2013-11-14 05:23:03 +00:00
Launchpad Translations on behalf of openerp 1d354694cf Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131115063223-eu9nf550yqn4iu0g
2013-11-15 06:32:23 +00:00
Launchpad Translations on behalf of openerp 108ccbf108 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Antony Lesuisse 3d8b7984be import cleanups part1
bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh
2013-10-22 19:06:59 +02:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
Olivier Dony 788eb29237 [MERGE] Forward-port of 7.0 bugfixes up to rev.9369 rev-id: launchpad_translations_on_behalf_of_openerp-20130820051502-deoiql3lru7goosd
bzr revid: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
2013-08-20 17:26:07 +02:00
Launchpad Translations on behalf of openerp 0e74fd31a4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00