Merge lp://staging/~dorian-kemps/unifield-web/US-10141 into lp://staging/unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 5036
Proposed branch: lp://staging/~dorian-kemps/unifield-web/US-10141
Merge into: lp://staging/unifield-web
Diff against target: 97 lines (+28/-1)
5 files modified
addons/openerp/controllers/templates/database.mako (+5/-0)
addons/openerp/controllers/utils.py (+4/-1)
addons/openerp/po/messages/fr.po (+8/-0)
addons/openerp/static/css/style.css (+7/-0)
addons/openerp/utils/rpc.py (+4/-0)
To merge this branch: bzr merge lp://staging/~dorian-kemps/unifield-web/US-10141
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+425394@code.staging.launchpad.net
To post a comment you must log in.
5037. By Dorian

US-10141 [PROGRESS] Login: Added a new message in case the DB isn't correctly restored. Fixed restore warning message

5038. By Dorian

US-10141 [FIX] Login: Added a new message in case the DB isn't correctly restored. Fixed restore warning message

5039. By Dorian

US-10141 [FIX] Login: Fixed translation of restoration message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches