summaryrefslogtreecommitdiffstats
path: root/config/APT_overlays.d
Commit message (Collapse)AuthorAgeFilesLines
* Empty the list of APT overlays: they were mergedanonym2016-02-241-0/+0
|
* Enable the feature-6841-replace-vidalia APT overlay.intrigeri2016-02-151-0/+0
|
* Drop the feature-7756-reintroduce-whisperback APT overlay.intrigeri2015-08-111-0/+0
| | | | The package in there has been superseded by a newer one in feature-jessie.
* Merge remote-tracking branch 'origin/testing' into feature/jessieanonym2015-08-073-0/+0
|\ | | | | | | | | | | | | Conflicts: config/base_branch config/chroot_apt/preferences features/totem.feature
| * Empty the list of APT overlays: they were mergedintrigeri2015-08-055-0/+0
| |
| * Merge branch 'devel' into bugfix/8007-AppArmor-hardeningintrigeri2015-08-052-0/+0
| |\
| * \ Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardeninganonym2015-08-051-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: features/evince.feature features/images/TorBrowserUnableToOpen.png features/torified_browsing.feature features/totem.feature
| * \ \ Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardeningintrigeri2015-07-181-0/+0
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardeningintrigeri2015-07-091-0/+0
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardeningintrigeri2015-07-011-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into bugfix/8007-AppArmor-hardeningintrigeri2015-06-131-0/+0
| |\ \ \ \ \ \
| * | | | | | | Enable the bugfix-8007-apparmor-hardening APT overlay.intrigeri2015-06-061-0/+0
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/devel' into feature/jessieanonym2015-08-053-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: features/images/I2P_router_console.png features/images/TailsInstallerNoDevice.png features/images/TorBrowserAddressBar.png features/images/USBSuggestsInstall.png features/images/UnsafeBrowserAdvancedSettings.png features/images/UnsafeBrowserEditPreferences.png features/images/UnsafeBrowserProxyRefused.png features/images/UnsafeBrowserWindow.png features/step_definitions/unsafe_browser.rb
| * | | | | | | Merge remote-tracking branch 'origin/feature/9742-tor-0.2.6.10' into develanonym2015-08-051-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: debian/changelog Fix-committed: #9742
| | * | | | | | | Add the feature-9742-tor-0.2.6.10 APT overlay.intrigeri2015-08-031-0/+0
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/feature/8471-32-bit-UEFI' into develanonym2015-08-051-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | Fix-committed: #8471
| | * | | | | | | Merge remote-tracking branch 'origin/devel' into feature/8471-32-bit-UEFIintrigeri2015-07-071-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Add the feature-8471-32-bit-uefi APT overlay.intrigeri2015-07-021-0/+0
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Drop APT overlays that are obsoleted by the feature-installer-for-1.5 one.intrigeri2015-08-042-0/+0
| | | | | | | |
| * | | | | | | Merge branch 'feature/5623-Installer-should-refuse-empty-device' into ↵intrigeri2015-08-041-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/installer-for-1.5
| | * \ \ \ \ \ \ Merge branch 'devel' into feature/5623-Installer-should-refuse-empty-deviceintrigeri2015-07-091-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Fix APT overlay name.intrigeri2015-05-151-0/+0
| | | | | | | | |
| | * | | | | | | Add feature-5623-Installer-should-refuse-empty-device APT overlay.intrigeri2015-05-151-0/+0
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Add the feature-installer-for-1.5 APT overlay.intrigeri2015-08-041-0/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix-committed: #5623 Fix-committed: #9886
* | | | | | | Merge branch 'devel' into feature/jessieintrigeri2015-07-181-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: features/step_definitions/usb.rb features/usb_install.feature
| * | | | | | Add the feature-9130-tails-installer-notify-on-smal-device APT overlay.intrigeri2015-07-091-0/+0
| | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/feature/9381-ship-amd64-syslinux' into ↵Alan2015-07-051-0/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | devel fix-committed: #9381, thanks!
* | | | | | Drop the feature-9381-ship-amd64-syslinux APT overlay: we have a newer ↵intrigeri2015-07-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | syslinux package in feature-jessie.
* | | | | | Drop obsolete APT overlay.intrigeri2015-07-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | A newer package has been uploaded to feature-jessie.
* | | | | | Add feature-8980-gtk3-installer APT overlay.intrigeri2015-07-041-0/+0
| | | | | |
* | | | | | Merge branch 'feature/9381-ship-amd64-syslinux' into feature/jessieintrigeri2015-07-041-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Enable the feature-9381-ship-amd64-syslinux APT overlay.intrigeri2015-06-121-0/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | It simply imports our current syslinux version, for amd64 too. Refs: #9381
* | | | | Merge branch 'devel' into feature/jessieintrigeri2015-06-291-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: features/images/UnsafeBrowserStopNotification.png
| * | | | Empty the list of APT overlays: they were mergedintrigeri2015-06-291-0/+0
| | | | |
| * | | | Merge branch 'feature/9560-tor-0.2.6.9' into stableintrigeri2015-06-291-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Fix-committed: #9560
| | * | | | Add the feature/9560-tor-0.2.6.9 APT overlay.intrigeri2015-06-151-0/+0
| | |/ / /
| * | | | Empty the list of APT overlays: they were mergedintrigeri2015-06-291-0/+0
| |/ / /
* | | | Merge remote-tracking branch 'origin/devel' into feature/jessieanonym2015-06-121-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: features/step_definitions/erase_memory.rb wiki/src/contribute/design/Time_syncing.mdwn
| * | | Add the bugfix-7249-truncated-notifications APT overlay.intrigeri2015-05-311-0/+0
| |/ /
* | | Add the feature-7756-reintroduce-whisperback APT overlay.intrigeri2015-05-161-0/+0
|/ / | | | | | | Refs: #7756
* | Empty the list of APT overlays: they were mergedanonym2015-05-024-0/+0
| |
* | Merge remote-tracking branch 'origin/devel' into feature/8925-tor-0.2.6intrigeri2015-04-302-0/+0
|\ \
| * \ Merge remote-tracking branch 'origin/bugfix/9044-syslinux-on-chromebooks' ↵anonym2015-04-281-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | into devel Fix-committed: #9044
| | * | Merge branch 'feature/8654-encode-apt-suite-in-git-with-APT-overlays-dot-d' ↵intrigeri2015-04-081-0/+0
| | |/ | | | | | | | | | | | | | | | | | | into bugfix/9044-syslinux-on-chromebooks Conflicts: config/APT_overlays
| * | Enable the feature-9229-install-i2p-0.9.19 APT overlay.anonym2015-04-151-0/+0
| | |
* | | Disable the feature-8925-tor-0.2.6 APT overlay.anonym2015-04-281-0/+0
| | | | | | | | | | | | | | | It's superseded by the feature-9114-tor-with-bug15482.patch APT overlay which installs a patched 0.2.6.x.
* | | Enable the feature-9114-tor-with-bug15482.patch APT overlay.anonym2015-04-281-0/+0
| | |
* | | Merge remote-tracking branch 'origin/stable' into ↵anonym2015-04-271-0/+0
|\ \ \ | |/ / | | | | | | feature/9114-tor-with-bug15482.patch
| * | Enable the bugfix-9190-localize-tails-upgrader APT overlay.intrigeri2015-04-081-0/+0
| |/
* | Adjust to new APT_overlays.d scheme.intrigeri2015-04-091-0/+0
|/