summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reapply efc73bce24: moved it because the other paragraph is more importantfeature/15541-configure-additional-softwaresajolida2018-04-181-5/+5
* Reapply c905a47205: layout correctionssajolida2018-04-181-3/+3
* Reapply 071e47cbde: moved the comment to a better location, saving wordssajolida2018-04-181-6/+6
* Reapply 7b34fbe11f: add new optionsajolida2018-04-181-0/+3
* Reapply 08b9012b1d: not needed anymoresajolida2018-04-181-14/+0
* Reapply 588f4d3cc7: moved caution div to topsajolida2018-04-181-10/+10
* Reapply 6c0b939922: not needed anymoresajolida2018-04-181-4/+0
* Reapply f49b24ae61: not needed anymoresajolida2018-04-181-6/+0
* Reorder Additional Softwaresajolida2018-04-181-56/+57
* this options are not available anymoreemma peel2018-04-171-44/+0
* move dotfilesemma peel2018-04-171-44/+44
* remove gnome keyring paragraphemma peel2018-04-171-16/+0
* move pidginemma peel2018-04-171-19/+19
* move bitcoinemma peel2018-04-171-11/+11
* move thunderbirdemma peel2018-04-171-12/+12
* move printersemma peel2018-04-171-11/+11
* move network connectionsemma peel2018-04-171-15/+15
* move browser bookmarksemma peel2018-04-171-12/+12
* ASP: use && instead of ; between the two cp commandsAlan2018-04-151-1/+1
* ASP: fix import after moving code in tailslibAlan2018-04-051-3/+3
* ASP: import tailslib fixing an exception messageAlan2018-04-051-0/+0
* ASP: fix exit code on argument errorAlan2018-04-051-2/+2
* ASP: handle errors when reading config fileAlan2018-04-051-1/+13
* ASP: made clear that the data is synchronized on shutdownAlan2018-04-053-3/+3
* ASP: handle lack of persistence if configuration windowsAlan2018-04-052-2/+31
* ASP: move some generic code about persistence to tailslibAlan2018-04-052-26/+5
* Merge remote-tracking branch 'origin/devel' into feature/14594-asp-guibertagaz2018-03-31200-14048/+17817
|\
| * Merge branch 'stable' into develanonym2018-03-30200-14096/+17837
| |\
| | * Add dummy changelog entry for 3.7.anonym2018-03-301-0/+6
| | * Merge branch 'master' into stableanonym2018-03-30107-802/+2696
| | |\
| | | * Merge branch 'web/release-3.6.2'anonym2018-03-3068-13117/+14676
| | | |\
| | | | * releasing version 3.6.2anonym2018-03-3021-169/+1637
| | | | * Update IDF file for Tails Verification.anonym2018-03-301-3/+3
| | | | * Update upgrade-description files.anonym2018-03-3013-19/+136
| | | | * Merge remote-tracking branch 'origin/master' into web/release-3.6.2anonym2018-03-3026-310/+352
| | | | |\
| | | * | | Updating trace file after uploading 3.6.2.anonym2018-03-301-1/+1
| | | * | | spanish translation updates from weblateemma peel2018-03-3042-288/+510
| | | * | | Add incremental upgrades on the test channel for Tails 3.6.2anonym2018-03-304-11/+56
| | | | |/ | | | |/|
| | | * | updated PO filesamnesia2018-03-306-12/+138
| | | * | Press: add toggleable section for 2017 (refs: #15475).intrigeri2018-03-301-0/+10
| | | * | Merge remote-tracking branch 'xin/translate/misc21'intrigeri2018-03-3014-298/+159
| | | |\ \
| | | | * | [fr] update translationxin2018-03-292-19/+7
| | | | * | Merge branch 'master' of https://git-tails.immerda.ch/tails into translate/mi...xin2018-03-2959-273/+894
| | | | |\ \
| | | | * | | [fr] update translationxin2018-03-261-23/+8
| | | | * | | Merge branch 'master' of https://git-tails.immerda.ch/tails into translate/mi...xin2018-03-2667-554/+2802
| | | | |\ \ \
| | | | * | | | [fr] Update translationxin2018-03-2214-247/+144
| | | * | | | | ep127.0.0.12018-03-301-0/+1
| | | * | | | | Add UDF:s for emergency release Tails 3.6.2.anonym2018-03-294-0/+42
| | | * | | | | added discussion. ep.127.0.0.12018-03-291-0/+2
| | * | | | | | Release process: avoid `git push --tags`.anonym2018-03-291-3/+3
| | | |_|_|_|/ | | |/| | | |