pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,926 Commits 1 Branch 0 Tags
8dfd5eab0134d8995514b7965d3244d260cabfa4
Commit Graph
252 Commits
Author SHA1 Message Date
Fabien Meghazi 4373f85773 [FIX] Do not self close empty elements that are not html void elements 
bzr revid: fme@openerp.com-20140507121413-o7jqhexbm1wmitt6
 2014-05-07 14:14:13 +02:00
Gery Debongnie 132ccb7180 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
 2014-05-02 14:33:55 +02:00
Cedric Snauwaert 20556abc08 [MERGE]clean and refactored tooltip from branch trunk-tipsy-to-boostrap 
bzr revid: csn@openerp.com-20140416102659-vft9tfuqmax0qx3q
 2014-04-16 12:26:59 +02:00
Randhir Mayatra rma-openerp 36e0eb4e2e [IMP] add required icon 
bzr revid: rma@tinyerp.com-20140327054950-d126732mv15imvyi
 2014-03-27 11:19:50 +05:30
Randhir Mayatra rma-openerp bca2c3d8dc [IMP] add icon for action 
bzr revid: rma@tinyerp.com-20140325123525-5zzvqfyk6mmz6va3
 2014-03-25 18:05:25 +05:30
Randhir Mayatra rma-openerp bddff0f601 [IMP] add class for icon pencil 
bzr revid: rma@tinyerp.com-20140324135900-9mufbqb0w2ftsg46
 2014-03-24 19:29:00 +05:30
Randhir Mayatra (OpenERP) 6cd8ef5c65 [IMP] add icons for stat buttons 
bzr revid: rajmyt@gmail.com-20140320094959-4vki69r7715xvl41
 2014-03-20 15:19:59 +05:30
Christophe Simonis a2f9619e26 [MERGE] forward port of branch saas-3 up to revid 3975 chs@openerp.com-20140318115516-sn3laxqseam1oz3f 
bzr revid: chs@openerp.com-20140318124050-ul3reev0vvmgqxz8
 2014-03-18 13:40:50 +01:00
Christophe Simonis 541a5d3f82 [MERGE] forward port of branch saas-2 up to revid 3904 chs@openerp.com-20140318112743-tqv492026y2pnbff 
bzr revid: chs@openerp.com-20140318115516-sn3laxqseam1oz3f
 2014-03-18 12:55:16 +01:00
