pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
6345 Commits
Author SHA1 Message Date
Antony Lesuisse d699b9253a [MERGE] trunk 
bzr revid: al@openerp.com-20131203192151-szbvhmanml37a9si
 2013-12-03 20:21:51 +01:00
Antony Lesuisse 4c45774b6d [IMP] manual exception handling for non-json controllers 
bzr revid: al@openerp.com-20131203191621-xu2350cw0u3izn3s
 2013-12-03 20:16:21 +01:00
Christophe Simonis 7e8a5f7697 [FIX] web: openerpframework.js: do not use _.str 
openerpframework.js can be used as standalone library (im_livechat uses
it this way) and do not depend on underscore.string.js

bzr revid: chs@openerp.com-20131203132937-ss7hx1gligzai5ch
 2013-12-03 14:29:37 +01:00
Mohammed Shekha (OpenERP) b3391cd7fe [FIX]Web: Fixed the issue of immediate update of many2one field when many2one object name has been changed from follow button popup, reloaded the record from database forcefull to update dataaset, do not call form-blur when follow button is clicked, also do not evict record when record is still not created. 
bzr revid: msh@openerp.com-20131203123856-gce4li1igo9k1mak
 2013-12-03 18:08:56 +05:30
Christophe Matthieu bab3b3b8d4 [IMP] css small change for bootstrap 
bzr revid: chm@openerp.com-20131202162839-9fa0jc7vhyxltje3
 2013-12-02 17:28:39 +01:00
Antony Lesuisse da6fee2ac1 [FIX] session expired 
bzr revid: al@openerp.com-20131202154206-6efsbeeg0mq7s67z
 2013-12-02 16:42:06 +01:00
Christophe Matthieu 60a55f1077 [MERGE] sync with trunk (to rev 3893) 
bzr revid: chm@openerp.com-20131202151847-4sf0ww58meql0e4z
 2013-12-02 16:18:47 +01:00
Xavier Morel ef08d834f6 [IMP] add warning re. changed behavior of backbone which may be changed in the client 
bzr revid: xmo@openerp.com-20131202151838-z26qnz0xpt3tigrd
 2013-12-02 16:18:38 +01:00
Xavier Morel 0dff8277cc [FIX] breakage due to backbone change: in 1.0+, this.reset() will call this.add() 
in 0.9, this.add would only be called if items were provided to
reset(), changed in commit cf6e862.

bzr revid: xmo@openerp.com-20131202151037-xxmvu5790p2jsxz6
 2013-12-02 16:10:37 +01:00
jke-openerp fb9fed536c [Merge] Merge with trunk 
bzr revid: jke@openerp.com-20131202142423-mpg3wg6dlr6wxxmp
 2013-12-02 15:24:23 +01:00
Antony Lesuisse 753cb31804 [IMP] upgrade backbone to 1.1.0 
bzr revid: al@openerp.com-20131202142240-ifh2rua2oiennfao
 2013-12-02 15:22:40 +01:00
Antony Lesuisse 9b40c572ae [REM] gravatar support 
bzr revid: al@openerp.com-20131202135414-kkm0wz06naitbp4y
 2013-12-02 14:54:14 +01:00
Antony Lesuisse e057a64a02 [IMP] update fontawseome to 4.0.3 
bzr revid: al@openerp.com-20131202133803-1muybwahwjo9e5sm
 2013-12-02 14:38:03 +01:00
Antony Lesuisse d6c6f31231 [MERGE] boostrap3 manually merged 
bzr revid: al@openerp.com-20131202131943-b01fb56u0qsgcs53
 2013-12-02 14:19:43 +01:00
Launchpad Translations on behalf of openerp 9f04e0c76c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130050422-r8hhiot5r58eukys
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130051429-uepuma01yhw11md9
 2013-11-30 05:14:29 +00:00
Fabien Meghazi f4c0fac4fb [ADD] added serialize_exception decorator 
See server's trunk-website-al revision #5085

bzr revid: fme@openerp.com-20131128181016-2t8d0qcrmux9nkoe
 2013-11-28 19:10:16 +01:00
Christophe Matthieu e468eeb9b3 [FIX] web_form: FieldMany2ManyBinaryMultiFiles error when rendering twice (with an onchange for e.g.) 
bzr revid: chm@openerp.com-20131128134607-2fisdnoq0qgpvibx
 2013-11-28 14:46:07 +01:00
