summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'wip/bugfix/12146-hybrid-with-xorriso' into ↵wip/bugfix/12146-hybrid-with-xorriso+syslinux-fixesintrigeri2017-05-261-1/+1
|\ | | | | | | wip/bugfix/12146-hybrid-with-xorriso+syslinux-fixes
| * Let xorriso hybrid the ISO image, instead of doing it ourselves (refs: #12146).wip/bugfix/12146-hybrid-with-xorrisointrigeri2017-05-261-1/+1
| |
* | Enable the bugfix-12146-syslinux-fixes APT overlay (refs: #12146).wip/bugfix/12146-syslinux-fixesintrigeri2017-05-261-0/+0
|/ | | | | | | | | | | Changes in that overlay: syslinux (3:6.03+dfsg-14.1+tails1) bugfix-12146-syslinux-fixes; urgency=medium * Cherry-pick 3 upstream commits that might fix isohybrid issues (refs: Tails#12146). -- intrigeri <intrigeri@boum.org> Fri, 26 May 2017 08:47:28 +0000
* Set base branch to testing.intrigeri2017-05-261-1/+1
|
* Adjust build system, release process and past calls for testing wrt. ↵intrigeri2017-05-269-17/+17
| | | | | | feature/stretch disappearing. refs: #12536
* Set base branch to devel.intrigeri2017-05-261-1/+1
|
* Update the pythonlib submodule: TODO++.intrigeri2017-05-261-0/+0
|
* Fix buggy merge conflict resolution.intrigeri2017-05-251-4/+0
|
* Revert "Revert everything but the changes on ikiwiki setup files"intrigeri2017-05-2515-17/+17
| | | | | | | This reverts commit 85f180eae81e694c55702196f6cbed2f6f798b2d. This should have been reverted on feature/stretch, as per: https://labs.riseup.net/code/issues/11962#note-15
* Merge remote-tracking branch 'origin/master' into feature/stretchintrigeri2017-05-2524-61/+96
|\
| * Merge remote-tracking branch ↵intrigeri2017-05-252-2/+2
| |\ | | | | | | | | | | | | | | | 'origin/feature/11962-update-install-and-upgrade-to-amd64-ikiwiki-setup' refs: #11962
| | * Merge remote-tracking branch 'origin/master' into ↵sajolida2017-05-252-28/+28
| | |\ | | | | | | | | | | | | feature/11962-update-install-and-upgrade-to-amd64-ikiwiki-setup
| | * | Revert everything but the changes on ikiwiki setup filessajolida2017-05-2515-17/+17
| | | | | | | | | | | | | | | | This reverts commit 466f954524201b7d4e22da071e60d27853bc6ea2.
| * | | Merge remote-tracking branch 'origin/master'sajolida2017-05-252-10/+12
| |\ \ \
| | * | | updated PO filesamnesia2017-05-252-10/+12
| | | | |
| * | | | Fix file namesajolida2017-05-251-1/+1
| | | | |
| * | | | Improve languagesajolida2017-05-251-2/+3
| | | | |
| * | | | Merge remote-tracking branch 'emmapeel/docs/12594-thunderbird-workaround'sajolida2017-05-251-3/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | layout correctionemma peel2017-05-251-1/+1
| | | | |
| | * | | less words and more linksemma peel2017-05-251-3/+3
| | | | |
| | * | | removing white spacesemma peel2017-05-251-3/+9
| | | | |
| * | | | Merge remote-tracking branch 'origin/master'sajolida2017-05-25249-35644/+45
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | added one ticket to discuss127.0.0.12017-05-251-0/+1
| | | | |
| | * | | Revert spam.intrigeri2017-05-251-7/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 82f2cdea08317d237aa2290ea5e4b1169f5d803b.
| | * | | (no commit message)127.0.0.12017-05-251-0/+7
| | | | |
| | * | | Revert spam.intrigeri2017-05-251-1/+377
| | | | | | | | | | | | | | | | | | | | This reverts commit 372658a29f271fc4e2abb97f6ee62aff4d59c531.
| | * | | What a video it is! In fact amazing and fastidious quality, please upload ↵127.0.0.12017-05-251-377/+1
| | |/ / | | | | | | | | | | | | more video clips having such good quality. Thanks. ddackcfdkfag
| | * | Revert spam.bertagaz2017-05-241-7/+0
| | | | | | | | | | | | | | | | This reverts commit d1a013fe2a8e1d4727c64490bc98c8c97bdce4a4.
| | * | Update reproducible builds blueprint vs. Jenkins.bertagaz2017-05-241-28/+27
| | | | | | | | | | | | | | | | Refs: #12409
| | * | (no commit message)127.0.0.12017-05-241-0/+7
| | | |
| | * | Revert spam.intrigeri2017-05-244-25/+374
| | | |
| | * | (no commit message)127.0.0.12017-05-241-0/+7
| | | |
| | * | (no commit message)127.0.0.12017-05-231-0/+7
| | | |
| | * | (no commit message)127.0.0.12017-05-231-0/+7
| | | |
| | * | (no commit message)127.0.0.12017-05-231-374/+4
| | | |
| * | | Style guide: startup optionssajolida2017-05-251-0/+8
| | | |
| * | | Rephrase known issuesajolida2017-05-251-4/+8
| | | |
| * | | Add data source for personassajolida2017-05-231-0/+3
| | | |
| * | | More notes on user testingsajolida2017-05-231-0/+7
| | | |
* | | | Merge remote-tracking branch 'origin/feature/stretch' into feature/stretchintrigeri2017-05-253-59/+32
|\ \ \ \
| * \ \ \ Merge branch 'doc/11110-software-properties-gtk' into feature/stretch ↵sajolida2017-05-252-58/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | (Closes: #11110)
| | * | | | The two dialogs have different titlessajolida2017-05-251-2/+2
| | | | | |
| | * | | | Fix typospriver2017-05-241-2/+2
| | | | | |
| | * | | | Document two alternative repositories configuration in parallelsajolida2017-05-221-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually, people on Stretch might still not have `software-properties-gtk` if they are running something else than GNOME for example.
| | * | | | Merge remote-tracking branch 'origin/feature/stretch' into ↵sajolida2017-05-22437-21203/+33960
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | doc/11110-software-properties-gtk
| | * | | | | Provide alternative sources on Jessie and Stretchsajolida2017-05-181-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that we already explain how to know the version of Debian at the earlier on the page.
| | * | | | | Merge remote-tracking branch 'spriver/doc/11110-software-properties-gtk' ↵sajolida2017-05-182-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into doc/11110-software-properties-gtk
| | | * | | | | Update Ubuntu version to the oldest supported onespriver2017-05-131-1/+1
| | | | | | | |
| | | * | | | | Complete APT linespriver2017-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's needed to specify deb at the beginning of the line, as the Add Source button will remain grey otherwise.
| | * | | | | | Merge branch 'feature/stretch' into doc/11110-software-properties-gtksajolida2017-05-18258-6233/+1748
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |