lp:~nurlan0000/psiphon/sprint3-576643
Created by
Nurlan Turdaliev
and last modified
- Get this branch:
- bzr branch lp:~nurlan0000/psiphon/sprint3-576643
Only
Nurlan Turdaliev
can upload to this branch. If you are
Nurlan Turdaliev
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Adam Kruger: Approve
- Rod: Needs Fixing
- Nurlan Turdaliev (community): Needs Resubmitting
-
Diff: 429 lines (+283/-19) (has conflicts)8 files modifiedtrunk/mod_psiphon/httpd_conf/httpd.conf (+1/-1)
trunk/sql/upgrade-2.6.sql (+2/-0)
trunk/tools/psiphon_install.sh (+1/-1)
trunk/www/config.php (+4/-0)
trunk/www/includes/lang.php (+65/-0)
trunk/www/includes/url_helpers.php (+6/-0)
trunk/www/p.php (+193/-0)
trunk/www/reset_password.php (+11/-17)
Branch information
Recent revisions
- 120. By eugene <eugene@mbp>
-
JS rules compatibility fix for rfa.org player, new voa chinese code, youtube.com , embedded youtube fix in flash2js.php
- 118. By Adam Pritchard <adam@adampsidev>
-
Broke out the 'special tags' warning into 'html tags' and 'format specifiers', since they differ greatly in severity.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:psiphon