jke-openerp 2a2c63481f [MERGE] Merge with trunk 
bzr revid: jke@openerp.com-20131127175544-x83mqqo5uo87f75b
 2013-11-27 18:55:44 +01:00
Xavier Morel fbb5ddce18 [FIX] MockRequestCase, broken when set_request was removed in server revid:fme@openerp.com-20131120192550-i9xzyqkufe3stnb3 
bzr revid: xmo@openerp.com-20131127111614-n6xjqljzviy2i59m
 2013-11-27 12:16:14 +01:00
Thibault Delavallée 727b188eac [IMP] form_view: statusbar widget: folded back as an option. 
The widget option 'fold_field' allows to tell the widget to use this field on
the model used for stages to compute the folded selection.

If not set, no stage is folded.

bzr revid: tde@openerp.com-20131127095037-me1cvl272ex1e6r9
 2013-11-27 10:50:37 +01:00
Christophe Simonis 9f52ab382b [MERGE] forward port of branch saas-2 up to revid 3887 chs@openerp.com-20131122172422-tsd8wzqkbqknrw1w 
bzr revid: chs@openerp.com-20131125160506-30uia4pdwzpp54gj
 2013-11-25 17:05:06 +01:00
Christophe Simonis 162dd9ad17 [MERGE] forward port of branch 7.0 up to revid 4075 chs@openerp.com-20131122170316-lbuxddprrgz1are3 
bzr revid: chs@openerp.com-20131122131553-i22dj95bvofb7aeu
bzr revid: chs@openerp.com-20131122172422-tsd8wzqkbqknrw1w
 2013-11-22 18:24:22 +01:00
Christophe Simonis 1be71fdae6 [REVERT] revert previous commit which: 
1. is wrong
2. break runbot

bzr revid: chs@openerp.com-20131122170316-lbuxddprrgz1are3
 2013-11-22 18:03:16 +01:00
Frédéric van der Essen 0a76694628 [IMP] webclient: Introducing SimpleIndexedDB, a key value wrapper around IndexedDB 
bzr revid: fva@openerp.com-20131122140048-goaplzrx26jvcmmu
 2013-11-22 15:00:48 +01:00
Frédéric van der Essen 5c080a1634 [IMP] webclient: Introducing the FullscreenWidget, enabling fullscreen behavior and fixed zoomlevels on mobile devices 
bzr revid: fva@openerp.com-20131122135959-ezv9cmgwp2zfkt00
 2013-11-22 14:59:59 +01:00
Christophe Simonis e555872646 [FIX] web: view list: ensure that the mutex of synchronized method reload_content is always released. 
bzr revid: chs@openerp.com-20131122131037-sqxs1fdh4al32eh2
 2013-11-22 14:10:37 +01:00
Launchpad Translations on behalf of openerp bdc5ae3291 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121052817-v5bocf8e1j6pbuby
 2013-11-21 05:28:17 +00:00
Christophe Simonis 8721307dae [IMP] web: avoid double reload() when clicking on a button on a editable form view. 
bzr revid: chs@openerp.com-20131120185337-w8857fmwosa36r4d
 2013-11-20 19:53:37 +01:00
Launchpad Translations on behalf of openerp b1f8f3dfd2 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060235-8k2oxuc94x45jjoc
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060308-lb2sgcxbv804pafr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062541-ouuae0dl331ekjcb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054520-eypowk6g8qatvq7n
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054421-95x86930ezm0p33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063904-5igv5f7tgwlaipvv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060313-x4c5bx498gyrkhqr
 2013-11-22 06:03:13 +00:00
Xavier Morel f39d4398b8 [ADD] custom build of CKEditor 4.3 final 
bzr revid: xmo@openerp.com-20131120080111-vvtfcpjlxhz66wn2
 2013-11-20 09:01:11 +01:00
Christophe Simonis f534c7e3f2 [FIX] web: when in monodb mode, allow admin routes to be called without being logged in. 
This restore old behavior lost by commit 3882 chs@openerp.com-20131118172304-a54lgu6dm865k8xf

bzr revid: chs@openerp.com-20131119134815-hui4ph7a8ksgfxdt
 2013-11-19 14:48:15 +01:00
Olivier Dony 6c109ece30 [FIX] root redirect_with_hash: IE10 also behaves abnormally in case of multiple redirects 
bzr revid: odo@openerp.com-20131119105326-0t1cjz1d1ebfzhwq
 2013-11-19 11:53:26 +01:00
