Thibault Delavallée
a59283ecc3
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140408131347-uo0ahmypbxhlx7vv
2014-04-08 15:13:47 +02:00
Christophe Simonis
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Fabien Pinckaers
de380aa914
[IMP] button snippet
...
bzr revid: fp@tinyerp.com-20140406132519-eookdnec20c6sg20
2014-04-06 15:25:19 +02:00
Thibault Delavallée
dbbf539879
[FIX] website: fixed image controller, do not try to find
...
website_published items on a model that does not hold this column.
bzr revid: tde@openerp.com-20140402140108-ccatsce8zu2x1j3x
2014-04-02 16:01:08 +02:00
Olivier Dony
f120d6ffb7
[FIX] ir.qweb: avoid errors with function fields of type datetime
...
bzr revid: odo@openerp.com-20140401160623-loj5nsph7tfnn1us
2014-04-01 18:06:23 +02:00
ajay javiya (OpenERP)
7126bc5b50
[MERGE] : with trunk and resolve conflicts
...
bzr revid: aja@tinyerp.com-20140401132534-owbxvwqo6qpodw7e
2014-04-01 18:55:34 +05:30
Fabien Meghazi
00803fd13a
[ADD] website: template reset confirmation
...
bzr revid: fme@openerp.com-20140401094233-9zcuc915l56a7h1h
2014-04-01 11:42:33 +02:00
ajay javiya (OpenERP)
a9ee5d0a79
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140401084327-daftkqduvknsa0rp
2014-04-01 14:13:27 +05:30
Quentin (OpenERP)
0a2a118ba3
[MERGE] website_gengo branch merged, offering the possiblity to translate the website using Gengo
...
bzr revid: qdp-launchpad@openerp.com-20140401073953-p46kottwmk9buhor
2014-04-01 09:39:53 +02:00
ajay javiya (OpenERP)
138f5d7f32
[MERGE] : with trunk and resolve conflicts
...
bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn
2014-04-01 10:58:01 +05:30
b6ba6d9a9c
[FIX] website: create new page redirect to error 404
...
bzr revid: chm@openerp.com-20140331144123-p3unfkbqm5c0y1sx
2014-03-31 16:41:23 +02:00
Fabien Pinckaers
ed037b8a94
[REM] removed bootstrap sources
...
bzr revid: fp@tinyerp.com-20140331124809-t15wswgjj0c6if3y
2014-03-31 14:48:09 +02:00
Parth Gajjar (Open ERP)
8bde127659
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140331122509-vkpy077tp216molq
2014-03-31 17:55:09 +05:30
Parth Gajjar (Open ERP)
ff1588a46d
[IMP] added new supportable languages, bog solved in config dialog, improved count words dialog
...
bzr revid: pga@tinyerp.com-20140331070625-qtr7l45lnca5rfze
2014-03-31 12:36:25 +05:30
ajay javiya (OpenERP)
c4896f801c
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq
2014-03-31 09:49:56 +05:30
Fabien Pinckaers
fd43cecbda
[REM] remove duplicate snippet: portfolio - image gallery
...
bzr revid: fp@tinyerp.com-20140330190548-cmgypctw8ymzs4yf
2014-03-30 21:05:48 +02:00
Fabien Pinckaers
62ff59ba9f
[IMP] removing glyphicons from bootstrap less
...
bzr revid: fp@tinyerp.com-20140330131040-3athcual00brty26
2014-03-30 15:10:40 +02:00
Fabien Pinckaers
1c3835c83c
[IMP] bootstrap less sources
...
bzr revid: fp@tinyerp.com-20140329202446-tz8b2rvenc6s3ds5
2014-03-29 21:24:46 +01:00
Fabien Pinckaers
2478af1b16
[IMP] better button snippet
...
bzr revid: fp@tinyerp.com-20140329192911-i75v53f0gos8fybm
2014-03-29 20:29:11 +01:00
Fabien Pinckaers
f1131d547b
[IMP] flat design, even for darken
...
bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua
2014-03-29 13:56:35 +01:00
Parth Gajjar (Open ERP)
3de6738dbb
merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140328131822-0kc0f5j5qhupkhbr
2014-03-28 18:48:22 +05:30
ajay javiya (OpenERP)
e63646130e
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
2014-03-28 09:58:15 +05:30
Fabien Meghazi
cf311bda60
[MERGE] remote module import
...
bzr revid: fme@openerp.com-20140327141233-i7xu8ism7howhflv
2014-03-27 15:12:33 +01:00
Parth Gajjar (Open ERP)
2de4260240
merged with trunk-addons
...
bzr revid: pga@tinyerp.com-20140327113805-2ie66rru6o10nv38
2014-03-27 17:08:05 +05:30
c1b6589851
[IMP] website_event: widget to promote Events with country flag
...
bzr revid: chm@openerp.com-20140327093517-8ppcxypc6krxc2fi
2014-03-27 10:35:17 +01:00
Fabien Meghazi
b7fbef1241
[FIX] Serve ir.attachment with SUPERUSER_ID
...
We are not supposed to have a user id here
bzr revid: fme@openerp.com-20140326184022-1hulv7t5y6vuvr9y
2014-03-26 19:40:22 +01:00
Fabien Meghazi
eb5cbea318
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
2014-03-26 16:24:33 +01:00
Parth Gajjar (Open ERP)
473243270b
[MERGE] merged with trunk addons
...
bzr revid: pga@tinyerp.com-20140326112709-m1iqkkmjt1xtmio1
2014-03-26 16:57:09 +05:30
ajay javiya (OpenERP)
864892d6ce
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140326054841-9yoaub8fw058vjkm
2014-03-26 11:18:41 +05:30
Fabien Meghazi
0fe55dddc1
[IMP] Added a mimetype field in ir.attachment
...
bzr revid: fme@openerp.com-20140325160413-jvxjii6rbqcrjxor
2014-03-25 17:04:13 +01:00
0d4d9af5f4
[FIX] website: fix and activate frontend test
...
bzr revid: chm@openerp.com-20140325140328-3f5is66d0petqrl6
2014-03-25 15:03:28 +01:00
Fabien Meghazi
329c19f94e
[FIX] Fix url slug check bug in multilang=True
...
bzr revid: fme@openerp.com-20140325140026-0qdx9zl21za8gto9
2014-03-25 15:00:26 +01:00
ajay javiya (OpenERP)
f76a734e90
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140325114109-lts5z42lq9xlgqx0
2014-03-25 17:11:09 +05:30
Fabien Meghazi
8435da41bc
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140325103928-ja3bqy6xmyp91gva
2014-03-25 11:39:28 +01:00
Fabien Meghazi
27f38edb25
[FIX] dirty saas-3 fix for url lang switching with model converters
...
bzr revid: fme@openerp.com-20140325100722-temaci88fowcr2m5
2014-03-25 11:07:22 +01:00
13d7cfe86c
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140324082341-d6gqyloc7822aen2
bzr revid: chm@openerp.com-20140325084852-i1yomuyhyen4ss95
2014-03-25 09:48:52 +01:00
Fabien Pinckaers
fa46f255f2
[IMP] wording
...
bzr revid: fp@tinyerp.com-20140324203540-rx76yaqaw3p9aql9
2014-03-24 21:35:40 +01:00
Simon Lejeune
6889165eb1
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324164409-452kibtg3l7rd0nj
2014-03-24 17:44:09 +01:00
Simon Lejeune
9556cadbff
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +01:00
Fabien Meghazi
bb8b7ea2d9
[ADD] website ir_http: serve binary ir.attchments with urls
...
bzr revid: fme@openerp.com-20140324151728-hpegewvf3b38ndyi
2014-03-24 16:17:28 +01:00
Fabien Meghazi
9285813da9
[IMP] website images: only checksum ir.attachment for empty urls
...
bzr revid: fme@openerp.com-20140324151447-a3mkncjh0b7k16hg
2014-03-24 16:14:47 +01:00
e5f645df4d
[FIX] website: snippet editor: forward port of branch saas-3
...
bzr revid: chm@openerp.com-20140324145416-qn2fvylylxtgu39a
2014-03-24 15:54:16 +01:00
Simon Lejeune
50fda546e2
[REF] Moved qweb contact from website to base and removed the from_html method (it never worked)
...
bzr revid: sle@openerp.com-20140324135933-f21heo0sz0tzjbv3
2014-03-24 14:59:33 +01:00
5692dbdb5e
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324135220-j0abaam1n4ue03l7
2014-03-24 14:52:20 +01:00
449ca3ab18
[IMP] website snippet: add example in documentation
...
bzr revid: chm@openerp.com-20140324135013-1fr3kznkw29wvca2
2014-03-24 14:50:13 +01:00
Christophe Simonis
d93b79e6f4
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
...
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
ba55fcf1d0
[IMP] website: Building block / Snippet Editor
...
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.
bzr revid: chm@openerp.com-20140324130119-xbnejtayna8haykk
2014-03-24 14:01:19 +01:00
Parth Gajjar (Open ERP)
69e6a7a808
[IMP] send source url in gengo comment, and save page on gengo post
...
bzr revid: pga@tinyerp.com-20140324111253-xts034vw3rjjl1cb
2014-03-24 16:42:53 +05:30
Parth Gajjar (Open ERP)
bf0d35dbdd
[IMP] merged gengo translator with main translator, removed 'Restart Job' from wizard,removed constraint from base_gengo
...
bzr revid: pga@tinyerp.com-20140324103631-j4cswrlk5huuibt5
2014-03-24 16:06:31 +05:30
Xavier Morel
aa9387e845
[FIX] don't mark view sections as dirty just because the snippets thing has inserted drop zones in it
...
bzr revid: xmo@openerp.com-20140324101850-el3cfs0x4uln3u7v
2014-03-24 11:18:50 +01:00
Thibault Delavallée