Parth Gajjar (Open ERP)
3015f006fe
[IMP] improved minor code,Checkpoint: Part 1 complete
...
bzr revid: pga@tinyerp.com-20140206072437-zrpchhf1tbp2kt2m
2014-02-06 12:54:37 +05:30
Parth Gajjar (Open ERP)
0bf2635970
[MERGE] merged with trunk-survey2-rim
...
bzr revid: pga@tinyerp.com-20140206051331-vpf8p1zkrkjhw01j
2014-02-06 10:43:31 +05:30
Richard Mathot (OpenERP)
d1c1c0fec4
[FIX] survey_questions have now a correct survey_id (not empty)
...
bzr revid: rim@openerp.com-20140205095246-2ffxe8t1tkio1vw2
2014-02-05 10:52:46 +01:00
Richard Mathot (OpenERP)
c6c517369b
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140205081801-u0hk5zak0i4c7w6q
2014-02-05 09:18:01 +01:00
Richard Mathot (OpenERP)
c8a320553c
[IMP] Quizz mode
...
bzr revid: rim@openerp.com-20140205081626-0e1r5g71c53r5x5w
2014-02-05 09:16:26 +01:00
Richard Mathot (OpenERP)
e910dc758d
[FIX] Access right
...
bzr revid: rim@openerp.com-20140205080541-2b4yzamvydxnb9xw
2014-02-05 09:05:41 +01:00
Parth Gajjar (Open ERP)
51b1eb6fbf
[IMP] moved pagination script in separate js file,and solved minor issues
...
bzr revid: pga@tinyerp.com-20140204095157-0mfdy27l9l73dxf5
2014-02-04 15:21:57 +05:30
Fabien Meghazi
2638b11f38
[MERGE] saas-3
...
bzr revid: fme@openerp.com-20140203133132-4pljci0aiofv4o2q
2014-02-03 14:31:32 +01:00
Parth Gajjar (Open ERP)
c8beefd3cf
[IMP] removed panel structure from page and question
...
bzr revid: pga@tinyerp.com-20140203132357-jt9qxkiu019j9o21
2014-02-03 18:53:57 +05:30
Christophe Matthieu
33353c6ebc
[FIX] website_sale: extend time for test tour
...
bzr revid: chm@openerp.com-20140203131539-fva4au60w4ic46c5
2014-02-03 14:15:39 +01:00
Fabien Meghazi
967c9db196
[FIX] never let me commit in saas-3 again
...
bzr revid: fme@openerp.com-20140203124516-l8wwu9vdyo2nu2s0
2014-02-03 13:45:16 +01:00
Christophe Matthieu
67e0806547
[FIX] website_sale: test tour and bootstrap col layout
...
bzr revid: chm@openerp.com-20140203123354-xt5zco6rz92z3str
2014-02-03 13:33:54 +01:00
Fabien Meghazi
4bf0284d4b
[IMP] Cosmetic change for easier debugging
...
bzr revid: fme@openerp.com-20140203122300-pduwmt5z5cprehey
2014-02-03 13:23:00 +01:00
Xavier Morel
5de043e044
[FIX] various issues with JS tests
...
bzr revid: xmo@openerp.com-20140203120553-foe2jutor33j1b8q
2014-02-03 13:05:53 +01:00
Christophe Matthieu
d08ca544db
[MERGE] from sass-3
...
bzr revid: chm@openerp.com-20140203120437-5a1w6v46vrokkr5d
2014-02-03 13:04:37 +01:00
Xavier Morel
0aa0bbd539
[FIX] add warning when dbfilter logs out current session
...
bzr revid: xmo@openerp.com-20140203115633-es2o542ywg85d46i
2014-02-03 12:56:33 +01:00
Christophe Matthieu
d23f8425ad
[FIX] website tour: flickering; banner auto run; work with different language
...
bzr revid: chm@openerp.com-20140203112816-c350lxr5pgo9x2li
2014-02-03 12:28:16 +01:00
63fc1d7f35
Merge trunk
...
bzr revid: ddm@openerp.com-20140203092711-03yvclkue6eboqir
2014-02-03 10:27:11 +01:00
Martin Trigaux
a9ea8c2275
[FIX] gamification_sale_crm: in demo data, end_date is last day of month, not 31th of month
...
bzr revid: mat@openerp.com-20140203091848-9kspakimqorltvxx
2014-02-03 10:18:48 +01:00
Richard Mathot (OpenERP)
e534d4ba5c
[IMP] Quizz mode
...
bzr revid: rim@openerp.com-20140203082409-hqg940320ds5or5m
2014-02-03 09:24:09 +01:00
Parth Gajjar (Open ERP)
e942cb2cd0
[IMP] moved graph JavaScript from template to separate JS file (using AJAX), removed static copy of graph library
...
bzr revid: pga@tinyerp.com-20140203073439-mj21tfw6a0mg56v1
2014-02-03 13:04:39 +05:30
4208281471
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
2014-02-03 05:18:28 +00:00
Dharmraj Jhala (OpenERP)
9f7dd63acd
[MERGE] with trunk-survey2-rim
...
bzr revid: dizzy.zala@gmail.com-20140203050752-mu2067skmaxivk51
2014-02-03 10:37:52 +05:30
Richard Mathot (OpenERP)
3ceb0e8a3f
[REM]
...
bzr revid: rim@openerp.com-20140202162549-i16bdqlm80uqp6pc
2014-02-02 17:25:49 +01:00
Richard Mathot (OpenERP)
7f0c30580b
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140131154544-tfcci0uo0q6652jh
bzr revid: rim@openerp.com-20140202135602-82pcqeqqtdp6h9fr
2014-02-02 14:56:02 +01:00
Antony Lesuisse
5960d495e5
[FIX] website_sale typo feh police
...
bzr revid: al@openerp.com-20140201121415-pxnhjdc4o3tp91hj
2014-02-01 13:14:15 +01:00
c5da05715c
Merge trunk
...
bzr revid: ddm@openerp.com-20140131171707-62mipquizz9k36ko
2014-01-31 18:17:07 +01:00
5a07191a9d
[FIX] Re-enable UI tests
...
bzr revid: ddm@openerp.com-20140131171619-ctiww3na8wm53rzf
2014-01-31 18:16:19 +01:00
Xavier Morel
e9a3d8bcec
[FIX] enable jsonrpc-auth tests, remove stray log
...
bzr revid: xmo@openerp.com-20140131154147-oi30v8u8h3c3htx7
2014-01-31 16:41:47 +01:00
Xavier Morel
8be916910e
[FIX] re-enable web_tests_demo tests
...
bzr revid: xmo@openerp.com-20140131152753-81418oy8wjzxkgmt
2014-01-31 16:27:53 +01:00
Richard Mathot (OpenERP)
308a3def95
[REM] Old code
...
bzr revid: rim@openerp.com-20140131152656-ieutl7s9rg313fh9
2014-01-31 16:26:56 +01:00
Xavier Morel
ae3223907b
[FIX] modules initialization when testing
...
broken "adaptation" to single-instance openerp would only initialize the first
set of dependencies, any further module would see its test runs without itself
or its dependencies being guaranteed to be initialized/installed into the
current openerp instance.
bzr revid: xmo@openerp.com-20140131152640-coxqulkdb0xupbvq
2014-01-31 16:26:40 +01:00
Richard Mathot (OpenERP)
35fe898793
[IMP] Quizz mode
...
bzr revid: rim@openerp.com-20140131152640-9j43vm5jxvjqwjd6
2014-01-31 16:26:40 +01:00
Xavier Morel
b78703c122
[IMP] console.log js output should be piped to stdout during JS tests
...
bzr revid: xmo@openerp.com-20140131152612-rqxkge24w6p95q10
2014-01-31 16:26:12 +01:00
9428c563d5
chm patch
...
bzr revid: ddm@openerp.com-20140131132243-xsahk1e6rikv0a34
2014-01-31 14:22:43 +01:00
Xavier Morel
830618d871
[IMP] oe: get db password from config file
...
bzr revid: xmo@openerp.com-20140131114828-b90z3pxql63ky6gp
2014-01-31 12:48:28 +01:00
Christophe Simonis
46cbf22efb
[FIX] allow to use "dbname" as keyword in routes
...
bzr revid: chs@openerp.com-20140131163139-89lfordriamw9i1w
2014-01-31 17:31:39 +01:00
Antony Lesuisse
059715b348
[MERGE] trunk-website-al fix tour startup
...
bzr revid: al@openerp.com-20140131132610-orsceg18a31hifch
2014-01-31 14:26:10 +01:00
Olivier Dony
e846c499e8
[REL] version: 7.~saas-3
...
bzr revid: odo@openerp.com-20140131122313-zaet2jih5dg76qu6
2014-01-31 13:23:13 +01:00
Frédéric van der Essen
8342a7c51d
[FIX] point_of_sale: update redirection system with the website-al changes
...
bzr revid: fva@openerp.com-20140131114542-09hnjju5sdcen20q
2014-01-31 12:45:42 +01:00
Fabien Meghazi
5451f5587d
[REV] Bring back QWebExceptions
...
bzr revid: fme@openerp.com-20140131113611-wee3xvnvzw9smq2r
2014-01-31 12:36:11 +01:00
Fabien Meghazi
fa61a1e5a7
[REV] Bring back QWebException, rename QWebException#inner to 'cause'
...
bzr revid: fme@openerp.com-20140131113515-ahcix3h6uzzdz8ix
2014-01-31 12:35:15 +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
Xavier Morel
99743cae43
[REM] useless comment
...
the database password is necessary to duplicate databases
bzr revid: xmo@openerp.com-20140131110748-nfguxwjysgbn6y3y
2014-01-31 12:07:48 +01:00
Fabien Meghazi
3fac414239
[FIX] CORS routing should use new routing api
...
bzr revid: fme@openerp.com-20140131104840-e0557qke365ym2x4
2014-01-31 11:48:40 +01:00
Nicolas Wisniewski
93bbdc6b53
[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)
...
bzr revid: nwi@openerp.com-20140228110637-dh15ixb2nppikuif
2014-02-28 12:06:37 +01:00
Olivier Dony
c52cd95348
[IMP] website_crm_partner_assign: move partner grade filter in the left column
...
bzr revid: odo@openerp.com-20140131104232-62nc8wua8xflrd64
2014-01-31 11:42:32 +01:00
Frédéric van der Essen
a45ae1384c
[IMP] point_of_sale: increased size of logo on receipt
...
bzr revid: fva@openerp.com-20140131102245-hhshe83xuanllhyt
2014-01-31 11:22:45 +01:00
Fabien Meghazi
526c5fb6cb
[FIX] Login redirection problem
...
bzr revid: fme@openerp.com-20140131095606-xlyzzhm2tc0myq0s
2014-01-31 10:56:06 +01:00
Olivier Dony
1d147f0392
[FIX] website*: no border for customer/reseller/member entries + extra bottom margin on left column
...
bzr revid: odo@openerp.com-20140131093902-n3h10eflemmjvlyt
2014-01-31 10:39:02 +01:00
Parth Gajjar (Open ERP)