ecffb93f76
Adding basic contribution guidelines
2014-05-26 11:39:48 +02:00
576b00a196
Merge pull request #174 from odoo-dev/tnx-remains
...
Various ex-module remains
2014-05-23 12:21:33 +02:00
9f6f9853a0
[REM] leftovers from removed/deactivated modules
...
* document_page should have disappeared a long time ago, no idea why it
remains
* thunderbird seems to have suffered from odd conflictual moves (or lack
thereof)
* audittrail was removed but not deactivated in rosetta
2014-05-23 12:18:17 +02:00
ed156e6724
[REM] undead modules reanimated by translation file exports
2014-05-23 12:02:03 +02:00
c69f0260ef
Merge pull request #170 from odoo-dev/master-fix-languages-thingy-tde
...
[FIX] website: fixed languages errors
- ir_http: added a missing ? when a route using the default language was re-rerouted to remove the language part of the path, leading to a wrong url
- website layout: fixed use of a languages variable not always defined depending on the working conditions
2014-05-23 11:06:47 +02:00
62c0f6bf11
[FIX] website: ir_http: when rerouting url containing default language -> url without language, the ? was missing, leading to wrong urls.
2014-05-23 10:39:26 +02:00
319f4cb270
[FIX] website: define languages variable outside of an 'if' as it is used below in the same template, leading to a crash due to the variable not always being defined.
2014-05-23 10:23:13 +02:00
7a6435b0a3
[MERGE] no website description
2014-05-23 10:20:06 +02:00
1ddc8c7f93
[IMP] missing file
2014-05-23 09:55:24 +02:00
f6575e2645
[FIX] Missing file
2014-05-23 09:43:34 +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
a3f5da5f4f
Merge pull request #168 from legalsylvain/master
...
[FIX] Issues #167 . Remove obsolete shop reference
2014-05-23 09:15:08 +02:00
5d8927e2b1
[FIX] Issues #167 . Remove obsolete shop reference
2014-05-22 22:55:50 +02:00
ada00bbe32
Merge pull request #164 from odoo-dev/master-website_sale--fix-tde
...
[FIX] website_sale: cleaned call to removed methods in website_sale
2014-05-22 16:22:32 +02:00
c0fdc2cdbe
Improvement of the delivery module
...
Add field sequence on the delivery.gird.line to order rules
Add condition quantity to add more flexibility in the rules
Add operators > and < to be able to create rules without gap (instead of needing hack like 'x <= 100', 'x >= 100.000001')
2014-05-22 15:41:36 +02:00
13ac3865d5
[CLEAN] Use none or false, but not both on two lines ...
2014-05-22 15:40:29 +02:00
15e874b5c8
[FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
2014-05-22 15:34:09 +02:00
0efc066aa6
Add sequence field with handle in tree view
2014-05-22 14:56:33 +02:00
4e34e3bce5
Add < and > operators to allow rules without gap (eg: until 100 & above 100)
2014-05-22 14:55:26 +02:00
8df42a88ab
Merge pull request #160 from odoo-dev/master-forum-subtypes-tde
...
MERGE [IMP] website_forum: make forum.forum inherit from mail.thread. This way we add the possibility to users to follow a forum and be automatically followers of new questions, using some new subtypes on the forum.forum model that do the auto subscription.
Misc :
also added a profile link on the forum, when logged.
also added a subscribe button on the forum.
2014-05-22 14:29:06 +02:00
2649beba97
[IMP] website_forum: make forum;forum inherit from mail.thread. This way we
...
add the possibility to users to follow a forum and be automatically followers of new
questions, using some new subtypes on the forum.forum model that do the auto subscription.
Also added a profile link on the forum, when logged.
Also added a subscribe button on the forum.
2014-05-22 13:49:41 +02:00
8ad97da843
Merge pull request #159 from odoo-dev/master-gengo-fix-rim
...
[FIX] base_gengo: use supported/up-to-date library
2014-05-22 13:46:15 +02:00
0b0f74861e
[DOC] base_gengo: add changelog
2014-05-22 13:36:48 +02:00
59ecefbed2
Remove content field in Pages History form in website_blog module
2014-05-22 16:17:22 +05:30
b283f8d5b1
[FIX] base_gengo: use supported/up-to-date library
2014-05-22 12:13:34 +02:00
52f571ac8a
Remove content html field from website_blog module
2014-05-22 15:33:37 +05:30
c0f453a1ea
Remove description html field from website_event_track module
2014-05-22 15:28:39 +05:30
a79ffefd87
Remove description html field in website_forum module
2014-05-22 15:26:10 +05:30
3772a3a3af
Remove html fields in frontend from website_quote module
2014-05-22 15:23:09 +05:30
7adfaf786d
Merge pull request #97 from odoo-dev/master-default-addons-path-fme
...
[FIX] If no addons-path provided, include the main addons [Fixes #29 ]
2014-05-21 11:15:21 +02:00
d5fcc1e1e0
Merge pull request #95 from odoo-dev/master-seperate-bundle-fme
...
Seperate web.assets_common from other bundles
2014-05-21 10:40:33 +02:00
593cdf427f
Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme
2014-05-21 10:29:04 +02:00
05f376e310
If no addons-path provided, include the main addons
2014-05-20 22:33:49 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
bb26dea60b
[MERGE] forward port of branch saas-3 up to revid 38abc8a
2014-05-20 19:00:50 +02:00
38abc8a006
[MERGE] forward port of branch 7.0 up to revid b09b6a0
2014-05-20 18:57:04 +02:00
040c93026a
[MERGE] merge bzr trunk addons branch
2014-05-20 18:10:36 +02:00
ab4c3534de
[MERGE] merge bzr trunk server branch
2014-05-20 17:30:01 +02:00
a70eea3b11
[MERGE] merge bzr saas-4 web branch
2014-05-20 17:14:18 +02:00
d93f628c72
[MERGE] merge bzr saas-4 addons branch
2014-05-20 17:12:01 +02:00
863edbaaf2
Seperate assets_common from other bundles
2014-05-20 17:06:25 +02:00
8f0066d728
[MERGE] merge bzr saas-4 server branch
2014-05-20 17:05:25 +02:00
a5bb6b17e2
[MERGE] merge bzr saas-3 addons branch
2014-05-20 16:46:58 +02:00
e046626093
[MERGE] merge bzr saas-3 server branch
2014-05-20 16:41:04 +02:00
b09b6a06b1
[MERGE] merge bzr addons branch
2014-05-20 16:31:43 +02:00
528d04d6dd
[MERGE] merge bzr server branch
2014-05-20 16:28:48 +02:00
40abb97136
[FIX] account_analytic_analysis: use product.price if pricelist is passed, else list_price
2014-05-20 16:08:03 +02:00
3d70237d0d
[FIX] website_forum: correct goal definition and other improvement
...
- scholar: the field is_correct is on the answer, not on the question
- remove closing reason 'an answer was accepted', the questions should be left as open to be possible to improve the answer afterward
- sort badges by most frequent first
- display the creation date of the question the same way we display the answer date
2014-05-20 15:27:33 +02:00
a558a84630
[IMP] display the createion date of the question the same way we display the answer fate
2014-05-20 15:05:27 +02:00
4d9aa300a7
[IMP] as the closing reason is not required, do not display it if none is present
2014-05-20 14:50:51 +02:00
Martin Trigaux
xmo-odoo
Xavier Morel
Thibault Delavallée
Fabien Pinckaers
Sylvain LE GAL
Richard Mathot
Yogesh Parekh
Fabien Meghazi
Fabien Meghazi
Christophe Simonis
Christophe Simonis
Denis Ledoux