Christophe Matthieu
c6df606576
[MERGE] with trunk-website-al
...
bzr revid: chm@openerp.com-20130731090746-r4uviyui176ngwbm
2013-07-31 11:07:46 +02:00
Frédéric van der Essen
cd1fe5b566
remove custom input background
...
bzr revid: fva@openerp.com-20130731082117-r1qzq4b3mkcet2nl
2013-07-31 10:21:17 +02:00
Frédéric van der Essen
b358db5228
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130731081328-g6xnaaugia3866cn
2013-07-31 10:13:28 +02:00
Frédéric van der Essen
1a0976a764
quick fix for the shopping cart display
...
bzr revid: fva@openerp.com-20130731081304-1j2p1o13e061ka1q
2013-07-31 10:13:04 +02:00
Christophe Matthieu
140132c58f
[FIX] qweb.py: html rendering
...
bzr revid: chm@openerp.com-20130731080913-aev9gz72vyev9ryj
2013-07-31 10:09:13 +02:00
Frédéric van der Essen
67051c3be5
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130731075741-6bs9qdslevxzeesd
2013-07-31 09:57:41 +02:00
Xavier Morel
7a12d33498
[FIX] whitelist section, header and footer for edition
...
bzr revid: xmo@openerp.com-20130731075635-wr3tdl2p12j34cmw
2013-07-31 09:56:35 +02:00
Frédéric van der Essen
3e373984a4
making the editor bar the same height as the rest of openerp
...
bzr revid: fva@openerp.com-20130731075611-lurg5zye995r9te7
2013-07-31 09:56:11 +02:00
Frédéric van der Essen
7f8aacf82c
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130731074933-sd1ngn65e0jusqww
2013-07-31 09:49:33 +02:00
Frédéric van der Essen
dc7230517d
temporary fix for p insertion in menu edition
...
bzr revid: fva@openerp.com-20130731074859-q55bbgqtrd3xsbqs
2013-07-31 09:48:59 +02:00
Antony Lesuisse
d616e2d5fe
m
...
bzr revid: al@openerp.com-20130731074829-koml85g6ofa9r1c0
2013-07-31 09:48:29 +02:00
Frédéric van der Essen
e7b14ae02e
fix banner insertion
...
bzr revid: fva@openerp.com-20130731074313-taa1d02lyc9tyz4a
2013-07-31 09:43:13 +02:00
Frédéric van der Essen
b5f4f5b3d0
fixing the banner
...
bzr revid: fva@openerp.com-20130731073548-g51heju7xpinmysq
2013-07-31 09:35:48 +02:00
Frédéric van der Essen
7a89ee8d68
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130730184923-at0b7xbs9gc50g10
2013-07-30 20:49:23 +02:00
Frédéric van der Essen
a26d3cdbae
styling improvements on ecommerce and blog
...
bzr revid: fva@openerp.com-20130730182433-33t3ggw722usd82w
2013-07-30 20:24:33 +02:00
Frédéric van der Essen
21cbfa2828
put back snippets.css and homepage fixes
...
bzr revid: fva@openerp.com-20130730161834-r71km6nl6f59fmr6
2013-07-30 18:18:34 +02:00
Frédéric van der Essen
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
Christophe Matthieu
5d90e20f8b
[FIX] website: error on click on Edit button. Fix: filter not(data-oe-type). xmo
...
bzr revid: chm@openerp.com-20130730152856-du26nlnqjd4evulg
2013-07-30 17:28:56 +02:00
Xavier Morel
9b49dfb46a
[FIX] RTE on links and 'correct' enabling of save button
...
bzr revid: xmo@openerp.com-20130730151544-m3ggaaoyckvhos65
2013-07-30 17:15:44 +02:00
Christophe Matthieu
4c1760cdf5
[IMP] website_crm: fix dom error (todo: fix parser)
...
bzr revid: chm@openerp.com-20130730151428-3i42sln7zxm31mit
2013-07-30 17:14:28 +02:00
Xavier Morel
4d41a7f389
[FIX] add event handlers on non-rte contenteditables to trigger enabling of save button, fixup filters
...
bzr revid: xmo@openerp.com-20130730150955-ttqovqamexqtd8r9
2013-07-30 17:09:55 +02:00
Christophe Matthieu
cd076c1c9a
[IMP] website: contactus
...
bzr revid: chm@openerp.com-20130730150725-iinv39k9krjh3cl0
2013-07-30 17:07:25 +02:00
Christophe Matthieu
327f943c45
[IMP] website: carousel image bg
...
bzr revid: chm@openerp.com-20130730144252-grypnxx2urswvzb6
2013-07-30 16:42:52 +02:00
Christophe Matthieu
1d0af41f61
[IMP] website: carousel
...
bzr revid: chm@openerp.com-20130730143643-1itg8hhwuchnb5k3
2013-07-30 16:36:43 +02:00
Christophe Matthieu
3c7fb776c8
[IMP] website home page: add banner with boostrap carousel
...
bzr revid: chm@openerp.com-20130730103213-4nst7sqqcz3lzir5
2013-07-30 12:32:13 +02:00
Xavier Morel
2a0dc6af7a
[ADD] quote, text justification, list indent/outdent
...
todo: really need contextual conditions on buttons
bzr revid: xmo@openerp.com-20130730094320-n352j55bo7bs3ubj
2013-07-30 11:43:20 +02:00
Christophe Matthieu
781ae74c18
[IMP] website_mail: button add a new blog; link on header and footer
...
bzr revid: chm@openerp.com-20130730085027-beo81wr0ru1m6q2d
2013-07-30 10:50:27 +02:00
Christophe Matthieu
3bb683e07d
[IMP] website_mail: post new blog
...
bzr revid: chm@openerp.com-20130729154916-dr5bm70smt49efvv
2013-07-29 17:49:16 +02:00
Xavier Morel
8370ba6adc
[ADD] link/unlink commands
...
bzr revid: xmo@openerp.com-20130729152601-00gvds9r39mo2n2a
2013-07-29 17:26:01 +02:00
Xavier Morel
c7f80314cf
[MERGE] ckeditor-based RTE
...
bzr revid: xmo@openerp.com-20130729145626-mytt2mkshcirz63b
2013-07-29 16:56:26 +02:00
Xavier Morel
3a8f51385d
[ADD] toolbar subgroups, hooks for styling lists correctly, more widgets
...
bzr revid: xmo@openerp.com-20130729143842-k4r7e42hhvw1y1xu
2013-07-29 16:38:42 +02:00
Christophe Matthieu
4dde39af8f
[IMP] website_mail: blog archive, pager
...
bzr revid: chm@openerp.com-20130729141934-y45eofkxxjgya59u
2013-07-29 16:19:34 +02:00
Christophe Matthieu
4ebaf63987
[IMP] website_mail: blog archive
...
bzr revid: chm@openerp.com-20130729105146-zbr3454gdmqkg81u
2013-07-29 12:51:46 +02:00
Christophe Matthieu
0d168ea3f4
[IMP] website_mail: post with login
...
bzr revid: chm@openerp.com-20130729084915-yy713hv4e9r60ap4
2013-07-29 10:49:15 +02:00
Christophe Matthieu
b21b10d1f3
[IMP] website_mail: inherit mail.group to add get_public_message_ids method
...
bzr revid: chm@openerp.com-20130726154816-nl25yxslv6yekoqi
2013-07-26 17:48:16 +02:00
Christophe Matthieu
89178695f9
[FIX] portal_project_issue: user user_public_id
...
bzr revid: chm@openerp.com-20130726153504-i0ehukc4n1hqx3fw
2013-07-26 17:35:04 +02:00
Christophe Matthieu
45cf073d50
[IMP] mail.group: can post if can read
...
bzr revid: chm@openerp.com-20130726144521-u9nicyvexub2gof1
2013-07-26 16:45:21 +02:00
Christophe Matthieu
fe6e0e39e8
[FIX] depends with portal inside of website
...
bzr revid: chm@openerp.com-20130726144436-2i8q9348hiku4wch
2013-07-26 16:44:36 +02:00
Christophe Matthieu
75ff22286f
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130726143134-4vmzxqcb2d3fnwwx
2013-07-26 16:31:34 +02:00
Christophe Matthieu
69acb34f3e
[IMP] website: new class website with route decorator
...
bzr revid: chm@openerp.com-20130726141333-047bdk1qocrpodqp
2013-07-26 16:13:33 +02:00
Christophe Matthieu
18248b94e8
[IMP] mail: remove the default parent_id in js post method (logic server side)
...
bzr revid: chm@openerp.com-20130726141303-i3991kinyso9yan6
2013-07-26 16:13:03 +02:00
Vo Minh Thu
34c97e9802
[FIX] mrp_operations: undefined name.
...
bzr revid: vmt@openerp.com-20130726135830-86mrf92bz49rhqzb
2013-07-26 15:58:30 +02:00
Xavier Morel
7294033e1f
[IMP] disable RTE on t-record results (data-oe-type)
...
bzr revid: xmo@openerp.com-20130726134459-8mb3p4eh2ob8rxyq
2013-07-26 15:44:59 +02:00
Thibault Delavallée
abde98eb16
[MERGE] active_domain management for mass actions
...
[IMP] list_view: uncheck header hook when unchecking one of the row displayed in the list view. This is done through the propagation of a deselected flag through the 'selected' event.
[IMP] list_view: added get_active_domain method that returns the evaluated current domain (from the search view), if the header hook is checked
[IMP] sidebar (More menu): add in the action context the active_domain if the list header hook is checked
[IMP] export: now works on the active_domain if the list header hook is checked; otherwise use selected_ids. The search using the active_domain is done in the python code, not JS-side.
bzr revid: tde@openerp.com-20130726123705-vdtzxmmk5tszrwqf
2013-07-26 14:37:05 +02:00
Thibault Delavallée
65c7a6fedb
[MERGE] [IMP] mass mailing improvements: use active_domain from list view, better management of templates
...
mail.message: now have mail_server_id field, taken from mail_mail, to be able to store preferences about the server to use to send notification emails
email.template: mail.compose.message:
- now handles mail_server_id from the template
- improved user_signature management from templates
mail.compose.message: now can use the active_domain form context, taken from the list view. This means that when checking all records through the header hook, the mass mailing is done on all the records that match the search domain, not only to the ones in the displayed pager.
bzr revid: tde@openerp.com-20130726123642-vmey18jiacwng1pz
2013-07-26 14:36:42 +02:00
Christophe Matthieu
f3a8f62e75
[IMP] website: create website class and decorator
...
bzr revid: chm@openerp.com-20130726123317-idaxp6zfvdpr60k2
2013-07-26 14:33:17 +02:00
niv-openerp
ea92a186f5
[FIX] mail: minor potential problem with JavaScript module loading
...
bzr revid: nicolas.vanhoren@openerp.com-20130726121938-b2uapok2dup56ol9
2013-07-26 14:19:38 +02:00
Thibault Delavallée
3770ec073e
[DOC] mail, email_template: added changelog
...
bzr revid: tde@openerp.com-20130726115918-5g4sfapjql4hs7zr
2013-07-26 13:59:18 +02:00
Thibault Delavallée
de3b587a98
[TEST] mail: added test for support of active_domain
...
bzr revid: tde@openerp.com-20130726114854-y05kwah4v5k9v6bx
2013-07-26 13:48:54 +02:00
Xavier Morel
5176607c2a
[IMP] make spans editable (though not RTE, not supported) & use t-record for company name
...
bzr revid: xmo@openerp.com-20130726113742-ix2f4tyy0xvoy9lq
2013-07-26 13:37:42 +02:00
Christophe Matthieu