Merge lp:~vasilev/psiphon/sprint3-610176 into lp:psiphon
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~vasilev/psiphon/sprint3-610176 | ||||
Merge into: | lp:psiphon | ||||
Diff against target: |
194 lines (+61/-10) 6 files modified
trunk/mod_psiphon/mod_psiphon_headers/mod_psiphon_headers.c (+8/-2) trunk/sql/upgrade-2.6.sql (+4/-0) trunk/tools/psiphon_install.sh (+1/-1) trunk/www/bluebar.php (+6/-1) trunk/www/custom_user_agent.php (+15/-6) trunk/www/includes/lang.php (+27/-0) |
||||
To merge this branch: | bzr merge lp:~vasilev/psiphon/sprint3-610176 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adam Kruger | Disapprove | ||
Review via email: mp+33767@code.launchpad.net |
This proposal has been superseded by a proposal from 2010-09-01.
Commit message
Fixes for https:/
Implemented functionality described in Adam's comment.
1. Added 'back_link' field in 'useragent' table.
2. Patched mod_psiphon_
3. Patched bluebar.php to display appropriate compatibility mode exit link.
4. Patched custom_
Description of the change
Fixes for https:/
1. Patched mod_psifon_
2. Patched bluebar.php to display custom user agent value, if such is set up.
3. Added useragent_
4. Added stub for future phpunit tests for useragent_
Traslations for lang.php/browse_as value are needed.
The bug description was not clear and so what is implemented is not what was intended.
We would like a link to appear on the bluebar when a custom user agent is being sent (this part was implemented as intended).
The text of the link should be the following: "Exit Compatibility Mode"
The link's href should be a value that is stored in a new column of the user agent table, corresponding to the custom user agent record that is in use.
Please ask if you need any further clarification.