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
58b6aeb01d
[IMP] website tour: remove bootstrap Tour lib
...
bzr revid: chm@openerp.com-20140321110750-ew8rj3nv2jcort1x
2014-03-21 12:07:50 +01:00
abfccd8936
[WIP] website tour: bootstrap-tour - v0.9.1
...
bzr revid: chm@openerp.com-20140320151542-blfr1rs1j24xanh8
2014-03-20 16:15:42 +01:00
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
89de7d9f25
[MERGE] Merged lp:~openerp/openobject-addons/saas-3
...
bzr revid: psa@tinyerp.com-20140227114202-g2yw8pmsn4v0lm05
2014-02-27 17:12:02 +05:30
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
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
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
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
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
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
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
12801a8cbc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
2013-10-30 09:20:46 +01:00
7ac3061c42
[WIP] Edit menu dialog
...
bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
2013-10-29 12:24:50 +01:00
4f3e17ba33
[ADD] jquery-sortable
...
bzr revid: fme@openerp.com-20131028152725-70hqe2xjeuuhqt2i
2013-10-28 16:27:25 +01:00
0db0f20bda
[ADD] WIP link combo
...
bzr revid: xmo@openerp.com-20131028152342-5clhbwwwfcdxxxq0
2013-10-28 16:23:42 +01:00
3655f43e42
[IMP] warnings and shit
...
bzr revid: xmo@openerp.com-20131022151144-tblwba9rf77iuidl
2013-10-22 17:11:44 +02:00
07b9c76a1e
[IMP] Parallax widget
...
bzr revid: fp@openerp.com-20131019205931-t00sxvx71a3wcx3h
2013-10-19 22:59:31 +02:00
2e352ce187
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20131014085459-dhbypq0hg3lzzf3j
2013-10-14 10:54:59 +02:00
11c458d980
[IMP] drop on nearest droppable zone
...
bzr revid: fp@openerp.com-20131012084452-gz85w0c5s13v5l1f
2013-10-12 10:44:52 +02:00
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
0c2d204bb1
[FIX] Add editor tour missing files
...
bzr revid: ddm@openerp.com-20131002085018-af7yc5oyjx4opr9j
2013-10-02 10:50:18 +02:00
89fc31a633
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20130923120328-0wgd7wxhl1y5qyhr
2013-09-23 14:03:28 +02:00
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
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
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
16492e4ca7
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20130913125230-38lb4jv8ypt6y9dh
2013-09-13 14:52:30 +02:00
96d0662732
[FIX] Missing CDN files
...
bzr revid: ddm@openerp.com-20130913095105-go1lz4fjh8d7rq0j
2013-09-13 11:51:05 +02:00
2b0e1291f5
[IMP] include CDN scripts for faster local development
...
bzr revid: ddm@openerp.com-20130913094538-f4crv0ndsv1e7ryj
2013-09-13 11:45:38 +02:00
4513603573
[FIX] force ckeditor lang to en and replace en-gb localization file with en
...
avoids automatic locale picking selecting something different than the one locale file currently provided and blowing up, preventing edition from working
bzr revid: xmo@openerp.com-20130912154957-yod17u9xvw3r966i
2013-09-12 17:49:57 +02:00
399963058b
[ADD] ckeditor source
...
forgot I'd just symlinked it locally
bzr revid: xmo@openerp.com-20130911163359-wtwxbiz2rxogdp2j
2013-09-11 18:33:59 +02:00
f6762f79e6
[MERGE] from trunk likely completely broken
...
bzr revid: xmo@openerp.com-20130909094437-kyxvgoz7zxt3fes0
2013-09-09 11:44:37 +02:00
31c9ddeb44
[IMP] remove unused file
...
bzr revid: fp@tinyerp.com-20130830101233-7ykfao5z7rf0jqac
2013-08-30 12:12:33 +02:00
4eee602d6e
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: bth@tinyerp.com-20130829063717-t8kqjombb25gqmsb
2013-08-29 12:07:17 +05:30
a7e58993cd
[ADD] oe_dirty handling via mutation observers
...
shim necessary for browsers supporting old mutation events but not new mutation observers
bzr revid: xmo@openerp.com-20130828084945-yfqrs0v9v8iecwjm
2013-08-28 10:49:45 +02:00
ee75ddc8a8
[IMP]Add faltly theme.
...
bzr revid: bth@tinyerp.com-20130827092251-mtm953jhudkrccqm
2013-08-27 14:52:51 +05:30
29b1eab776
[REM]Removed responsive css and flalty theme's css files of bootstrap 2 and added themes css of bootstrap 3.0.
...
bzr revid: bth@tinyerp.com-20130827074521-xp62gk06irkhwrf7
2013-08-27 13:15:21 +05:30
d264a49b37
[IMP]Added js and css of bootstrap 3.0 in website module.
...
bzr revid: bth@tinyerp.com-20130823062541-nabdko619qkphdcz
2013-08-23 11:55:41 +05:30
fc8321f103
[ADD] inline edition plugin
...
* No feature on plugin itself save marking field zones
- TODO: handling of specific field types
* ckeditor 4.3 (?) broke sharedspace plugin
* symlinked ckeditor, to fix
* new save API (by view section)
bzr revid: xmo@openerp.com-20130812093314-ur8l7jjzf40fwlxy
2013-08-12 11:33:14 +02:00
5082758f86
[ADD] forgot sharedspace plugin
...
bzr revid: xmo@openerp.com-20130807123019-7mfe70kdk4wtvjx1
2013-08-07 14:30:19 +02:00
195ebf72d0
replacing css madness by bootstrap, homepage is mostly ok, ecommerce is broken
...
bzr revid: fva@openerp.com-20130730160317-j5aj1ktxt3u5rlyf
2013-07-30 18:03:17 +02:00
9e3c561fc5
[FIX] bootstrap location
...
bzr revid: fme@openerp.com-20130722145732-lnqjpbp6nbbcr3ko
2013-07-22 16:57:32 +02:00
Simon Lejeune
chm@openerp.com
Christophe Simonis
Paramjit Singh Sahota
Christophe Matthieu
Xavier Morel
Fabien Meghazi
Fabien Pinckaers
ddm
Fabien Pinckaers
bth-openerp
Frédéric van der Essen