summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Test suite: flag Synaptic test as fragile (refs: #12586)."wip/test/12586-synaptic-test-is-fragileintrigeri2017-05-241-2/+1
* Test suite: flag Synaptic test as fragile (refs: #12586).intrigeri2017-05-241-1/+2
* Fix broken translatable strings.bertagaz2017-05-231-28/+0
* Fix translatable strings that make ikiwiki unhappy.bertagaz2017-05-231-29/+0
* Merge remote-tracking branch 'origin/bugfix/12565-reorder-features' into feat...intrigeri2017-05-231-1/+3
|\
| * Merge remote-tracking branch 'origin/feature/stretch' into bugfix/12565-reord...intrigeri2017-05-234-18/+41
| |\
| * | Merge branch 'feature/stretch' into bugfix/12565-reorder-featuresintrigeri2017-05-22428-20286/+33346
| * | Test suite: run emergency_shutdown.feature after usb_*.feature (refs: #12565).intrigeri2017-05-191-1/+3
* | | Drop duplicate strings that make ikiwiki unhappy.intrigeri2017-05-232-238/+0
* | | Fix broken merge conflict resolution.intrigeri2017-05-232-354/+0
* | | Revert "Translate both i386 and amd64 during the transition"sajolida2017-05-232-2/+2
* | | I think I deleted this file by mistake in 49bbeb076csajolida2017-05-231-0/+126
* | | Merge branch 'feature/11962-update-install-and-upgrade-to-amd64-ikiwiki-setup...sajolida2017-05-2357-6590/+239
|\ \ \
| * | | Translate both i386 and amd64 during the transitionsajolida2017-05-232-2/+2
| * | | Adapt release notes inline to the change to amd64sajolida2017-05-2317-19/+19
| * | | Don't make alpha & beta calls for testing translatable (Closes: #12584).intrigeri2017-05-2332-6455/+2
| * | | Merge remote-tracking branch 'origin/feature/11573-update-po_translatable_pag...intrigeri2017-05-23212-29151/+2
| |\ \ \
| | * | | Update po_translatable_pages for Tails 3.0 (Will-fix: #11573)sajolida2017-05-22212-29151/+2
| * | | | updated PO filesamnesia2017-05-235-12/+15
| |/ / /
| * | | Revert spamsajolida2017-05-221-4/+374
| * | | Revert spamsajolida2017-05-221-7/+0
| * | | Revert spamsajolida2017-05-221-7/+0
| * | | Revert spamsajolida2017-05-221-7/+0
| * | | Merge remote-tracking branch 'origin/master'sajolida2017-05-2224-469/+361
| |\ \ \
| | * | | (no commit message)127.0.0.12017-05-221-0/+7
| | * | | (no commit message)127.0.0.12017-05-221-0/+7
| | * | | (no commit message)127.0.0.12017-05-221-0/+7
| | * | | (no commit message)127.0.0.12017-05-221-374/+4
| | * | | Revert spam.intrigeri2017-05-211-7/+0
| | * | | Revert spam.intrigeri2017-05-211-2/+206
| | * | | releasing version 3.0~rc1anonym2017-05-213-0/+142
| | * | | Update upgrade-description files.anonym2017-05-218-77/+82
| | * | | Move UDF to the correct directory.anonym2017-05-202-0/+0
| | * | | Updating trace file after uploading 3.0~rc1.anonym2017-05-201-1/+1
| | * | | Add UDFs for 3.0~rc1 on the 'test' channel.anonym2017-05-206-0/+108
| | * | | Update calendar.anonym2017-05-191-17/+2
| | * | | This reverts commit fafeec2e12cd47564c429f4612061f90e472b788127.0.0.12017-05-191-206/+2
| | * | | This reverts commit a192732259683852641ce3a0f0bd77cb9376186d127.0.0.12017-05-191-0/+7
| * | | | Add CSS classsajolida2017-05-221-1/+1
| * | | | This is not a fixsajolida2017-05-221-1/+1
| * | | | Spell like upstream doessajolida2017-05-221-1/+1
| * | | | Merge remote-tracking branch 'emmapeel/doc/12457-workaround'sajolida2017-05-226-24/+30
| |\ \ \ \
| | * | | | changes to .po filesemma peel2017-04-275-20/+24
| | * | | | added workaround for #12457 to known issuesemma peel2017-04-271-0/+1
* | | | | | Merge remote-tracking branch 'origin/feature/11962-update-install-and-upgrade...intrigeri2017-05-2398-295/+826
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/feature/stretch' into feature/11962-upda...sajolida2017-05-22845-56084/+36033
| |\ \ \ \ \
| * | | | | | Update PO filessajolida2017-04-2611-225/+307
| * | | | | | Adapt release notes template to the change to amd64sajolida2017-04-261-1/+1
| * | | | | | Adapt install/mac/usb.mdwn to the change to amd64sajolida2017-04-266-9/+9
| * | | | | | Adapt stable_i386_version to the change to amd64sajolida2017-04-2626-79/+79