0f01df42ea
[MERGE] Forward-port saas-5 up to f15cbd6
2014-06-12 18:59:15 +02:00
f15cbd6520
[MERGE] Forward-port saas-4 bugfixes up to ad4c6ca
2014-06-12 18:54:36 +02:00
74168c4e9d
Merge pull request #272 from odoo-dev/master-inline-searchview-ged
...
[MERGP] Inline Searchview
This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place. It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)
Because of this, other large changes have been made:
the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)
It is likely that some stupid bugs have been introduced. Please don't hurt me.
2014-06-12 16:27:11 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
af58bc5914
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-11 10:10:58 +02:00
6b85d80f23
[FIX] Wrap werkzeug.utils.escape() to accomodate signature change in 0.9
...
We always want to escape quotes (") as part of the process of
generating HTML output. This option (quote=True) turned into
an implicit flag with a DeprecationWarning in werkzeug 0.9.0
It is likely to disappear in a future release of werkzeug too.
A wrapper avoids this warning without loss of compatibility
2014-06-10 18:46:40 +02:00
a7c2125735
[MERGE] forward port of branch saas-4 up to 6b8e972
2014-06-10 13:15:46 +02:00
6b8e9727e5
[MERGE] forward port of branch saas-3 up to 4601d85
2014-06-10 12:29:47 +02:00
4b3cec8ecf
[FIX] website_event_track: remove trailing comma in speakers name in event tracks
2014-06-05 17:50:15 +02:00
5cc8f9ca42
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-05-28 10:37:16 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
62900fe01b
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
...
Conflicts:
addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
143615ddc1
Merge branch 'master-remove-html-fields-backend-ypa' of https://github.com/odoo-dev/odoo into odoo-dev-master-remove-html-fields-backend-ypa
2014-05-23 09:24:16 +02:00
c0f453a1ea
Remove description html field from website_event_track module
2014-05-22 15:28:39 +05:30
555677f14d
[IMP] replace all 'Group By...' by 'Group By'
...
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters. This change was requested by the upper management
2014-05-22 11:44:35 +02:00
37d6fe344b
[FIX] website_event_track: display speakers name to public users
2014-05-21 17:10:50 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
be99dbf16a
[FIX] website_event_track: human-readable display of track durations
2014-05-19 17:41:50 +02:00
3b859c219f
Default event track is half hour not 30 hours
...
This is a leftover from revision 9304
where the duration property of events changed unit
from minutes to hours but the defualt value remained 30.
2014-05-19 14:04:01 +02:00
c3cfc4bc32
[MERGE] sitemap backport, merge trunk from 9438 til 9440
...
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-13 16:38:31 +02:00
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +02:00
ef06e5087a
[FIX] various website modules, re-enable crawler tests
...
* fix crawler to discard URL fragments before deduplicating and crawling
* fix website_forum links which should not be links (either because their urls
are JSON-RPC methods or because their urls are side-effecting
* remove stray print statements
* side-improvements (simplifications) to some methods
2014-05-13 11:42:05 +02:00
36bb8acfab
[IMP] website_event_track: simplify event_agenda
2014-05-13 10:49:24 +02:00
5cf2386e72
[FIX] website_event_track: display days in chronological order
2014-05-13 09:28:03 +02:00
798e4156fa
[IMP] sitemap cleaning: events
...
bzr revid: fp@tinyerp.com-20140511143314-nzn1239l00arbxjq
2014-05-11 16:33:14 +02:00
1d0a6e20a4
[FIX] event: move definition of fields track_ids and count_tracks to the right module
...
bzr revid: rco@openerp.com-20140505085739-z2asr1vrx6yyjtlh
2014-05-05 10:57:39 +02:00
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
8970cefdd1
[IMP] track duration in hours
...
bzr revid: fp@tinyerp.com-20140409184334-ehkhowyhyqw6cdmx
2014-04-09 20:43:34 +02:00
65908c769b
[IMP] Event Agenda: merge with cleaning
...
bzr revid: fp@tinyerp.com-20140409172600-bwy97j8kr8dzrgg9
2014-04-09 19:26:00 +02:00
9776b9e0bd
[FIX]
...
bzr revid: vme@tinyerp.com-20140409102852-wzbj1h4l9s94v7fc
2014-04-09 15:58:52 +05:30
308ac3dcaf
[IMP]improve comment
...
bzr revid: vme@tinyerp.com-20140409101205-j41ufx8kxh10usf3
2014-04-09 15:42:05 +05:30
4a1bc09a40
[IMP]shows location on days and fixes other bug.
...
bzr revid: vme@tinyerp.com-20140409100310-tiugx0jzxlwdphy6
2014-04-09 15:33:10 +05:30
6dff1b434d
[IMP] track translatable
...
bzr revid: fp@tinyerp.com-20140409082730-0aafeuss3o8ywmkm
2014-04-09 10:27:30 +02:00
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
2baf1c7a52
[IMP]
...
bzr revid: vme@tinyerp.com-20140404110140-i0gtefh1astotx70
2014-04-04 16:31:40 +05:30
2a8f2a70ff
[IMP]Show track name when overlaping and color shown in backend view.
...
bzr revid: vme@tinyerp.com-20140404105903-wvgrsias92zml5di
2014-04-04 16:29:03 +05:30
a4907a2d82
[FIX]timezone
...
bzr revid: vme@tinyerp.com-20140404070517-gr561r6l5b02t4a3
2014-04-04 12:35:17 +05:30
2325750562
[REM]
...
bzr revid: vme@tinyerp.com-20140404055028-cjb6vzv1whvacpr1
2014-04-04 11:20:28 +05:30
73b3c851da
[FIX] website*: remove unusable demo links from manifests
...
bzr revid: dle@openerp.com-20140403145128-9w92v4mmasz66mqj
2014-04-03 16:51:28 +02:00
77390a8b76
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20140403131938-75bwnfhg6frydlnb
2014-04-03 18:49:38 +05:30
ec02c17ded
[IMP]Add test cases.
...
bzr revid: vme@tinyerp.com-20140403125219-i34g7kxpcsbo1pcq
2014-04-03 18:22:19 +05:30
a2bb4bb603
[ADD]Add many usefull comments.
...
bzr revid: vme@tinyerp.com-20140403101936-7qvi6wqvfpxpcpg9
2014-04-03 15:49:36 +05:30
6a58964065
[MERGE]Trunks.
...
bzr revid: vme@tinyerp.com-20140403072700-9p2m0jmtp28xwpxd
2014-04-03 12:57:00 +05:30
9588999c7c
[IMP] Tracks: alphabetic order
...
bzr revid: fp@tinyerp.com-20140403072548-y4823lyjuovl5neu
2014-04-03 09:25:48 +02:00
3357b38143
[Refacotere]Code.
...
bzr revid: vme@tinyerp.com-20140403071711-5dclywkcojrqu7dj
2014-04-03 12:47:11 +05:30
3470c07e77
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140327043351-3lqmcuxd26mrlzxu
2014-03-27 10:03:51 +05:30
22fd5a3e92
[IMP]: Convert buttons into stat button in stockand purchase module
...
bzr revid: ypa@tinyerp.com-20140326125640-0my7ih6bgk9s9dt1
2014-03-26 18:26:40 +05:30
17021e8bfb
[IMP]
...
bzr revid: vme@tinyerp.com-20140326113540-0ore3bg7sd1r2vu3
2014-03-26 17:05:40 +05:30
Olivier Dony
ged-odoo
Fabien Meghazi
Christophe Simonis
Denis Ledoux
Xavier Morel
Fabien Pinckaers
Yogesh Parekh
Richard Mathot
Christophe Simonis
Vicente Jimenez Aguilar
Fabien Pinckaers
Raphael Collet
Gery Debongnie
Vidhin Mehta (OpenERP)
Christophe Simonis
Randhir Mayatra rma-openerp
Yogesh Parekh (OpenERP)