lp:~psiphon-inc/psiphon/psiphon-1.6
Created by
Jeremy Vernon
and last modified
- Get this branch:
- bzr branch lp:~psiphon-inc/psiphon/psiphon-1.6
Members of
Psiphon Inc.
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
- Psiphon Inc.: Pending requested
-
Diff: 30229 lines (+29308/-0)170 files modifiedappWeb/CONFIGURE_DEBUG.TXT (+5/-0)
appWeb/CONFIGURE_RELEASE.TXT (+5/-0)
appWeb/openSslModule.cpp (+896/-0)
appWeb/thread.cpp (+768/-0)
appweb.cnf (+27/-0)
bake-w32.bat (+1/-0)
changes.txt (+99/-0)
common/CppSQLite3.cpp (+1383/-0)
common/CppSQLite3.h (+270/-0)
common/SHA1.cpp (+282/-0)
common/SHA1.h (+150/-0)
common/SetupInfo.cpp (+512/-0)
common/SetupInfo.h (+110/-0)
common/User.cpp (+598/-0)
common/User.h (+94/-0)
common/bookmarks.cpp (+213/-0)
common/bookmarks.h (+30/-0)
common/convert.cpp (+176/-0)
common/convert.h (+47/-0)
common/cookies.cpp (+947/-0)
common/cookies.h (+73/-0)
common/logDetails.cpp (+252/-0)
common/logDetails.h (+70/-0)
common/parsedUrl.cpp (+312/-0)
common/parsedUrl.h (+78/-0)
common/sessions.cpp (+134/-0)
common/sessions.h (+29/-0)
common/sqlite3.h (+1161/-0)
common/strfunc.cpp (+109/-0)
common/strfunc.h (+39/-0)
common/timefunc.h (+21/-0)
common/tracer.cpp (+89/-0)
common/tracer.h (+39/-0)
html/en/errors/403.html (+15/-0)
html/en/errors/404.html (+15/-0)
html/en/errors/504.html (+15/-0)
html/en/index.tpl.html (+1/-0)
html/en/language.ini (+1/-0)
html/en/login.tpl.html (+62/-0)
html/en/login_err_db_insert_sess.tpl.html (+62/-0)
html/en/login_err_db_update_sess.tpl.html (+62/-0)
html/en/login_err_no_match.tpl.html (+62/-0)
html/en/login_err_pwd.tpl.html (+62/-0)
html/en/login_err_user.tpl.html (+62/-0)
html/en/main.tpl.html (+15/-0)
html/en/reset_pwd.tpl.html (+66/-0)
html/en/reset_pwd_err_conf_fail_pwd.tpl.html (+66/-0)
html/en/reset_pwd_err_conf_pwd.tpl.html (+66/-0)
html/en/reset_pwd_err_cur_pwd.tpl.html (+66/-0)
html/en/reset_pwd_err_db_update.tpl.html (+66/-0)
html/en/reset_pwd_err_new_pwd.tpl.html (+66/-0)
html/en/reset_pwd_err_no_match.tpl.html (+66/-0)
html/en/reset_pwd_err_user.tpl.html (+66/-0)
html/en/reset_pwd_success.tpl.html (+27/-0)
html/en/topbar.tpl.html (+511/-0)
html/fr/errors/403.html (+15/-0)
html/fr/errors/404.html (+15/-0)
html/fr/errors/504.html (+15/-0)
html/fr/index.tpl.html (+1/-0)
html/fr/language.ini (+1/-0)
html/fr/login.tpl.html (+62/-0)
html/fr/login_err_db_insert_sess.tpl.html (+62/-0)
html/fr/login_err_db_update_sess.tpl.html (+62/-0)
html/fr/login_err_no_match.tpl.html (+62/-0)
html/fr/login_err_pwd.tpl.html (+62/-0)
html/fr/login_err_user.tpl.html (+62/-0)
html/fr/main.tpl.html (+15/-0)
html/fr/reset_pwd.tpl.html (+66/-0)
html/fr/reset_pwd_err_conf_fail_pwd.tpl.html (+66/-0)
html/fr/reset_pwd_err_conf_pwd.tpl.html (+66/-0)
html/fr/reset_pwd_err_cur_pwd.tpl.html (+66/-0)
html/fr/reset_pwd_err_db_update.tpl.html (+66/-0)
html/fr/reset_pwd_err_new_pwd.tpl.html (+66/-0)
html/fr/reset_pwd_err_no_match.tpl.html (+66/-0)
html/fr/reset_pwd_err_user.tpl.html (+66/-0)
html/fr/reset_pwd_success.tpl.html (+27/-0)
html/fr/topbar.tpl.html (+511/-0)
html/fr/topbar_text.tpl.html (+461/-0)
html/ru/language.ini (+1/-0)
html/ru/login.tpl.html (+62/-0)
html/ru/login_err_db_insert_sess.tpl.html (+62/-0)
html/ru/login_err_db_update_sess.tpl.html (+62/-0)
html/ru/login_err_no_match.tpl.html (+62/-0)
html/ru/login_err_pwd.tpl.html (+62/-0)
html/ru/login_err_user.tpl.html (+62/-0)
html/ru/reset_pwd.tpl.html (+66/-0)
html/ru/reset_pwd_err_conf_fail_pwd.tpl.html (+66/-0)
html/ru/reset_pwd_err_conf_pwd.tpl.html (+66/-0)
html/ru/reset_pwd_err_cur_pwd.tpl.html (+66/-0)
html/ru/reset_pwd_err_db_update.tpl.html (+66/-0)
html/ru/reset_pwd_err_new_pwd.tpl.html (+67/-0)
html/ru/reset_pwd_err_no_match.tpl.html (+66/-0)
html/ru/reset_pwd_err_user.tpl.html (+66/-0)
html/ru/reset_pwd_success.tpl.html (+27/-0)
html/ru/topbar.tpl.html (+517/-0)
install-ubuntu.txt (+98/-0)
install-w32.txt (+111/-0)
installer.aip (+221/-0)
mime.types (+110/-0)
psiphon.bkl (+296/-0)
psiphonHandler/CSSFlexLexer.h (+24/-0)
psiphonHandler/CSSLexer.l (+61/-0)
psiphonHandler/FlexLexer.h (+202/-0)
psiphonHandler/HTMLFlexLexer.h (+24/-0)
psiphonHandler/HTMLlexer.l (+315/-0)
psiphonHandler/lex.CSS.cpp (+1451/-0)
psiphonHandler/lex.HTML.cpp (+1852/-0)
psiphonHandler/myclient.cpp (+1084/-0)
psiphonHandler/myclient.h (+239/-0)
psiphonHandler/psiphonContFilter.cpp (+394/-0)
psiphonHandler/psiphonContFilter.h (+84/-0)
psiphonHandler/psiphonHandler.cpp (+1797/-0)
psiphonHandler/psiphonHandler.def (+3/-0)
psiphonHandler/psiphonHandler.h (+204/-0)
psiphonHandler/psiphonUrl.cpp (+293/-0)
psiphonHandler/psiphonUrl.h (+49/-0)
psiphonHandler/psiphonUtils.cpp (+390/-0)
psiphonHandler/psiphonUtils.h (+55/-0)
psiphonHandler/tokensDefs.h (+48/-0)
psiphonPanel/CertDlg.cpp (+309/-0)
psiphonPanel/CertDlg.h (+64/-0)
psiphonPanel/CodeCountry.cpp (+266/-0)
psiphonPanel/CodeCountry.h (+30/-0)
psiphonPanel/DownloadEvent.cpp (+96/-0)
psiphonPanel/DownloadEvent.h (+168/-0)
psiphonPanel/DownloadFile.cpp (+167/-0)
psiphonPanel/DownloadFile.h (+80/-0)
psiphonPanel/GetIP.cpp (+101/-0)
psiphonPanel/GetIP.h (+23/-0)
psiphonPanel/LinkDlg.cpp (+302/-0)
psiphonPanel/LinkDlg.h (+63/-0)
psiphonPanel/ListCtrlSort.cpp (+88/-0)
psiphonPanel/ListCtrlSort.h (+74/-0)
psiphonPanel/LogDlg.cpp (+223/-0)
psiphonPanel/LogDlg.h (+61/-0)
psiphonPanel/PrefDlg.cpp (+121/-0)
psiphonPanel/PrefDlg.h (+45/-0)
psiphonPanel/PsiphonApp.cpp (+99/-0)
psiphonPanel/PsiphonApp.h (+43/-0)
psiphonPanel/PsiphonDlg.cpp (+574/-0)
psiphonPanel/PsiphonDlg.h (+99/-0)
psiphonPanel/PsiphonLog.cpp (+51/-0)
psiphonPanel/PsiphonLog.h (+39/-0)
psiphonPanel/PsiphonNameDlg.cpp (+133/-0)
psiphonPanel/PsiphonNameDlg.h (+42/-0)
psiphonPanel/Server.cpp (+215/-0)
psiphonPanel/Server.h (+80/-0)
psiphonPanel/SetupDlg.cpp (+123/-0)
psiphonPanel/SetupDlg.h (+61/-0)
psiphonPanel/UpdateDlg.cpp (+292/-0)
psiphonPanel/UpdateDlg.h (+59/-0)
psiphonPanel/UserDetailsDlg.cpp (+230/-0)
psiphonPanel/UserDetailsDlg.h (+46/-0)
psiphonPanel/UserDlg.cpp (+336/-0)
psiphonPanel/UserDlg.h (+69/-0)
psiphonPanel/cert.cpp (+102/-0)
psiphonPanel/cert.h (+22/-0)
psiphonPanel/psiphonoff.xpm (+189/-0)
psiphonPanel/psiphonon.xpm (+189/-0)
psiphonPanel/resources.h (+33/-0)
psiphonPanel/sessionAccess.cpp (+172/-0)
psiphonPanel/sessionAccess.h (+35/-0)
psiphonPanel/stdwx.cpp (+19/-0)
psiphonPanel/stdwx.h (+53/-0)
psiphonPanel/taskbaricon.cpp (+91/-0)
psiphonPanel/taskbaricon.h (+39/-0)
psiphonPanel/update.cpp (+79/-0)
psiphonPanel/update.h (+20/-0)
psiphonPanel/wxPsiphon.rc (+23/-0)
userlicense.txt (+39/-0)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 6
- Repository format:
- Bazaar pack repository format 1 (needs bzr 0.92)