pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,556 Commits 1 Branch 0 Tags
54eff11470924b20105fa28ec888ed23aaaec3aa
Commit Graph
65 Commits
Author SHA1 Message Date
Christophe Matthieu c35f8a7b48 [FIX] summernote: when the editor create a link, we need to use deleteContents with the flag to_write as true to insert the link at the same place. 2015-04-09 16:07:12 +02:00
Christophe Matthieu 2f5e4149fb [FIX] summernote: wrap the content with p when the user keyup on 'enter' but should not wrap the content if the editable area is a p, li or other para 2015-03-23 12:25:06 +01:00
Christophe Matthieu 513d1a26d1 [FIX] summernote: Summernote change the native id of the editable area if a script use a unique id, summernote break the default comportment. Replace id by data-note-id to set the editor 'id' 2015-03-09 16:33:03 +01:00
Christophe Matthieu ebc5b3b11b [IMP] summernote: dom.isImg is unnecessary, because isVoid function contains that. 2015-02-12 11:58:11 +01:00
Christophe Matthieu 64b0c36f16 [FIX] summernote lib: scroll to top when click on input in editable mode 2015-01-23 12:14:15 +01:00
Christophe Matthieu 60efc27f15 [FIX] website editor: can't select a picture followed by a br tag 2015-01-23 12:14:15 +01:00
Christophe Matthieu 9477b838c6 [IMP] website editor: move media style options from the customize menu to the top editor bar 2015-01-16 16:38:09 +01:00
Christophe Matthieu 65fee06990 [FIX] summbernote lib: if a content selected with CTRL+a begin by an image, the editor switch to the image editor but the range is not correct. Need to display the image style only for real image edition. 2015-01-16 16:38:08 +01:00
Christophe Matthieu 75341ddcf9 [FIX] summernote lib: summernote raise when we triple click on a br in air mode. (merge proposal create to summernote) 2015-01-16 16:38:08 +01:00
Christophe Matthieu a14c802443 [FIX] summernote: wrong selection and delete when user try to delete a br in a text 2015-01-16 16:38:08 +01:00
Christophe Matthieu 1c6eec023d [UPD] website: update of summernote lib 2015-01-08 11:01:43 +01:00
Christophe Matthieu 7c22b96604 [FIX] summernote lib: When we edit a text in a existing link (with the modal) a link is created into the previous link 2015-01-08 11:01:43 +01:00
Christophe Matthieu 1800c07f44 [IMP] summernote lib: save range each time the cuser mouseup or keyup in editable area and restore each time the user active an event. 
In this case the user can click on an other page area and then click on the option without any error
 2015-01-05 10:59:44 +01:00
Christophe Matthieu 30c0e36afa [IMP] summernote lib: set active/unactive buttons for image edition 
https://github.com/summernote/summernote/pull/804
 2015-01-05 10:59:43 +01:00
Christophe Matthieu 064275d7fb [FIX] summernote lib: the prevent default for mousedown image to prevent ie and ff default 'features' must set the range because the cursor is used for edition. 
Modify the code to use the dom range. Warning for picture because the browser can't target the image but the container.

https://github.com/summernote/summernote/pull/803
 2015-01-05 10:59:43 +01:00
Christophe Matthieu 5b07a0dc61 [FIX] summernote lib: some browsers raise when select a range to target a node like an image or a br; createFromNode can't select a node withe more or less of one item. For eg: <div>text <span>one</span></div> the range selected is only 'text ' 
https://github.com/summernote/summernote/pull/799
 2015-01-05 10:59:43 +01:00
Christophe Matthieu 6bd7084476 [IMP] summernote lib: extend createlink to allow to add a class on a link 2015-01-05 10:59:43 +01:00
Christophe Matthieu 12bbcda4c2 [IMP] summernote lib: check if a plugin add a method before the summernote methods because the plugins may be want to overwrite a default comportment. Key and click call plugins with more arguments (to allow the change and use of the lib) and the same arguments (some plugins can use button and key command for the same method) 
https://github.com/summernote/summernote/pull/809
 2015-01-05 10:59:42 +01:00
Christophe Matthieu 9069d0127c [IMP] website: use the new summernote editor 2015-01-05 10:59:42 +01:00
Christophe Matthieu 685d447892 [IMP] summernote: change lib for overwrite method 2015-01-05 10:17:10 +01:00
Christophe Matthieu 1596e45e81 [IMP] website: add summernote lib 2015-01-05 10:17:10 +01:00
Christophe Matthieu 7ce3961693 [FIX] website: update jQuery.transfo lib + adapt code 2014-10-27 10:24:13 +01:00
Simon Lejeune 6e8b678667 [FIX] web: manual update of select2 lib to 3.5.1 version 
The previous version of the lib seemed to be in an inconsistent state.
This fix the select2-offscreen class when the page is larger than
10 000px (this situation happens when importing a file with lots
of column).
 2014-10-02 15:41:55 +02:00
Simon Lejeune 195fa93168 [MERGE] backend front end integration 
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
 2014-06-27 11:03:34 +02:00
chm@openerp.com 58b6aeb01d [IMP] website tour: remove bootstrap Tour lib 
bzr revid: chm@openerp.com-20140321110750-ew8rj3nv2jcort1x
 2014-03-21 12:07:50 +01:00
chm@openerp.com abfccd8936 [WIP] website tour: bootstrap-tour - v0.9.1 
bzr revid: chm@openerp.com-20140320151542-blfr1rs1j24xanh8
 2014-03-20 16:15:42 +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
Paramjit Singh Sahota 89de7d9f25 [MERGE] Merged lp:~openerp/openobject-addons/saas-3 
bzr revid: psa@tinyerp.com-20140227114202-g2yw8pmsn4v0lm05
 2014-02-27 17:12:02 +05:30