Antony Lesuisse 584d21a26f [FIX] field statusbar css color between stages 
bzr revid: al@openerp.com-20131118182416-picnqdmcwbqalk2y
 2013-11-18 19:24:16 +01:00
Christophe Simonis 07c80735df [FIX] web: avoid calling db_monodb at each request. This is a performance killer. Handle the case of non-existing database at router building. 
bzr revid: chs@openerp.com-20131118172304-a54lgu6dm865k8xf
 2013-11-18 18:23:04 +01:00
Antony Lesuisse 7c9be80f95 [FIX] jquery browser detection fix 
bzr revid: al@openerp.com-20131118180642-xa39ja4o8zt8zd5o
 2013-11-18 19:06:42 +01:00
Fabien Meghazi 7c934d3969 [MERGE] upstream 
bzr revid: xmo@openerp.com-20131115105349-0b1bifqe3v9159w2
bzr revid: fme@openerp.com-20131118124023-68c4armtmlx2dybz
 2013-11-18 13:40:23 +01:00
Fabien Meghazi 5f40fc7c08 [ADD] return_label & return_url in action_manager#load_state for breadcrumbs 
bzr revid: fme@openerp.com-20131118123808-85i8csvgodgjei18
 2013-11-18 13:38:08 +01:00
Fabien Meghazi 9ded116baf [ADD] return_label & return_url in action_manager#load_state for breadcrumb 
bzr revid: fme@openerp.com-20131118112211-q15p0d7cc8wpku5n
 2013-11-18 12:22:11 +01:00
Fabien Meghazi bb9c83714a [FIX] Avoid rpc errors on actions.act.url@target='self' 
bzr revid: fme@openerp.com-20131118102112-znm2mza36md6896n
 2013-11-18 11:21:12 +01:00
Christophe Simonis 36b3ea41d8 [MERGE] forward port of branch saas-1 up to revid 3751 chs@openerp.com-20131115104909-3u3mu40g9xnler88 
bzr revid: chs@openerp.com-20131115112311-mq197ugcdc38gjnw
 2013-11-15 12:23:11 +01:00
Christophe Simonis 993bff902e [MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv 
bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88
 2013-11-15 11:49:09 +01:00
Christophe Simonis 322578383c [FIX] web: it's better if the route allowing users to log in is accessible without being logged in. 
bzr revid: chs@openerp.com-20131114185202-yyhg7opc004hte02
 2013-11-14 19:52:02 +01:00
Christophe Simonis 1e4b2695d5 [MERGE][FIX] web: fix race condition in BufferedDataset. 
Backport of saas-2 commit 3867 nicolas.vanhoren@openerp.com-20131107112017-7omd01ocvnbzx9m6

lp bug: https://launchpad.net/bugs/1248531 fixed

bzr revid: chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
 2013-11-14 15:26:39 +01:00
Christophe Simonis e5ca5a170c [FIX] web: list views: bubble up failed deferreds. 
[FIX] web: list view group: always call post_render method

lp bug: https://launchpad.net/bugs/1248531 fixed

bzr revid: chs@openerp.com-20131114110847-nn382fc60s7u7wp1
 2013-11-14 12:08:47 +01:00
Christophe Simonis b61997e716 [FIX] web: correct url matching in tests 
bzr revid: chs@openerp.com-20131114094624-588lvc9vunwa99d8
 2013-11-14 10:46:24 +01:00
Launchpad Translations on behalf of openerp 99ffbd28ed Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063103-0ehwa7pk99d5b4k4
 2013-11-14 06:31:03 +00:00
Christophe Simonis e9c633cb7e [IMP] web: call call_kw with full route to help debugging 
bzr revid: chs@openerp.com-20131113184000-3k3dnwl5ftllq2rv
 2013-11-13 19:40:00 +01:00
Xavier Morel a3e4cdef51 [ADD] hacky abort() proxy for json requests 
bzr revid: xmo@openerp.com-20131113151911-l4f7vlzkcht38nuc
 2013-11-13 16:19:11 +01:00
Gery Debongnie 30e6eadf42 [FIX] fixes a problem in pyeval catching all exceptions silently 
bzr revid: ged@openerp.com-20131113102204-m0gox7odwgkmon4o
 2013-11-13 11:22:04 +01:00
niv-openerp c281862604 [FIX] Attempt to resolve the bug that makes the runbot crash 
bzr revid: nicolas.vanhoren@openerp.com-20131113155340-srjkfv372jsyg5vl
 2013-11-13 16:53:40 +01:00