summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge branch 'fix/3573-robots-txt' into developIsis Lovecruft2013-10-14
|\ \
| * | Add a text file for robots.Isis Lovecruft2013-10-13
|/ /
* | Merge branch 'feature/9959-pas-danglais' into developIsis Lovecruft2013-10-13
|\ \
| * | Update completed translation files after running update_catalog.Isis Lovecruft2013-10-11
| | |
| * | For some reason, English is now considered a translation.Isis Lovecruft2013-10-11
| | | | | | | | | | | | | | | | | | | | | It seems that BridgeDB won't answer a request until it knows what language to answer in. If English is the first language, and there aren't English translations in the i18n/ directory, it jumps to the next non-English language. Don't ask.
| * | Add script for automatically pulling in and compiling translation updates.Isis Lovecruft2013-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ADD maint/get-completed-translations script for pulling in the 'bridgedb_completed' branch from the translations repo. At the end of the script there is the option to automatically run "python setup.py compile_catalog" to recompile the newly merged translations; this option times out after 15 seconds, so this is safe to run in an automated environment. * ADD "make translations" command to the Makefile, this will run the maint/get-completed-translations script.
| * | Remove old compiled translations.Isis Lovecruft2013-10-11
| | | | | | | | | | | | This shouldn't have been committed anyway.
| * | Add completed kn/…/.po translation file from translations repo.Isis Lovecruft2013-10-11
| | |
| * | Add completed hu/…/.po translation file from translations repo.Isis Lovecruft2013-10-11
| | |
| * | Update completed pt/…/.po translation file from translations repo.Isis Lovecruft2013-10-11
| | |
| * | Update completed fr/…/.po translation file from translations repo.Isis Lovecruft2013-10-11
| | |
| * | Update setup.py to exclude .po files from installs; update crunchbang.Isis Lovecruft2013-10-11
|/ / | | | | | | | | | | | | | | * ADD exclude_package_data directive to setuptools.setup() call, to exclude all .po files from being installed. * FIX the crunchbang in setup.py to respect the environment and save the whales and all that. * UPDATE the copyright/authors/license header. I hear it's not 2007 anymore.
* | Move generatedescriptors.py → scripts/gen_bridge_descriptors.Isis Lovecruft2013-10-11
| | | | | | | | | | * ADD scripts/gen_bridge_descriptors to setup.py so that the crunchbang is appropriately rewritten upon installation.
* | Update the dependencies in the README.Isis Lovecruft2013-10-11
| | | | | | | | Thanks to mrphs for pointing out on IRC that python-dev was missing.
* | Add 'reinstall' directive to the Makefile.Isis Lovecruft2013-10-11
| |
* | Add a .DEFAULT to the Makefile.Isis Lovecruft2013-10-11
| |
* | Merge branch 'feature/9937-desc-gen-r1' into develop.Isis Lovecruft2013-10-11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'feature/9937-desc-gen-r1' branch is actually the entirety of a separate repo, https://github.com/sysrqb/tdgen from the master branch. It was merged by doing: $ git clone https://github.com/sysrqb/tdgen && cd tdgen $ cd ../bridgedb $ git checkout -b feature/9937-desc-gen develop $ git remote add tdgen ../tdgen $ git fetch tdgen $ git merge -S --no-ff tdgen/master
| * | Rewrite/refactor descriptor generator codeMatthew Finkel2013-10-11
| | | | | | | | | | | | It should be better this way.
| * | Initial commitMatthew Finkel2013-10-11
|/ /
* | Add a unittest runner to scripts/bridgedb.Isis Lovecruft2013-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ADD commands 'test' and 'coverage' to scripts/bridgedb. To run twisted.trial based unittests, after BridgeDB has been installed, do: $ bridgedb test and to run the same tests under python-coverage, do: $ bridgedb coverage * ADD dependencies for unittests and coverage: - coverage - trialcoverage - sure * FIXES #9872
* | Fix the crunchbang in scripts/bridgedb to respect the environment.Isis Lovecruft2013-10-03
| | | | | | | | * This should also help save the whales.
* | Bump the pygeoip version.Isis Lovecruft2013-10-03
| |
* | Remove deprecated distribute dependency.Isis Lovecruft2013-10-03
| |
* | Bump the Twisted version.Isis Lovecruft2013-10-03
| |
* | Add zip_safe=False flag to setup.py for access to data files and templates.Isis Lovecruft2013-10-03
| |
* | Add 'tests' and dependencies to extras_require in setup.py.Isis Lovecruft2013-10-03
| |
* | Add more documentation about how to use the automatic versioning.Isis Lovecruft2013-10-03
| |
* | Select language and language direction based on order in headerMatthew Finkel2013-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | We guess which language gettext will choose by iterating over the languages in the Language header and selecting the first one we support. We assume a user will prioritize languages in their browser. We then render the page using the selected language, or English if it is no available. Bug fix on #9157. (cherry picked from commit a31c592eadd72a659f22497f66e77fb90c6c207b) Signed-off-by: Isis Lovecruft <isis@torproject.org> Taken from branch 'sysrqb/bug9157_r2_rebased'.
* | Add maintainer instructions to README for now.Isis Lovecruft2013-08-20
| | | | | | | | | | | | | | | | | | * TODO We need a separate place (and preferably git repo for maintainer docs, scripts, etc.). I've started putting these things in maint/ in the top-level of bridgedb.git, but since I think that service maintainance should be kept separate from the software maintainance, I haven't committed them yet. That said, here are the instructions for bumping versions, for lack of a better place to put them.
* | Merge branch 'master' into developIsis Lovecruft2013-08-20
|\ \ | |/
| * Merge branch 'release-0.0.1'Isis Lovecruft2013-08-20
| |\ | |/ |/|
* | Add extra data_files to setup.py installations without MANIFEST.in.bridgedb-0.0.1Isis Lovecruft2013-08-20
| |
* | Change/Move file lib/TorBridgeDB.py to scripts/bridgedb.Isis Lovecruft2013-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't actually a module, it's a two-line script. Installing it as a script is better, because: 1) We don't need to do `python -m TorBridgeDB […]`. Instead, we just do `bridgedb […]` and we also get all the benefits of shell autocompletion. 2) Setuptools will automatically replace the #! in the installed script to point to the location of the Python interpreter which was used to install it, making it work with alternate interpreters as well as within virtualenvs. * MOVE lib/TorBridgeDB.py → scripts/bridgedb. * ADD 'scripts' arguments to setuptools.setup() call. * UPDATE the README with instructions on how to run bridgedb now.
* | Add automatic installation of dependencies to setup.py.Isis Lovecruft2013-08-19
| | | | | | | | | | | | | | | | * ADD function get_requirements() to setup.py file, for parsing the requirements.txt file and installing the dependencies specified there. This allows us to keep one place for keeping track of dependencies, regardless of whether we are installed from a source distribution (git or a tarball) or with pip.
* | Start using automatic versioning system.Isis Lovecruft2013-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * FIXES part of #9425 (Create and document a better BridgeDB deployment strategy). * ADD versioneer.py to the top level of the project. * USE setuptools explicitly in setup.py, which will also make the project a bit more py3k compatible. * ADD maintainer and maintainer_email fields to setup.py setup() call (with my contact info). * ADD versioneer setup variables and calls to setup.py. Versioneer, as currently configured, will automatically create a package level attribute: >>> import bridgedb >>> print bridgedb.__version__ 0.0.1 Bumping the version number at release time (which, for BridgeDB really means deploy time, as of right now) means doing the following: $ git checkout develop [merge some fix/bug/feature/etc branches] $ git checkout -b release-0.0.2 develop $ git tag -a -s bridgedb-0.0.2 [pip maintainance commands *would* go here, if we ever have any] $ git checkout master $ git merge -S --no-ff release-0.0.2 $ git checkout develop $ git merge -S --no-ff master $ git push <remote> master develop And be sure not to forget to do: $ git push --tags If the currently installed version is *not* from one of the signed tags, the version number attribute created by versioneer will be the short ID of the git commit from which the installation took place, prefixed with the most recent tagged release at that point, i.e.: >>> import bridgedb >>> bridgedb.__version__ 0.0.1-git528ff30c
* | Remove unused distutils import from setup.py.Isis Lovecruft2013-08-19
| |
* | Add uninstall directive to the Makefile.Isis Lovecruft2013-08-19
| |
* | Change Makefile install directive to record where the files were installed.Isis Lovecruft2013-08-19
| |
* | Add .PHONY directive to the Makefile.Isis Lovecruft2013-08-19
| |
* | Also remove the "bridge" prefix from returned pluggable transport lines.Isis Lovecruft2013-08-12
| |
* | Move README.md → README so that it gets included in packages by setuptools.Isis Lovecruft2013-08-12
| | | | | | | | | | | | | | | | * CHANGE the "Translations" section to accurately reflect required steps for updateing .pot files with strings which are newly added to BridgeDB's source code, as well as instructions for getting finished translations from gitweb.torproject.org/translations.git. * FIX a couple typos in the README.
* | Merge branch 'fix/update-translations' into developIsis Lovecruft2013-08-12
|\ \ | |/ |/|
| * Add compiled translation files. Currently supported languages are:Isis Lovecruft2013-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ar] العربية * [da] dansk * [de] Deutsch * [el] ελληνικά * [en] English * [es] español * [eu] euskera * [fa] فارسی * [fr] français * [gl] galego * [he] עברית * [hr_HR] hrvatski jezik * [it] italiano * [ja] 日本語 * [lv] latviešu valoda * [ms_MY] بهاس ملايو * [nb] Norsk bokmål * [nl] Nederlands * [pl] język polski * [pt_BR] português * [ru] русский язык * [si_LK] \u0dc3\u0dd2\u0d82\u0dc4\u0dbd * [sv] Svenska * [th] ไทย * [tr] Türkçe * [zh_CN] 中文 ♥ ♥ ♥ to all our translators.
| * Remove compiled components of the .po files removed in the last commit.Isis Lovecruft2013-08-12
| | | | | | | | | | | | | | The strings have changed so much due to the new web interface design that it is useless to keep the old versions around because they only map to ~20% of the strings. Not entirely sure how this is done, but I thought it made the most sense to only include translations which are 100% complete.
| * Remove old .po catalogues whose replacements are still incomplete.Isis Lovecruft2013-08-12
| |
| * Update i18n/ with completed .po catalogues from translations repo.Isis Lovecruft2013-08-12
|/
* Do not print "bridge" on the bridge lineMatthew 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
|\ \ | |/ |/|