9fa77980d7
Merge remote-tracking branch 'odoo/master' into master-sass-in-bundles-fme
2014-06-27 19:40:02 +02:00
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
653113094f
[ADD] Sass support in bundles
2014-06-26 16:49:51 +02:00
aa97aaa9d7
[ADD] Assets Bundle versioning and better cache handling
...
An asset bundle is now versionned with the dates of the
ir.ui.views that compose it and also with the dates of
the files and ir.attachments linked inside the bundle.
This new behavior is reflected in the bundle's lru cache
managment.
2014-06-24 18:52:38 +02:00
25ca967b97
[IMP] make attachment data available under public by default
...
Assuming access rights are correctly configured, this allows providing
downloads for any attachment type, not just to display images via
/website/image.
TODO: unify attachment querying, we've got stuff over both web/ and website/
2014-06-17 14:16:07 +02:00
7db3619c37
[REM] html_template and render_bootstrap_template()
...
bzr revid: fme@openerp.com-20140506163422-vruavrvkcowu09zi
2014-05-06 18:34:22 +02:00
5600a79007
[IMP]Improved the database manager, instead of calling html_template, created separate html file which is rendered using jinja2, so that we don't need html_template once pos and edit support render_bootstrap_template.
...
bzr revid: msh@tinyerp.com-20140502132349-bw9zdyaou4yf8o7q
2014-05-02 18:53:49 +05:30
db48dbef3e
[FIX] database manager
...
bzr revid: fme@openerp.com-20140501210436-osyrvlue41w63i6f
2014-05-01 23:04:36 +02:00
aa943fae18
[FIX] qweb loading concat mode only, increase cache age to one day
...
bzr revid: al@openerp.com-20140501204242-jngte754yqyj4nb0
2014-05-01 22:42:42 +02:00
5e21a4235d
[MERGE] saas-4 up to dle@openerp.com-20140501121915-q88k37nd25ietw8c
...
bzr revid: al@openerp.com-20140501172508-tjennzht30ktw3nz
2014-05-01 19:25:08 +02:00
acf2123123
[MERGE] Web assets moved from manifests to ir.ui.view bundles
...
bzr revid: fme@openerp.com-20140430151302-e42monb4klz4udw5
2014-04-30 17:13:02 +02:00
556c1404c2
[FIX] backward compatibility for html_template
...
bzr revid: fme@openerp.com-20140430132636-p42ehcb0dnc1d3jx
2014-04-30 15:26:36 +02:00
dde0c9324b
[IMP] Convered qunit test suite to template
...
bzr revid: fme@openerp.com-20140428182451-u4mgen9669gnldva
2014-04-28 20:24:51 +02:00
3d226bf50f
[IMP] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140423125905-yw05utqtg8q4r0kv
2014-04-23 18:29:05 +05:30
d4b534e7be
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb
2014-04-23 14:37:35 +02:00
679d278d25
[FIX] /web/login restore request.uid in case of authentication failure
...
bzr revid: fme@openerp.com-20140423100749-t4y4oi01tszn3z5a
2014-04-23 12:07:49 +02:00
bc1878e3e2
[IMP] raise not found if bundle not found
...
bzr revid: fme@openerp.com-20140422144132-thk3x58eqjvjzacu
2014-04-22 16:41:32 +02:00
169ecc2b01
[FIX] js and css bundle controllers set as auth='public'
...
bzr revid: fme@openerp.com-20140422143401-1jtxvd58mcw4kelw
2014-04-22 16:34:01 +02:00
8f00758d51
[FIX] js and css route should be auth='user'
...
bzr revid: fme@openerp.com-20140422111631-zpc46gzcn0s0jv6v
2014-04-22 13:16:31 +02:00
b250c5f9f5
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 4003 revid:dle@openerp.com-20140417161003-g3mchwrucp6ab8tu
...
bzr revid: dle@openerp.com-20140418151400-1g98vljq3cjv0czs
2014-04-18 17:14:00 +02:00
fa20817cc3
[FIX] use of conditional responses in bundling
...
bzr revid: xmo@openerp.com-20140417104732-6dkrxhsx7sha1347
2014-04-17 12:47:32 +02:00
40d3ae1e0f
[FIX] Record id are not always an integer. It could be a virtual id (str) as in calendar.
...
bzr revid: jke@openerp.com-20140416082924-t52pvja4617zpkce
2014-04-16 10:29:24 +02:00
a8e2cf3006
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411061843-kxugxk0p63ifkjg7
2014-04-11 11:48:43 +05:30
2b79294500
[ADD] cache
...
bzr revid: fme@openerp.com-20140410182723-x1aoo2o0zhgkvwsf
2014-04-10 20:27:23 +02:00
e1bf418856
[MERGE] trunk
...
bzr revid: fme@openerp.com-20140410173524-9oz7irm59a5d8d7g
2014-04-10 19:35:24 +02:00
1228cf5539
[REM] remove obsolete code
...
bzr revid: fme@openerp.com-20140410170658-vrxzpya5p9ouafey
2014-04-10 19:06:58 +02:00
9d66f9bc67
[ADD] checksum
...
bzr revid: fme@openerp.com-20140410155422-dr2rg5z9l255g9zn
2014-04-10 17:54:22 +02:00
26fd049ce0
[ADD] last modified date
...
bzr revid: fme@openerp.com-20140410143212-p72kdj24293l577j
2014-04-10 16:32:12 +02:00
c4c110c3c6
[WIP] bundle css and js route
...
bzr revid: fme@openerp.com-20140410101816-jg5pdlistgowu2zo
2014-04-10 12:18:16 +02:00
8e14e7a870
[WIP] AssetsBundle
...
bzr revid: fme@openerp.com-20140409161648-sx87vc0saj30f68x
2014-04-09 18:16:48 +02:00
2372d30520
[FIX] web: pass name arg to name_search, because it seems that one module (or more) wrongly overwritten the method
...
bzr revid: dle@openerp.com-20140407110919-e0mvvhldkfe98qlq
2014-04-07 13:09:19 +02:00
c037ebb362
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407100240-vk43kganr5g0gz5i
2014-04-07 15:32:40 +05:30
ebb826a510
[FIX] web: applying display name temporary imp of read to search_read also
...
bzr revid: dle@openerp.com-20140407082445-yjy17jnrw45d8mxg
2014-04-07 10:24:45 +02:00
f1d3f2a0c4
[MERGE] forward port of branch saas-3 up to revid 3995 chs@openerp.com-20140407144625-jfimvsx4mgrkztqv
...
bzr revid: chs@openerp.com-20140407161728-ccudwnqo970ac8ay
2014-04-07 18:17:28 +02:00
269f92998b
[IMP] remove useless import
...
bzr revid: mat@openerp.com-20140401123052-01ylsjx5q3vkoxbq
2014-04-01 14:30:52 +02:00
a85d116872
[FIX] default is False, style format is different than DEFAULT_SERVER_DATE{TIME}_FORMAT, datetime is instance of date
...
bzr revid: mat@openerp.com-20140401100752-twixfgj2gmggy922
2014-04-01 12:07:52 +02:00
6243d18852
[FIX] export: Excel data should be in raw format to be handle correctly
...
lp bug: https://launchpad.net/bugs/844569 fixed
bzr revid: mat@openerp.com-20140331151749-cx333j01f1hw5ya8
2014-03-31 17:17:49 +02:00
1d4b43eb38
[FIX] Redirect user from /web if a get redirect is found.
...
If you redirect an user not logged, into /web?redirect=xxx, he was correctly redirect to /web/login?redirect=/web?redirect=xxx. But when user come back on /web?redirect=xxx, he was not redirected to xxx.
The question should be to have only one behavior when we redirect people, as well /web?redirect as well /web/login?redirect. But because we use both in actual code, we need to accept both for retro-compatibility.
bzr revid: jke@openerp.com-20140321115018-x4e3l3d1v0tp0dyo
2014-03-21 12:50:18 +01:00
b0888ec29b
[MERGE] db dump/restore new zip based file format
...
bzr revid: al@openerp.com-20140312181724-hs26iumd4na2avns
2014-03-12 19:17:24 +01:00
cf68961f66
[IMP] /web/login redirects if already logged in
...
bzr revid: fme@openerp.com-20140312103239-deyoc7t00g8kusd1
2014-03-12 11:32:39 +01:00
27405c0c83
[FIX] ensure_db() werkzeug.BaseResponse.url usage leads to encoded hashes loss
...
bzr revid: fme@openerp.com-20140311205220-kk0pal10lodurcst
2014-03-11 21:52:20 +01:00
c3827cb8f7
[MERGE] forward port of branch saas-3 up to revid 3967 jke@openerp.com-20140311093515-02xw8phrcqhgz6zx
...
bzr revid: chs@openerp.com-20140311132200-1bln6gaj80njyh18
2014-03-11 14:22:00 +01:00
20efa0e287
[FIX] web: redirect to original page after login
...
bzr revid: chs@openerp.com-20140310153639-ntfa8cvm4loecm9a
2014-03-10 16:36:39 +01:00
47d7045f76
[FIX] Move bootstrap.css outside from the single css file generate.
...
Without that, OpenERP become unusable in IE due to the follows limitations:
- All style tags after the first 31 style tags are not applied.
- All style rules after the first 4,095 rules are not applied.
- On pages that uses the @import rule to continously import external style sheets that import other style sheets, style sheets that are more than three levels deep are ignored.
(http://support.microsoft.com/kb/262161/en )
bzr revid: jke@openerp.com-20140307174411-hejt3x324nlv6tjr
2014-03-07 18:44:11 +01:00
36f2ff879a
[FIX] web: use jinja2.FileSystemLoader instead of PackageLoader on windows
...
bzr revid: chs@openerp.com-20140307151431-5k24u6lnlypv1s64
2014-03-07 16:14:31 +01:00
5d95027f0a
[IMP] web: database manager: restore copy database
...
bzr revid: chs@openerp.com-20140305124444-1jzxmffrm7502t4e
2014-03-05 13:44:44 +01:00
8c666af35c
[IMP] remove menu_id from user model
...
bzr revid: rajmyt@gmail.com-20140304085659-lufot16ae59y1jca
2014-03-04 14:26:59 +05:30
e76c36d704
[FIX] Database selector issue
...
ensure_db() If the request.session.db is different than
the computed db abort and redirect in order to properly
dispatch on computed db
bzr revid: fme@openerp.com-20140227164018-iukowle122spr2c5
2014-02-27 17:40:18 +01:00
c1d9449a57
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140227101745-k6iseaz765qnflnm
2014-02-27 11:17:45 +01:00
e1daea744f
[FIX] web: bootstrap template rendered using request uid
...
bzr revid: chs@openerp.com-20140226155536-5z7r50bzxxackg1d
2014-02-26 16:55:36 +01:00
Fabien Meghazi
Simon Lejeune
Xavier Morel
Mohammed Shekha
Antony Lesuisse
Randhir Mayatra rma-openerp
Denis Ledoux
Kersten Jeremy
Christophe Simonis
Martin Trigaux
Randhir Mayatra (OpenERP)