Paramjit Singh Sahota 2e49e46698 [FIX] Fixed the sliding issue of carousel library in IE9. The transition was not working in any snippet 
bzr revid: psa@tinyerp.com-20140221061236-7jcbgae7m081pjv8
 2014-02-21 11:42:36 +05:30
Paramjit Singh Sahota e776245b8b [ADD] Added jquery.placeholder lib. because IE9 is not supporting the placeholders. 
bzr revid: psa@tinyerp.com-20140220100716-01mjib3w692qdgi1
 2014-02-20 15:37:16 +05:30
Christophe Matthieu 1b52723e97 [IMP] website: remove bootstrap in addons/website and use bootstrap from web 
bzr revid: chm@openerp.com-20140211110457-cmqdhbs6wugqt14x
 2014-02-11 12:04:57 +01:00
Xavier Morel 36b21e3eca [REM] CKEDITOR development source, 4.3 final added to web client 
bzr revid: xmo@openerp.com-20131120080142-x5vewroum39jwn3g
 2013-11-20 09:01:42 +01:00
Xavier Morel b97a83aa0e [ADD] restyling of select2 integrating it in bootstrap 3 design 
bzr revid: xmo@openerp.com-20131113163508-epqkmwhowok7ofqu
 2013-11-13 17:35:08 +01:00
Christophe Matthieu ecce1f0f4d [FIX] website snippets parallax: remove lib and add custom code to fix editor and reduce code 
bzr revid: chm@openerp.com-20131108150025-xlqoygvkz7122gru
 2013-11-08 16:00:25 +01:00
Fabien Meghazi 937fa8ab99 [ADD] Added custom bootstrap version 
Temporary using a custom branch of bootstrap until the feature
is merged upstream.

The pull request is pending :
https://github.com/twbs/bootstrap/pull/11373/files

bzr revid: fme@openerp.com-20131106114827-gdlb53k4l42h5vq4
 2013-11-06 12:48:27 +01:00
Fabien Meghazi 12801a8cbc [MERGE] upstream 
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
 2013-10-30 09:20:46 +01:00
Fabien Meghazi 7ac3061c42 [WIP] Edit menu dialog 
bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
 2013-10-29 12:24:50 +01:00
Fabien Meghazi 4f3e17ba33 [ADD] jquery-sortable 
bzr revid: fme@openerp.com-20131028152725-70hqe2xjeuuhqt2i
 2013-10-28 16:27:25 +01:00
Xavier Morel 0db0f20bda [ADD] WIP link combo 
bzr revid: xmo@openerp.com-20131028152342-5clhbwwwfcdxxxq0
 2013-10-28 16:23:42 +01:00
Xavier Morel 3655f43e42 [IMP] warnings and shit 
bzr revid: xmo@openerp.com-20131022151144-tblwba9rf77iuidl
 2013-10-22 17:11:44 +02:00
Fabien Pinckaers 07b9c76a1e [IMP] Parallax widget 
bzr revid: fp@openerp.com-20131019205931-t00sxvx71a3wcx3h
 2013-10-19 22:59:31 +02:00
Xavier Morel 2e352ce187 [MERGE] from trunk 
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
 2013-10-14 10:54:59 +02:00
Fabien Pinckaers 11c458d980 [IMP] drop on nearest droppable zone 
bzr revid: fp@openerp.com-20131012084452-gz85w0c5s13v5l1f
 2013-10-12 10:44:52 +02:00
Xavier Morel cb9f597d50 [FIX] http://dev.ckeditor.com/ticket/10912, necessary for image widget edition 
bzr revid: xmo@openerp.com-20131010085603-dfpxbdqwf4m75osb
 2013-10-10 10:56:03 +02:00
ddm 0c2d204bb1 [FIX] Add editor tour missing files 
bzr revid: ddm@openerp.com-20131002085018-af7yc5oyjx4opr9j
 2013-10-02 10:50:18 +02:00
Xavier Morel 89fc31a633 [MERGE] from trunk 
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
 2013-09-23 14:03:28 +02:00
Christophe Matthieu fd24ee28c0 [IMP] website snippets: change style of edit button; add font and fix bootstrap; add style menu 
bzr revid: chm@openerp.com-20130919102014-vf8etjniyevj40n3
 2013-09-19 12:20:14 +02:00
Xavier Morel 0c145b7577 [FIX] completely remove usages of link and image plugin and import missing pieces 
CKEDITOR plugins are not loaded in dependency order (see previous
commits), and in the end the vast majority of the (used subpart of)
link and image plugins were reimplemented to handle new dialogs.

Bite the bullet, disable link and image and implement/import missing
parts (link removal, doubleclick hooks & toolbar button definition).

bzr revid: xmo@openerp.com-20130916090353-933av2nsrygxz64y
 2013-09-16 11:03:53 +02:00
Xavier Morel 560f12cffc [FIX] monkey patch CKEDITOR loading 
Order of plugin initialization is apparently completely fucked, and
most definitely does not take dependencies in account (the
dependencies get loaded, but *when* they are...).

One of the things which drives init order is local (already loaded)
versus remote (js file to fetch): local plugins will be initialized
before remote, whatever the dependencies are.

Monkey patch resourcemanager's load method so it yields an object
initialized in order of its input (nb *still* not dependency order) to
ensure our local plugins are loaded after all builtin ones.

bzr revid: xmo@openerp.com-20130913144554-020u1367wto6ooh9
 2013-09-13 16:45:54 +02:00
Xavier Morel 16492e4ca7 [MERGE] from trunk 
bzr revid: xmo@openerp.com-20130913125230-38lb4jv8ypt6y9dh
 2013-09-13 14:52:30 +02:00