Christophe Simonis acb010a985 [MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0 
bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
 2014-03-18 12:27:43 +01:00
chm@openerp.com b9ff076c73 [FIX] css: add important in .fa class for FontAwesome font. The font can't be overwrited by themes and custom css without important arguments 
bzr revid: chm@openerp.com-20140314164244-siih3eo271govt27
 2014-03-14 17:42:44 +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
Thibault Delavallée 5c45aac7ef [IMP] [MONKEY] Re-apply changes introduced at version 3755. 
This commit was a forward-pord of saas-1 commits.
Commit by msh
[FIX]Fixed the issue of cleditor, on window resize blur event not triggered except firefox so due to which value disappears from the container.

bzr revid: tde@openerp.com-20140305105922-cqw9vrvk306jynco
 2014-03-05 11:59:22 +01:00
Thibault Delavallée cc23ddd0ce [IMP] [MONKEY] Re-apply changes introduced at version 3664 that was 
a forward port of 7.0 commits.
Commit 1 by fme.
[FIX] html widget: fix cleditor width when the field was invisible before becoming editable
Commit 2 by tde.
[IMP] cleditor: stop using custom font-size, font-family.

bzr revid: tde@openerp.com-20140305105751-w1i47ytx73ac5gkr
 2014-03-05 11:57:51 +01:00
Thibault Delavallée 17a23c60b8 [IMP] [MONKEY] Re-apply changes introduced at version 3328. 
Original commit by chm.

[FIX] cleditor: When the DOM is modify, the event resize try to call refresh and refresh has not DOM available. Correction : If the DOM as no prent, don't call refresh.

bzr revid: tde@openerp.com-20140305105455-1ewix4pm9m5ob1bm
 2014-03-05 11:54:55 +01:00
Thibault Delavallée bff34f4014 [DUMMY] Void commit with a space change, because this cause a crash in bazaar. 
bzr revid: tde@openerp.com-20140305104931-xnftljkziznsi9qq
 2014-03-05 11:49:31 +01:00
Paramjit Singh Sahota 97cff89b3d [REM] REmoved the jquery.cleditor.min.js for the lib. 
bzr revid: psa@tinyerp.com-20140305050612-8z0jpohvg026l2xi
 2014-03-05 10:36:12 +05:30
Paramjit Singh Sahota 2331b14f57 [UPDATE] Updated the cleditor lib from v1.3.0 to v1.4.4 to fix the INTERNET EXPLORER issues. 
bzr revid: psa@tinyerp.com-20140304132534-8dyuusqda5vsdcit
 2014-03-04 18:55:34 +05:30
Martin Trigaux 7bb95a4468 Update undescore.js to version 1.6 and underscore.string.js to version 2.3 
bzr revid: mat@openerp.com-20140304125528-97w5kbv3ry028kn9
 2014-03-04 13:55:28 +01:00
Christophe Matthieu e2898a1d59 [IMP] web: update lib bootstrap 3.1.0 
bzr revid: chm@openerp.com-20140211111118-ur6xntyf6o9lwsac
 2014-02-11 12:11:18 +01:00
Xavier Morel 1f4bb2d289 [FIX] update CKEditor to 4.3.2, fixes problem of double-escaping of non-ascii characters in widgets 
bzr revid: xmo@openerp.com-20140128141336-boloxf0cfcrzej03
 2014-01-28 15:13:36 +01:00
Christophe Simonis 9af3bf56c0 [ADD] web: add select2 lib 
bzr revid: chs@openerp.com-20140123151934-0u3yl2rsd0zfq4x1
 2014-01-23 16:19:34 +01:00
Thibault Delavallée 7416766f6a [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140116110102-6jo2ta5fjkfppu1j
 2014-01-16 12:01:02 +01:00
Fabien Meghazi 84a840a38c [REM] Removed useless QWeb t-escf and t-rawf 
bzr revid: fme@openerp.com-20140115182018-d7q3e6elm6uqh0ox
 2014-01-15 19:20:18 +01:00
Kunal Chavda (Open ERP) 012a42a6f1 [REM]removed tipsy library. 
bzr revid: kch@tinyerp.com-20131218073709-yv4161e0u4exnwgr
 2013-12-18 13:07:09 +05:30
Xavier Morel eae8cae9dd [IMP] update ckeditor to 4.3.1 
bzr revid: xmo@openerp.com-20131217113003-ave5migr6wecjvch
 2013-12-17 12:30:03 +01:00
Kunal Chavda (Open ERP) 7e40734c20 [FIX]forgot to uncomment code. 
bzr revid: kch@tinyerp.com-20131217094438-kef28woejof2dovn
 2013-12-17 15:14:38 +05:30
Kunal Chavda (Open ERP) e6112472ce [FIX]css issue. 
bzr revid: kch@tinyerp.com-20131217094157-i45wv6xs1uz38kin
 2013-12-17 15:11:57 +05:30
Kunal Chavda (Open ERP) 9c3edd5d6d [REM]removed tooltip.js which is not needed. tooltip included in bootstrap.js. 
bzr revid: kch@tinyerp.com-20131217071004-4upcf6b5bmlok1v9
 2013-12-17 12:40:04 +05:30
bth-openerp 898c293e25 [IMP]\n replaced by <br />. 
bzr revid: bth@tinyerp.com-20131212103342-tddr7vr29zud3vwb
 2013-12-12 16:03:42 +05:30
bth-openerp 5d874a4acb [IMP]Improved css and offset for tooltip. 
bzr revid: bth@tinyerp.com-20131204115824-tbq4nys4c0d2c327
 2013-12-04 17:28:24 +05:30
Antony Lesuisse d699b9253a [MERGE] trunk 
bzr revid: al@openerp.com-20131203192151-szbvhmanml37a9si
 2013-12-03 20:21:51 +01:00
bth-openerp 062e96cc07 [IMP]Add bootstrap tooltip. 
bzr revid: bth@tinyerp.com-20131203101317-bznca04cdosg0x3z
 2013-12-03 15:43:17 +05:30
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
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
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
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 1ec1125349 [UPD] update underscore and underscore.string libraries to latests versions 
bzr revid: chs@openerp.com-20131108134931-muit7ym8q7g3ck1u
 2013-11-08 14:49:31 +01:00
Fabien Meghazi 4aad26f5c2 [ADD] es5-shim 
bzr revid: fme@openerp.com-20130926164902-5ioas0np4tb9qnge
 2013-09-26 18:49:02 +02:00
Fabien Meghazi 3ddeaee79c [MERGE] upstream 
bzr revid: fme@openerp.com-20130814164422-l0h0ueue0fwk94uu
bzr revid: chm@openerp.com-20130828165815-a901l9gx66lj0pj1
bzr revid: fme@openerp.com-20130924125103-65bngr3rnm6k7u3a
 2013-09-24 14:51:03 +02:00
niv-openerp 3210d02d8f [REVERT] reverted 3812 because it's an incorrect way to upgrade an external dependency of OpenERP 
bzr revid: nicolas.vanhoren@openerp.com-20130819092940-9vqh5036p7rf2azv
 2013-08-19 11:29:40 +02:00
Fabien Meghazi 81e028b791 [ADD] QWeb: add async api (backward compatible) 
bzr revid: fme@openerp.com-20130814164322-cny24d0i6tg4ftvn
 2013-08-14 18:43:22 +02:00
Fabien Meghazi 11fb809e60 [MERGE] upstream 
bzr revid: fme@openerp.com-20130807100643-0olinq3584kzc3we
 2013-08-07 12:06:43 +02:00
niv-openerp 9ce24aea39 Merge trunk 
bzr revid: nicolas.vanhoren@openerp.com-20130801125845-2aoeb7l6bicdmk59
 2013-08-01 14:58:45 +02:00
Christophe Matthieu be7b1239c3 [MERGE] from trunk 
bzr revid: chm@openerp.com-20130801123959-479vo299lm5inrli
 2013-08-01 14:39:59 +02:00
Xavier Morel cdee92f984 [IMP] update QUnit to 1.12.0 (doesn't fix issue, adds features) 
bzr revid: xmo@openerp.com-20130801091239-6lz0ya595i226l85
 2013-08-01 11:12:39 +02:00
niv-openerp c8142aa421 Updated qweb 
bzr revid: nicolas.vanhoren@openerp.com-20130731141139-7ssepci9vxnp9hpf
 2013-07-31 16:11:39 +02:00