Christophe Simonis
ddef2dd10a
[MERGE] forward port of branch saas-3 up to 8f13e83
2014-08-20 17:51:20 +02:00
Christophe Simonis
f32c88f932
[FIX] web: correct /web/proxy/load to set correct base_url
2014-08-20 17:33:27 +02:00
Jérome Maes
1a9b9442ac
[FIX] base : context evaluation with active_id server side. It now keeps the active_id in case of a refresh.
2014-08-14 16:00:18 +02:00
Olivier Dony
79570179bf
[MERGE] Forward-port saas-5 up to acbdac4
2014-08-14 14:56:57 +02:00
Olivier Dony
acbdac4e9f
[MERGE] Forward-port saas-4 up to 9a84d55
2014-08-14 14:54:37 +02:00
Olivier Dony
9a84d55036
[MERGE] Forward-port saas-3 up to 9b55532
2014-08-14 14:37:42 +02:00
Denis Ledoux
9b5553286a
[FIX] export: in saas-3, req becomes request.
...
Error during forward port b9275da8a5
2014-08-14 12:49:32 +02:00
Olivier Dony
e11eddf753
[MERGE] Forward-port of saas-5 up to 20cc18d
2014-08-13 20:46:47 +02:00
Olivier Dony
2a94d1d811
[MERGE] Forward-port saas-4 up to 2694ed1
2014-08-13 17:34:27 +02:00
Olivier Dony
2694ed1472
[MERGE] Forward-port saas-3 up to b9275da
2014-08-13 17:33:12 +02:00
Olivier Dony
b9275da8a5
[MERGE] Forward-port 7.0 up to 23cffab
2014-08-13 17:30:06 +02:00
Denis Ledoux
8276fb5853
[FIX] export: add the context in the export
...
In some cases, the data dispalyed in a list depends on the context
This context needs to be passed to the export method, so the exported data reflects correctly the data from the list view
2014-08-13 14:52:01 +02:00
Raphael Collet
207013c74f
[IMP] refactoring: move function topological_sort to openerp.tools
2014-08-08 14:12:06 +02:00
rlu-odoo
8b67a7202d
[REF] OpenERP --> Odoo in various UI texts
...
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages
(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)
Closes #1260
2014-07-18 13:45:41 +02:00
Xavier Morel
7286f4e424
[FIX] ensure Field strings are decoded before comparing them to one another
...
fixes #773
2014-07-16 14:07:43 +02:00
Fabien Meghazi
a0d2df72f6
Rename sha to version in bundle controllers
2014-07-01 15:18:39 +02:00
Fabien Meghazi
9fa77980d7
Merge remote-tracking branch 'odoo/master' into master-sass-in-bundles-fme
2014-06-27 19:40:02 +02:00
Simon Lejeune
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
Fabien Meghazi
653113094f
[ADD] Sass support in bundles
2014-06-26 16:49:51 +02:00
Fabien Meghazi
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
Xavier Morel
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
Fabien Meghazi
7db3619c37
[REM] html_template and render_bootstrap_template()
...
bzr revid: fme@openerp.com-20140506163422-vruavrvkcowu09zi
2014-05-06 18:34:22 +02:00
Mohammed Shekha
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
Fabien Meghazi
db48dbef3e
[FIX] database manager
...
bzr revid: fme@openerp.com-20140501210436-osyrvlue41w63i6f
2014-05-01 23:04:36 +02:00
Antony Lesuisse
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
Antony Lesuisse
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
Fabien Meghazi
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
Fabien Meghazi
556c1404c2
[FIX] backward compatibility for html_template
...
bzr revid: fme@openerp.com-20140430132636-p42ehcb0dnc1d3jx
2014-04-30 15:26:36 +02:00
Fabien Meghazi
dde0c9324b
[IMP] Convered qunit test suite to template
...
bzr revid: fme@openerp.com-20140428182451-u4mgen9669gnldva
2014-04-28 20:24:51 +02:00
Randhir Mayatra rma-openerp
3d226bf50f
[IMP] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140423125905-yw05utqtg8q4r0kv
2014-04-23 18:29:05 +05:30
Fabien Meghazi
d4b534e7be
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb
2014-04-23 14:37:35 +02:00
Fabien Meghazi
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
Fabien Meghazi
bc1878e3e2
[IMP] raise not found if bundle not found
...
bzr revid: fme@openerp.com-20140422144132-thk3x58eqjvjzacu
2014-04-22 16:41:32 +02:00
Fabien Meghazi
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
Fabien Meghazi
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
Denis Ledoux
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
Xavier Morel
fa20817cc3
[FIX] use of conditional responses in bundling
...
bzr revid: xmo@openerp.com-20140417104732-6dkrxhsx7sha1347
2014-04-17 12:47:32 +02:00
Kersten Jeremy
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
Randhir Mayatra rma-openerp
a8e2cf3006
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411061843-kxugxk0p63ifkjg7
2014-04-11 11:48:43 +05:30
Fabien Meghazi
2b79294500
[ADD] cache
...
bzr revid: fme@openerp.com-20140410182723-x1aoo2o0zhgkvwsf
2014-04-10 20:27:23 +02:00
Fabien Meghazi
e1bf418856
[MERGE] trunk
...
bzr revid: fme@openerp.com-20140410173524-9oz7irm59a5d8d7g
2014-04-10 19:35:24 +02:00
Fabien Meghazi
1228cf5539
[REM] remove obsolete code
...
bzr revid: fme@openerp.com-20140410170658-vrxzpya5p9ouafey
2014-04-10 19:06:58 +02:00
Fabien Meghazi
9d66f9bc67
[ADD] checksum
...
bzr revid: fme@openerp.com-20140410155422-dr2rg5z9l255g9zn
2014-04-10 17:54:22 +02:00
Fabien Meghazi
26fd049ce0
[ADD] last modified date
...
bzr revid: fme@openerp.com-20140410143212-p72kdj24293l577j
2014-04-10 16:32:12 +02:00
Fabien Meghazi
c4c110c3c6
[WIP] bundle css and js route
...
bzr revid: fme@openerp.com-20140410101816-jg5pdlistgowu2zo
2014-04-10 12:18:16 +02:00
Fabien Meghazi
8e14e7a870
[WIP] AssetsBundle
...
bzr revid: fme@openerp.com-20140409161648-sx87vc0saj30f68x
2014-04-09 18:16:48 +02:00
Denis Ledoux
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
Randhir Mayatra rma-openerp
c037ebb362
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407100240-vk43kganr5g0gz5i
2014-04-07 15:32:40 +05:30
Denis Ledoux
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
Christophe Simonis
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
Martin Trigaux
269f92998b
[IMP] remove useless import
...
bzr revid: mat@openerp.com-20140401123052-01ylsjx5q3vkoxbq
2014-04-01 14:30:52 +02:00
Martin Trigaux
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
Martin Trigaux
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
Kersten Jeremy
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
Antony Lesuisse
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
Fabien Meghazi
cf68961f66
[IMP] /web/login redirects if already logged in
...
bzr revid: fme@openerp.com-20140312103239-deyoc7t00g8kusd1
2014-03-12 11:32:39 +01:00
Fabien Meghazi
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
Christophe Simonis
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
Christophe Simonis
20efa0e287
[FIX] web: redirect to original page after login
...
bzr revid: chs@openerp.com-20140310153639-ntfa8cvm4loecm9a
2014-03-10 16:36:39 +01:00
Kersten Jeremy
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
Christophe Simonis
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
Christophe Simonis
5d95027f0a
[IMP] web: database manager: restore copy database
...
bzr revid: chs@openerp.com-20140305124444-1jzxmffrm7502t4e
2014-03-05 13:44:44 +01:00
Randhir Mayatra (OpenERP)
8c666af35c
[IMP] remove menu_id from user model
...
bzr revid: rajmyt@gmail.com-20140304085659-lufot16ae59y1jca
2014-03-04 14:26:59 +05:30
Fabien Meghazi
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
Fabien Meghazi
c1d9449a57
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140227101745-k6iseaz765qnflnm
2014-02-27 11:17:45 +01:00
Christophe Simonis
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
434f100fb8
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140225094914-419sm2gji3kiq2e2
2014-02-25 10:49:14 +01:00
Denis Ledoux
ec0f9de9dc
[FIX] web: preserve order of saved export fields list
...
bzr revid: dle@openerp.com-20140221115855-ycny8ai1vyb23cdd
2014-02-21 12:58:55 +01:00
Denis Ledoux
e84aaa7d74
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 3903 revid:dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
...
bzr revid: dle@openerp.com-20140221120632-dn3ll7yrjkax17q5
2014-02-21 13:06:32 +01:00
Christophe Simonis
acb010a985
[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0
...
bzr revid: chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: dle@openerp.com-20140210140818-5mtk1qhheo219bm1
bzr revid: dle@openerp.com-20140214114445-krexrwm9o2nrxepk
bzr revid: mat@openerp.com-20140219111353-cxo860z7ctz7om30
bzr revid: dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda
bzr revid: chs@openerp.com-20140318112743-tqv492026y2pnbff
2014-03-18 12:27:43 +01:00
Fabien Meghazi
f8ddf1dcb7
[FIX] /web/login renders with the wrong user id
...
bzr revid: fme@openerp.com-20140220144106-ge85vlbjeawa9982
2014-02-20 15:41:06 +01:00
Fabien Meghazi
6cce7e6dba
[REM] Removed LazyResponse from webclient, use request.render() instead
...
bzr revid: fme@openerp.com-20140218161806-j7qn4dutjtlfqjc1
2014-02-18 17:18:06 +01:00
Fabien Meghazi
2bb8b4ebfb
[FIX] forward port ensure_db fix from saas-3
...
bzr revid: fme@openerp.com-20140213134219-pn5xmo5alxn1d57u
2014-02-13 14:42:19 +01:00
Fabien Meghazi
92b8aafe97
[FIX] /web/login: Set request.uid on auth=none so it's correct if overloaded with auth="public"
...
bzr revid: fme@openerp.com-20140211113916-2to1g41pccimbsgq
2014-02-11 12:39:16 +01:00
Fabien Meghazi
af668b891c
[FIX] pass request.context in /web/login
...
bzr revid: fme@openerp.com-20140211113603-0wsr288gejz416dw
2014-02-11 12:36:03 +01:00
Christophe Simonis
0b9bf8e2bf
[FIX] ensure_db():
...
When user ask a specific database on a new session, the nodb router
has been used to find the route.
Depending on installed module in the database, the rendering of the page
may depend on data injected by the database route dispatcher.
Thus, we redirect the user to the same page but with the session cookie set.
This will force using the database route dispatcher...
bzr revid: chs@openerp.com-20140207154703-o0gl58i2b56eridx
2014-02-07 16:47:03 +01:00
Christophe Simonis
79caa8e186
[IMP] extract save/get session actions as methods on session object
...
bzr revid: chs@openerp.com-20140206115253-ed7ahi6j83mgpw4y
2014-02-06 12:52:53 +01:00
Fabien Meghazi
42952bb7cf
[REM] Remove LoginForm javascript
...
bzr revid: fme@openerp.com-20140205091749-39333kr3hz0dt4wg
2014-02-05 10:17:49 +01:00
Denis Ledoux
54dff0857d
[ADD]web: controller to redirect /apps/{appname} to install module form (not yet perfect, the menu is not displayed, but meanwhile this is something)
...
bzr revid: dle@openerp.com-20140131113347-twndgtaq6d16eycc
2014-01-31 12:33:47 +01:00
Fabien Meghazi
526c5fb6cb
[FIX] Login redirection problem
...
bzr revid: fme@openerp.com-20140131095606-xlyzzhm2tc0myq0s
2014-01-31 10:56:06 +01:00
Antony Lesuisse
f051043a26
[MERGE] trunk-website-al
...
bzr revid: al@openerp.com-20140131005202-sjsfy3tc8ys1a325
2014-01-31 01:52:02 +01:00
Christophe Simonis
ca844edcf8
[IMP] web: alternative routes for company logo
...
bzr revid: chs@openerp.com-20140130180827-xior7wc6shtamcgu
2014-01-30 19:08:27 +01:00
Denis Ledoux
9c8a59b60b
[FIX] web: use werkzeug instead of urllib, as werkzeug handle utf-8 while urllib doesnt
...
bzr revid: dle@openerp.com-20140130112741-mxonv6j1gt89f1uj
2014-01-30 12:27:41 +01:00
Fabien Meghazi
ef019949f4
[FIX] ensure db param is legit in order to avoid xss
...
bzr revid: fme@openerp.com-20140130103045-up2bcqmqu8wm3sl9
2014-01-30 11:30:45 +01:00
Fabien Meghazi
469c5d3f1c
[MOV] Move ensure_db() helper from
...
Since we removed auth="admin" in favor of auth="none" with explicit superuser id usage,
the disable_db clause in ir_http#...auth_none() has only sense for /web and /web/login routes.
The web module is an exception because it's routes are registered for the nodb dispatching.
This is why the ensure_db() helper is moved to web client and will take care of the
web's auth="none" routes that needs a db to work with
bzr revid: fme@openerp.com-20140130091820-xezgqezsv2vnmlq1
2014-01-30 10:18:20 +01:00
Fabien Meghazi
07235017aa
[REM] Remove single auth="admin" left
...
bzr revid: fme@openerp.com-20140129144623-a8fy4xx3hmvcww0j
2014-01-29 15:46:23 +01:00
Christophe Simonis
83345e4414
[MERGE] forward port of branch saas-2 up to revid 3899 chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
...
bzr revid: chs@openerp.com-20140129101004-44ft0oaeo201guhd
2014-01-29 11:10:04 +01:00
Fabien Meghazi
b91b265cb8
[IMP] Use ensure_db() for /web and /web/login. Logout controller does not clear the db anymore
...
bzr revid: fme@openerp.com-20140128211802-9y77th2zojfhp35q
2014-01-28 22:18:02 +01:00
Fabien Meghazi
f4e33da924
[ADD] Database selector to login screen
...
bzr revid: fme@openerp.com-20140124151656-swy3jknclfnxkwzx
2014-01-24 16:16:56 +01:00
Christophe Simonis
457d661ae0
[FIX] test: correct Mock of search_read
...
[IMP] search_read: build order index using dict comprehension
bzr revid: chs@openerp.com-20140123170836-4qu0ei6zucaprwxs
2014-01-23 18:08:36 +01:00
Frédéric van der Essen
2f2c1057b3
[FIX] read: fix performance issue due to O(n)^2 sorting
...
bzr revid: fva@openerp.com-20140123161523-xvc8so45uwj3uivs
2014-01-23 17:15:23 +01:00
Fabien Meghazi
fff9749edd
[ADD] TODO for database manager
...
bzr revid: fme@openerp.com-20140122105712-cawi7lp0mnm9k9hv
2014-01-22 11:57:12 +01:00
Fabien Meghazi
9981100807
[FIX] keep backward compatibility for saas
...
bzr revid: fme@openerp.com-20140121160140-wgm0av3kaw0nvc61
2014-01-21 17:01:40 +01:00
Fabien Meghazi
9e9ad95ce3
[MOV] redirection helpers from webclient to server
...
bzr revid: fme@openerp.com-20140121155432-3sd85jqnqgxrnjr5
2014-01-21 16:54:32 +01:00
Fabien Meghazi
3087646d34
[FIX] render bootstrap template checks request.debug
...
bzr revid: fme@openerp.com-20140121105233-h2c2nfs75qxc6w10
2014-01-21 11:52:33 +01:00
Fabien Meghazi
f43f06a6b0
[IMP] use 'error' key in login template
...
bzr revid: fme@openerp.com-20140121093224-8auf7b00jxfq8940
2014-01-21 10:32:24 +01:00
Fabien Meghazi
bb3118ac3d
[IMP] Honor db query param in /web/login too
...
bzr revid: fme@openerp.com-20140117140746-v86qxs3msxd0u6mu
2014-01-17 15:07:46 +01:00
Martin Trigaux
4b7799c0c7
[IMP] search_read: use search_read from the orm instead of rewritting it
...
skip search_count when getting no result from search_read
remove useless test based on implementation details
bzr revid: mat@openerp.com-20140117120047-9b5emsrbtjauvegl
2014-01-17 13:00:47 +01:00
Martin Trigaux
bd2bd8dbbc
[FIX] export: ignore unexistant field when retrieving field labels in saved field list
...
This avoids getting an error if a list contains a field no longer present in the model (eg: removed custom field)
bzr revid: mat@openerp.com-20140117101655-gz05oxkebn0bue8w
2014-01-17 11:16:55 +01:00
Fabien Meghazi
c0dda700f1
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140116181519-xtzhzm7u98u6xz18
2014-01-16 19:15:19 +01:00