summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Do not print "bridge" on the bridge lineHEADmasterMatthew Finkel2013-08-09
| | | | | | | | | | | | | | | | Vidalia does not need/want/ask that the bridge line start with "bridge". Users expect to be able to copy and paste what they see on their screen and that it will work. Presently, this is not the case. #5851 states that we print "bridge" so that users can easily copy and paste the line directly into their torrc, however most users do not do this, so we should not add this string. TorButton will preserve this functionality. This patch can be reverted if the functionality in TBB3.x is changed. (cherry picked from commit dcb2a2515e360310a31887260278ea146db1c4f7) Signed-off-by: Isis Lovecruft <isis@torproject.org> Edited-by: Isis Lovecruft <isis@torproject.org> Reason: Remove EOL whitespace from L193 and extra newline at L194.
* Merge remote-tracking branch 'sysrqb/bug9264_temporary_fix'Isis Lovecruft2013-08-09
|\
| * Temporary fix for duplicate bridge entriesMatthew Finkel2013-08-04
| | | | | | | | | | | | | | | | There exists a bug (somewhere) that causes some bridges to be added multiple times. The cause is currently unknown. This should prevent bridges from being added more than once, due to the way bridges are linked between the bridge descriptors and the extra-info descriptors. Temporary Bug fix for #9264.
* | Merge branch 'hotfix/5332-lib-gitignore'Isis Lovecruft2013-08-09
|\ \ | |/ |/|
| * Add cached-extrainfo files to .gitignore.Isis Lovecruft2013-08-09
| |
| * Change bridge-descriptors entry in .gitignore to fuzzy match filenames.Isis Lovecruft2013-08-09
| |
| * Add git mergetool backup and save files to the .gitignore.Isis Lovecruft2013-08-09
| |
| * Add pylint persistent report files to the .gitignore.Isis Lovecruft2013-08-09
| |
| * Add *.egg-info directories to the .gitignore.Isis Lovecruft2013-08-09
| |
| * Remove lib/ directory from .gitignore.Isis Lovecruft2013-08-07
|/
* Update the README with deployment instructions.Isis Lovecruft2013-07-24
| | | | | | | | | | | * CHANGED the README to markdown format. * ADD user friendly instructions at the top, so that anyone who is confused and looking for bridges or TBBs is pointed in the right direction. * ADD detailed maintainer instructions at the bottom, including sections on dependencies, using in a virtualenv, setup and configuration (this should probably still be updated more, as not all the the options in the testing CONFIG in lib/bridgedb/Main.py are in bridgedb.conf), enabling additional features, and running.
* Remove --install-prefix settings from setup.cfg.Isis Lovecruft2013-07-24
| | | | | * The default instructions in the README now say to use a virtualenv, and these are not compatible with that.
* Update requirements.txt file.Isis Lovecruft2013-07-24
| | | | | | | | | | | * ADD recaptcha package (this is needed in addition to recaptcha-client). * CHANGE BeautifulSoup, Babel, Mako, and MarkupSafe package specifications to specific versions which definitely work, and require only those those specific versions. (Older v2.x BeautifulSoup is a completely different library, for example, and debugging UnicodeDecodeErrors and fiddling with formatting everytime one of our dependency libraries upgrades doesn't sound like fun.)
* Add bridgedb key/db/descriptor/logs/etc files to .gitignore.Isis Lovecruft2013-07-24
|
* Add standard Python exclusions to the .gitignore.Isis Lovecruft2013-07-24
|
* More bridge pool assignment debug outputMatthew Finkel2013-07-11
| | | | Also more readable descriptor parser debug logging
* HMAC isn't a logger, don't pass it args as if it isMatthew Finkel2013-07-11
| | | | Bug fix on #9237. Bug introduced in c0ee0d54
* Scrub client information before loggingMatthew Finkel2013-07-09
|
* Moar logging in parsing codezMatthew Finkel2013-07-09
|
* Don't forget to close the extra-info descriptor fileMatthew Finkel2013-07-09
|
* Log more info during startup and after SIGHUPMatthew Finkel2013-07-09
|
* Add utility module with safe logging functions and new SAFELOGGING config optionMatthew Finkel2013-07-09
|
* Use fallback languagesaagbsn2013-06-27
|
* Fix missing import MimeWriteraagbsn2013-06-27
|
* Update URLs to point at PTTBBaagbsn2013-06-22
|
* Remove tabsaagbsn2013-06-22
|
* Use correct loglevel and skip inactive bridges.aagbsn2013-06-22
|
* Remove unused lineaagbsn2013-06-22
|
* Add fix suggested by sysrqb.aagbsn2013-06-21
| | | | See: https://trac.torproject.org/projects/tor/ticket/9109
* Add machine readable translationsaagbsn2013-06-20
|
* Add completed translations from Fri Jun 7 2013aagbsn2013-06-20
|
* Relocate templates and select lang from request headeraagbsn2013-05-28
|
* Add machine readable translationsaagbsn2013-05-28
|
* Add completed translations from Sun May 26 2013aagbsn2013-05-28
|
* Add a requirements.txt fileaagbsn2013-05-28
|
* Add tor.svg to assetsaagbsn2013-05-28
|
* Add template path to debug logaagbsn2013-05-28
|
* Fix circular import with setup.py dependenciesaagbsn2013-05-28
|
* Remove reference to I18n.pyaagbsn2013-05-28
|
* Update installation and translation instructionsaagbsn2013-05-28
|
* Use correct domain and file in setup.cfg for translationsaagbsn2013-05-28
|
* Remove Session Cookieaagbsn2013-03-27
|
* Fix tags in templatesaagbsn2013-03-27
| | | | * Remove extra </div> and <hr>
* Add URLs to Torprojectaagbsn2013-03-27
|
* Localize templates and configure babelaagbsn2013-03-27
| | | | | | | * Add gettext localization for template strings. * Add message_extractors to setup.py * Add babel command arguments to setup.cfg * Remove I18n.py
* Add CaptchaProtectedResourceaagbsn2013-03-27
| | | | | Wraps Resource objects with a CAPTCHA. Uses cookies with max_age 60.
* Make assets path absolute to site rootaagbsn2013-03-27
|
* Parametize captcha and bridges templatesaagbsn2013-03-27
|
* Add body to templateaagbsn2013-03-27
|
* Move templates into lib/bridgedbaagbsn2013-03-27
|