Richard Mathot (OpenERP)
dd6ff90160
[IMP] Changelog file
...
bzr revid: rim@openerp.com-20131022131837-fwmtyjqenb33q5tr
2013-10-22 15:18:37 +02:00
Richard Mathot (OpenERP)
55a53ec9ef
[MER] Resolving conflicts
...
bzr revid: rim@openerp.com-20131022072438-1aucyd1epcunohd1
2013-10-22 09:24:38 +02:00
Richard Mathot (OpenERP)
ad0c739aa8
[MER] Merge from trunk
...
bzr revid: rim@openerp.com-20131021151339-bqb0canxswdnrvph
bzr revid: rim@openerp.com-20131022072009-wf4kgjq9gvsbbvw8
2013-10-22 09:20:09 +02:00
Fabien Pinckaers
24e87a724a
[IMP] uncomment for perf
...
bzr revid: fp@tinyerp.com-20131021153918-zpnp0xhisorgg3ws
2013-10-21 17:39:18 +02:00
Richard Mathot (OpenERP)
e5ea84c6bd
Reverting to old *non working* hr_evaluation, still not working with new survey
...
bzr revid: rim@openerp.com-20131021151220-fj6qi52la794m6ub
2013-10-21 17:12:20 +02:00
Richard Mathot (OpenERP)
3e5977db6a
typo
...
bzr revid: rim@openerp.com-20131021151051-f2wuuwbyxbj038fi
2013-10-21 17:10:51 +02:00
Fabien Pinckaers
05476f9b31
[IMP] double click on image change on banner
...
bzr revid: fp@tinyerp.com-20131021150124-411dxmatcxorto0m
2013-10-21 17:01:24 +02:00
Richard Mathot (OpenERP)
e16f2b8465
[REF] Small refactoring
...
bzr revid: rim@openerp.com-20131021145725-k9d2wqphhi6hv9u9
2013-10-21 16:57:25 +02:00
Richard Mathot (OpenERP)
ae3d3bd4d4
[FIX] compatibility with survey
...
bzr revid: rim@openerp.com-20131021145633-f61radfexcgcynw5
2013-10-21 16:56:33 +02:00
Richard Mathot (OpenERP)
1a3acf0edc
[IMP] Language
...
bzr revid: rim@openerp.com-20131021141308-m3n54ya093hxofv7
2013-10-21 16:13:08 +02:00
Richard Mathot (OpenERP)
90e9745343
[FIX] old state 'waiting_answer' does not exists anymore in survey
...
bzr revid: rim@openerp.com-20131021141244-0lzx6phm8coxptiw
2013-10-21 16:12:44 +02:00
Richard Mathot (OpenERP)
8ebca9ac0f
[FIX] prevent views errors in hr_evaluation (module logic to be reviewed)
...
bzr revid: rim@openerp.com-20131021134513-tnjukk1v03wn93fg
2013-10-21 15:45:13 +02:00
ddm
2771c47379
[FIX] Ace: proper template naming
...
bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
2013-10-21 15:39:57 +02:00
Richard Mathot (OpenERP)
cd3cd8d034
[IMP] Adding a category for surveys
...
bzr revid: rim@openerp.com-20131021132757-k0fwigs10z3mt75w
2013-10-21 15:27:57 +02:00
Richard Mathot (OpenERP)
eb849337f7
[FIX] Fixing hr_evaluation dependencies to survey's models
...
bzr revid: rim@openerp.com-20131021132331-ud423hbwnrjkmjo2
2013-10-21 15:23:31 +02:00
Richard Mathot (OpenERP)
41585a39f6
[FIX] Removing outdated code
...
bzr revid: rim@openerp.com-20131021121534-fhmeu1k996kzcekr
2013-10-21 14:15:34 +02:00
Richard Mathot (OpenERP)
a67126a19b
[MER] Merging upstream work
...
bzr revid: rim@openerp.com-20131021120311-2qfgftldcmbm640k
2013-10-21 14:03:11 +02:00
Richard Mathot (OpenERP)
4869e4aa68
[MER] Merge from trunk (again)
...
bzr revid: rim@openerp.com-20131021091304-agm7fkfghyj6x9il
bzr revid: rim@openerp.com-20131021095445-a89gihxaqs8swn0l
bzr revid: rim@openerp.com-20131021103710-gzgzmuxo41ztz5qn
2013-10-21 12:37:10 +02:00
ddm
75a4a7e3f8
[IMP] Ace: proper template naming
...
bzr revid: ddm@openerp.com-20131021102840-h8s2nflqdmuumun0
2013-10-21 12:28:40 +02:00
ddm
24c3e4016b
[IMP] Ace: light opacity trick
...
bzr revid: ddm@openerp.com-20131021095158-6037xha2bqyihv0q
2013-10-21 11:51:58 +02:00
ddm
6ee4768a42
[IMP] Tutorial: extract first tour to own style
...
bzr revid: ddm@openerp.com-20131021093959-ojzaceh2lul0afja
2013-10-21 11:39:59 +02:00
ddm
a403bc0318
[IMP] Ace: remember editor width when resizing
...
bzr revid: ddm@openerp.com-20131021091004-nchmsogl6349az8h
2013-10-21 11:10:04 +02:00
Richard Mathot (OpenERP)
31c582874d
[REF] Importing previous work by chm
...
bzr revid: rim@openerp.com-20131021090319-zbi93frwqpcvxkk9
2013-10-21 11:03:19 +02:00
ddm
43a09310cb
[FIX] Ace: close editor when 'edit' is pressed
...
bzr revid: ddm@openerp.com-20131021085229-k60nkz6t0ggrokqu
2013-10-21 10:52:29 +02:00
ddm
a57c7e7c92
[IMP] Ace: display 'resize' cursor when hovering over gutter
...
bzr revid: ddm@openerp.com-20131021084841-efcxt96c5x17u2m1
2013-10-21 10:48:41 +02:00
Fabien Pinckaers
ac3123bbd3
[IMP] parallax default photo
...
bzr revid: fp@openerp.com-20131020093502-mn4c6s91up3bmqbu
2013-10-20 11:35:02 +02:00
Fabien Pinckaers
42f69cc848
[IMP] transparent background for vegetables
...
bzr revid: fp@openerp.com-20131020092215-ljejg7i0rh9e0km9
2013-10-20 11:22:15 +02:00
Fabien Pinckaers
b52dc0d0e6
[IMP] carousel, no interval; it was too fast and continued to slide when editing
...
bzr revid: fp@openerp.com-20131020091918-yfr7w8a706pdnbxk
2013-10-20 11:19:18 +02:00
Fabien Pinckaers
bda5d6bbfe
[IMP] parallax css. I think we should use elements <img> instead of bg
...
bzr revid: fp@openerp.com-20131019211709-5zxz9601fw7qtu1k
2013-10-19 23:17:09 +02:00
Fabien Pinckaers
b461fc3253
[IMP] css improvement parallax
...
bzr revid: fp@openerp.com-20131019210050-1fcn80fmqc2w66sd
2013-10-19 23:00:50 +02:00
Fabien Pinckaers
07b9c76a1e
[IMP] Parallax widget
...
bzr revid: fp@openerp.com-20131019205931-t00sxvx71a3wcx3h
2013-10-19 22:59:31 +02:00
ddm
6835151fb2
[FIX] Typo
...
bzr revid: ddm@openerp.com-20131018163341-j5bf8sqj4wz8yp14
2013-10-18 18:33:41 +02:00
8cd32883a3
[IMP] add scroll speed options in parallax snippet
...
bzr revid: rgaopenerp-20131018145313-4li3mwyte19n0cf9
2013-10-18 20:23:13 +05:30
ddm
20e4f1fc29
[FIX] SEO 'aware' models
...
bzr revid: ddm@openerp.com-20131018135926-vdmelqsp1ama13st
2013-10-18 15:59:26 +02:00
Fabien Meghazi
0373662dd4
[NODISK] @ddm: Got no floppy disk so I push here
...
bzr revid: fme@openerp.com-20131018130034-vo6rgndvzv1ni6nu
2013-10-18 15:00:34 +02:00
Christophe Matthieu
a93a0b384b
[IMP] website: traceback, node, message in page 500
...
bzr revid: chm@openerp.com-20131018114116-ywe7pp49f2cb0dor
2013-10-18 13:41:16 +02:00
Xavier Morel
8559444986
[FIX] tab handling in tables
...
CKEditor's tab plugin can't deal with a non-editable editor root
(editor.editable().hasFocus returns false and disables it), so
reimplement the behavior.
For some reason, ckeditor's selection API also does not seem to work
correctly in table cells in Firefox, so use the browser's native API
instead.
Tab goes to the next cell, shift-tab goes to the previous cell,
shift-tab from the first table cell is ignored and tab from the last
table cell creates a new row and sets focus in the new row's first
cell. These behaviors seem to more or less match Word and OpenOffice
Writer's.
bzr revid: xmo@openerp.com-20131018103540-12p8j18ypte8dr9u
2013-10-18 12:35:40 +02:00
e78ae5ff76
[IMP] typo
...
bzr revid: rgaopenerp-20131018094116-iogn36mj1hbsvhn0
2013-10-18 15:11:16 +05:30
ba0778922c
[IMP] parallax snippet add size option like banner has
...
bzr revid: rgaopenerp-20131018093135-4ux25wdnd73wlah2
2013-10-18 15:01:35 +05:30
Fabien Pinckaers
99723a8a9f
[REVERT] snippets drop zone too complex
...
bzr revid: fp@tinyerp.com-20131017141959-fpkds0a7e1m1sfrw
2013-10-17 16:19:59 +02:00
Xavier Morel
3b578cd373
[IMP] take over triple-click behavior in webkit to avoid breaking snippets and the like
...
bzr revid: xmo@openerp.com-20131017133133-uebgw7m3fo9as38s
2013-10-17 15:31:33 +02:00
ddm
41c49645e2
[FIX] Refactor SEO models
...
bzr revid: ddm@openerp.com-20131018092820-lqj9yz518262nknr
2013-10-18 11:28:20 +02:00
Christophe Matthieu
fc43a53079
[FIX] product.attribute: store min and max
...
bzr revid: chm@openerp.com-20131017131604-x2xo963p9pq81hvf
2013-10-17 15:16:04 +02:00
ddm
d5bbf2501a
[FIX] SEO for blog tags and categories
...
bzr revid: ddm@openerp.com-20131017115849-e696n3tj87zx3a9i
2013-10-17 13:58:49 +02:00
Xavier Morel
9949aa626c
[IMP] remove bidi plugin
...
its isReadOnly() calls generates quite a bunch of timeline events
bzr revid: xmo@openerp.com-20131016133432-4aq30rd8szbs2bef
2013-10-16 15:34:32 +02:00
ddm
a5d3a653b9
[FIX] SEO for blog posts
...
bzr revid: ddm@openerp.com-20131017104053-shrwu5ariisq7ub5
2013-10-17 12:40:53 +02:00
ddm
d6f8540978
[FIX] SEO for public events
...
bzr revid: ddm@openerp.com-20131017083534-outfljvfqjomfxgv
2013-10-17 10:35:34 +02:00
ddm
ebdfbc58f1
[FIX] SEO for shop products
...
bzr revid: ddm@openerp.com-20131016160232-e5rxi1hoofm5anrw
2013-10-16 18:02:32 +02:00
Fabien Meghazi
8b78e88ff9
[FIX] Do not overwrite main_object if present
...
bzr revid: fme@openerp.com-20131016151257-0r42s8t3xevabfm3
2013-10-16 17:12:57 +02:00
ddm
1625eb29ae
[FIX] SEO metadata saving
...
bzr revid: ddm@openerp.com-20131016143939-v0v1tcopq4zoqgxf
2013-10-16 16:39:39 +02:00
Richard Mathot (OpenERP)