Commit 1c751da4 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/master' into web/15968-donation-banner

parents 60f8ecb2 795ab4ca
......@@ -407,7 +407,7 @@ end
Given /^the Tor Browser loads the (startup page|Tails homepage|Tails roadmap)$/ do |page|
case page
when "startup page"
title = 'Tails - News'
title = 'Tails'
when "Tails homepage"
title = 'Tails - Privacy for anyone anywhere'
when "Tails roadmap"
......
......@@ -28,3 +28,7 @@ Feel free to add any relevant issue to this list.
* [[!gnome_gitlab gdm/issues/251 desc="screensaver doesn't lock with password prompt if password was just set"]]
* [[!gnome_gitlab gtk/issues/1211 desc="Cursor stays in wait status for some seconds after calling `gtk_show_uri_on_window`"]]
* [[!gnome_gitlab seahorse/issues/177 desc="Seahorse: Please support finding remote OpenPGP keys by fingerprint"]]
* [[!gnome_gitlab seahorse/issues/47 desc="Seahorse: Please support HKP over TLS"]]
* [[!gnome_gitlab seahorse-nautilus/issues/1 desc="seahorse-nautilus: non-ISO-C and non-deprecated-API warnings"]]
* [[!gnome_gitlab seahorse-nautilus/issues/4 desc="seahorse-nautilus: does not or only partially import keys"]]
* [[!gnome_gitlab seahorse/issues/22 desc="Seahorse: cannot Import Public SSH Keys"]]
......@@ -44,7 +44,7 @@ Was migrated to Python3 in Tails 2.6: [[!tails_ticket 10083]]
## ~~config/chroot_local-includes/usr/local/sbin/tails-additional-software~~
Was migrated to Python3 as part of [[!tails_ticket 15198]] in [[https://labs.riseup.net/code/projects/tails/repository/revisions/2abe4abbf69f5c6cde80de6bcc3134734860ca13]]: [[!tails_ticket 15067]]
Was migrated to Python3 as part of [[!tails_ticket 15198]] in <https://labs.riseup.net/code/projects/tails/repository/revisions/2abe4abbf69f5c6cde80de6bcc3134734860ca13>: [[!tails_ticket 15067]]
* `posix1e`: OK, `python3-pylibacl`
......
......@@ -16,14 +16,22 @@ All times are referenced to Berlin and Paris time.
* 2018-10-15: 14:00: Additional Software meeting (wrap up)
* 2018-10-16: 14:00: USB Image meeting
* 2018-10-22: Build and upload tentative 3.10 ISO image — kibi
* 2018-10-23: Test and **release 3.10** (Firefox 60.3, bugfix release) — kibi is the RM
* 2018-11-05: 10:00: USB Image meeting
* 2018-11-06, 19:00: [[Contributors meeting|contribute/meetings]]
* 2018-11-20: 10:00: USB Image meeting
* 2018-12-03, 19:00: [[Contributors meeting|contribute/meetings]]
* 2018-12-04: 10:00: USB Image meeting
* 2018-12-11: **Release 3.11** (Firefox 60.4, bugfix release)
## 2019Q1
......
[[!meta title="October 2018 online meeting"]]
[[!toc levels=2]]
# Meta
- Attendees: segfault (facilitator), emmapeel, masha, pablonatalino, anonym, lamby, drwhax, spriver, moire, muri (notetaker)
- [[Logs|201810/logs.txt]]
# Volunteers to handle "Hole in the roof" tickets this month
- no volunteers for any of the tickets
# Volunteers to handle important tickets flagged for next release, but without assignee
- there was only one ticket, which should have been assigned to segfault
# Availability and plans until the next meeting
- masha: almost none, when not on shift
- segfault: will finish the last tickets for the VeraCrypt work, continue working on FT stuff, and probably already start with their USB image tickets
- spriver: availability: quite much, plans: none yet, but let's see
- muri: available for small tasks, wants to take another look at building tails in gitlab-runner and another look at webliate
- lambys most-pressing concern is [[!tails_ticket 15349 desc="Migrate away from
vmdebootstrap"]] although they would also like to close-up/resolve
[[!tails_ticket 15187 desc="fontconfig cache is not reproducible on Buster"]]
as it's been a while; then they will move onto [[!tails_ticket 15460 desc="Test suite broken with Java 9+"]]
- emmapeel: wants to check the locales, as there have been problems on the release
- moire: will be working on the fundraising campaign
# Important missing bits in the next monthly report
- nothing at the moment, the deadline is the 10th of october
(07:06:14 PM) segfault: OK then, welcome to the monthly meeting
(07:06:29 PM) segfault: the agenda is here: https://tails.boum.org/blueprint/monthly_meeting/
(07:06:38 PM) segfault: we start with "Volunteers to handle "Hole in the roof" tickets this month"
(07:07:07 PM) segfault: I won't take any this month
(07:07:15 PM) spriver: me neither
(07:07:28 PM) masha: me neither
(07:07:33 PM) anonym: I have a "zero commitments" policy still
(07:07:52 PM) lamby: (anonym! hey!!)
(07:08:01 PM) muri-pidgin: i won't take any roof-holes
(07:08:20 PM) lamby: Nor I; I need to push on with my currently plated tickets alas..
(07:08:27 PM) nodens left the room.
(07:08:29 PM) anonym: lamby: (hi!)
(07:08:49 PM) lamby: Hm, the haveged issue.. I shared that with a few folks in Debian and there was a discussion. I can't find it right now alas.
(07:09:00 PM) lamby: (#7102)
(07:09:00 PM) Tailsbot: Tails ☺ Feature #7102: Evaluate how safe haveged is in a virtualized environment - Tails - RiseupLabs Code Repository https://labs.riseup.net/code/issues/7102
(07:10:23 PM) drwhax: there's multiple cryptographers who don't like userspace RNG tools, among them, tqbf, who has quite the opinion on this.
(07:10:36 PM) pablonatalino left the room (Disconnected: closed).
(07:10:52 PM) masha: so next?
(07:11:04 PM) pablonatalino entered the room.
(07:11:35 PM) segfault: next is "Volunteers to handle important tickets flagged for next release, but without assignee", but I fail to create the query for that
(07:11:47 PM) masha: won't take any :)
(07:12:01 PM) spriver: me neither
(07:12:04 PM) segfault: (I can't filter for Target Version, there are non to choose from)
(07:14:22 PM) segfault: OK, I think this is the query: https://labs.riseup.net/code/projects/tails/issues?utf8=%E2%9C%93&set_filter=1&f%5B%5D=status_id&op%5Bstatus_id%5D=%3D&v%5Bstatus_id%5D%5B%5D=1&v%5Bstatus_id%5D%5B%5D=9&v%5Bstatus_id%5D%5B%5D=7&f%5B%5D=fixed_version_id&op%5Bfixed_version_id%5D=%3D&v%5Bfixed_version_id%5D%5B%5D=308&f%5B%5D=assigned_to_id&op%5Bassigned_to_id%5D=%21*&f%5B%5D=&c%5B%5D=tracker&c%5B%5D=status&c%5B%5D=priority&c%5B%5D=subject&c%5B%5D=author&c%5B%5D=assigned_to&c%5B%5D=updated_on&c%5B%5D=cf_9&group_by=&t%5B%5D=
(07:14:25 PM) drwhax: anonym: I got an ISO!!!!
(07:14:33 PM) segfault: there is only one ticket, and that should be assigned to me actually
(07:14:38 PM) masha: ahah
(07:14:40 PM) masha: sorry
(07:14:42 PM) segfault: so next topic
(07:14:55 PM) segfault: Availability and plans until the next meeting
(07:15:28 PM) moire entered the room.
(07:15:30 PM) masha: almost none when not on shift
(07:15:36 PM) anonym: does not apply to me, yet
(07:15:41 PM) segfault: I will finish the last tickets for the VeraCrypt work, continue working on FT stuff, and probably already start with my USB image tickets
(07:15:45 PM) spriver: availability: quite much, plans: none yet, but let's see
(07:15:57 PM) pablonatalino left the room (Disconnected: closed).
(07:16:01 PM) drwhax: anonym: I got the same SHAAAAAAAAAAA
(07:16:13 PM) muri-pidgin: i'm available for very small tasks. i plan to take up the work i did on trying to build tails using gitlab-runner
(07:16:27 PM) drwhax: mine availability: none, i'm packed with too much other stuff.
(07:16:44 PM) anonym: drwhax: compared to which sha? (just double-checking)
(07:16:50 PM) masha: (emma: can I steal some of your flagged test?)
(07:17:06 PM) pablonatalino entered the room.
(07:17:16 PM) drwhax: anonym: compared to the iso I downloaded from dl.amnesia.boum.org, where I checked the sig and performed a sha1sum on.
(07:17:23 PM) emmapeel: masha: please go ahead and steal them all
(07:17:40 PM) anonym: (sorry for mixing in Tails 3.9.1 release work in the meeting)
(07:17:55 PM) drwhax: yes, sorry.
(07:18:01 PM) masha: (emmapeel: ok)
(07:18:25 PM) segfault: anyone else wants to write about their plans and availability?
(07:18:31 PM) lamby: My most-pressing concern is #15349 although I would also like to close-up/resolve #15187 as it's been a while (!).
(07:18:32 PM) Tailsbot: Tails ☺ Bug #15349: Migrate away from vmdebootstrap https://labs.riseup.net/code/issues/15349
(07:18:33 PM) Tailsbot: Tails ☺ Bug #15187: fontconfig cache is not reproducible on Buster https://labs.riseup.net/code/issues/15187
(07:18:38 PM) emmapeel: only thing i have in mind is checking the locales etc
(07:18:58 PM) emmapeel: specially for the new strings... there were some problems on the release
(07:19:06 PM) anonym: lamby: hah hah fontconfig again!
(07:19:08 PM) lamby: .. then I will move onto #15460. I have some Thunderbird/Javascript related tickets assigned to me but they are actually on hold.
(07:19:09 PM) Tailsbot: Tails ☺ Bug #15460: Test suite broken with Java 9+ https://labs.riseup.net/code/issues/15460
(07:19:14 PM) lamby: anonym: Yeah!
(07:19:20 PM) emmapeel: also i will help the italians to get up to speed on weblate
(07:19:49 PM) anonym: lamby: oooh! I will greatly appreciate a fix for #15460!
(07:20:07 PM) muri-pidgin: ah, i'll also try to take another look at weblate
(07:20:29 PM) moire: Next week, I'll be working on the fundraising campaign
(07:20:32 PM) lamby: anonym: Same. Less-urgent than the vmdeboostrap issue as vmdeboostrap is pending removal from Debian (!)
(07:22:11 PM) lamby: (nothing more from me on this)
(07:22:14 PM) segfault: If everyone wrote their plans, the next topic is "Important missing bits in the next monthly report"
(07:22:30 PM) segfault: coordinator is u
(07:22:49 PM) anonym: who left
(07:23:17 PM) segfault: the draft looks empty: https://tails.boum.org/blueprint/monthly_report/report_2018_10/
(07:23:30 PM) segfault: so please add your stuff if you have anything to report
(07:23:48 PM) muri-pidgin: isn't salolida the coordinator? sajolida sent a mail about the deadline being oct 10
(07:24:12 PM) segfault: I don't think I personally have anything to report, but I will check once I finished my bits for the SponsorW (VeraCrypt) report
(07:24:31 PM) segfault: https://tails.boum.org/blueprint/monthly_report/ says it's u for October
(07:24:49 PM) muri-pidgin: yeah, but its the report about september i think
(07:24:57 PM) emmapeel: September 2018: sajolida
(07:24:58 PM) segfault: oh yeah you're right
(07:25:31 PM) emmapeel: maybe i can add stuff about the tor meeting, even if it happened between the 29th and the 03
(07:25:56 PM) segfault: the September report draft: https://tails.boum.org/blueprint/monthly_report/report_2018_09/
(07:26:41 PM) segfault: and that's the last topic. The only discussion topic we skip because sajolida isn't here, who wanted to prepare it
(07:26:48 PM) emmapeel: pablonatalino fished a lot of content for the last report!!
(07:27:14 PM) emmapeel: pablonatalino: do you plan on doing more of that for next report? like the topics, etc....
(07:27:46 PM) pablonatalino: yes, i can help, but no alone
(07:28:24 PM) emmapeel: no, we can do like last time.... i can sort out the links and stuff but you can do the content edition :D
(07:28:36 PM) pablonatalino: ;)
(07:29:11 PM) muri-pidgin: so, i think we can wrap up the meeting?
(07:29:28 PM) segfault: yeah, if no one else wants to say something about the report, the meeting is finished
......@@ -37,7 +37,7 @@ commit all files that need to be:
perl -pi -E 's,^Version [0-9.]+,Version $ENV{VERSION},' bin/tails-persistence-setup && \
perl -pi -E "s,^our \\\$VERSION = '[0-9.]+';\$,our \\\$VERSION = '$VERSION';," bin/tails-persistence-setup && \
git commit bin/tails-persistence-setup -m "tails-persistent-setup $VERSION"
git commit bin/tails-persistence-setup -m "tails-persistence-setup $VERSION"
Optionally, run the upstream test suite (it is run as part of the
Debian package build later, but running it early may avoid publishing
......@@ -53,7 +53,7 @@ Build an upstream tarball, tag the release, move the tarball out of
the build repository and cleanup:
dzil build && \
git tag -s $VERSION -m "tails-persistent-setup $VERSION" && \
git tag -s $VERSION -m "tails-persistence-setup $VERSION" && \
mv Tails-Persistence-*.tar.gz .. && \
rm -rf Tails-Persistence-* .build po/*.mo
......
......@@ -8,8 +8,6 @@ Everything in this report is public.
# A. VeraCrypt support in GNOME
## A.3 Write automated tests
## A.6 Add VeraCrypt support to GNOME Files
These upstream merge requests were merged:
......@@ -28,30 +26,28 @@ These are still waiting for review:
## A.9 Fix bugs and UX issues
We investigated and fixed a bug with VeraCrypt volumes which use multiple encryption in udisks:
<https://github.com/storaged-project/udisks/pull/582>
We fixed 2 bugs:
and backported the patch to the udisks version we use in Tails ([[!tails_ticket 15239]]).
- Unlocking VeraCrypt volumes which use multiple encryption in udisks:
We fixed a bug which caused VeraCrypt volumes not being automatically opened in Nautilus after unlocking them ([[!tails_ticket 15954]]).
<https://github.com/storaged-project/udisks/pull/582>
## A.10 Port to the latest version of GNOME
- VeraCrypt volumes not being automatically opened in Nautilus after unlocking them. ([[!tails_ticket 15954]])
# B. Additional software
## B.2 Write technical design documentation
## B.3 Write automated tests
We wrote a number of automated tests to ensure we notice important
regressions in the _VeraCrypt_ support introduced in Tails 3.9.
We have specified the [high-level behavior in
Gherkin](https://gitlab.com/Tails/tails/blob/test/14471-veracrypt/features/veracrypt.feature)
then implemented the corresponding steps. All this work is now pending
our internal code review and should be merged by the end of October
then implemented the corresponding steps.
All this work is now pending
our internal code review and should be merged by the end of October.
([[!tails_ticket 14471]], [[!tails_ticket 14469]], [[!tails_ticket
15238]], [[!tails_ticket 15239]]).
15238]], [[!tails_ticket 15239]])
## B.8 Fix bugs and UX issues
......@@ -64,6 +60,10 @@ our internal code review and should be merged by the end of October
## C.1 Major release including objective A
Our VeraCrypt support in GNOME was released in [[Tails
3.9|news/version_3.9]] on September 4.
## C.2 Major release including objective B
## C.4 Server hardware
The new Additional Software feature was released in [[Tails
3.9|news/version_3.9]] on September 4.
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-09-20 17:54+0200\n"
"POT-Creation-Date: 2018-10-11 21:27+0200\n"
"PO-Revision-Date: 2018-04-07 21:36+0200\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
......@@ -80,10 +80,13 @@ msgstr "Einkommensaufstellung für 2016\n"
msgid ""
"\tRevenues:\n"
"\t- Donations\n"
"\t $24579.15 via RiseupLabs\n"
"\t $23579.15 via RiseupLabs\n"
"\t 8246.82€ via CCT\n"
"\t 2045.81€ cash\n"
"\t 24.43Ƀ bitcoins\n"
"\t 24.33Ƀ bitcoins\n"
"\t- Partners:\n"
"\t $1000.00 ExpressVPN\n"
"\t 0.10Ƀ I2P\n"
"\t- Restricted funds (sponsor deliverables)\n"
"\t 11000.00€ Lush\n"
"\t- T-shirts\n"
......@@ -270,7 +273,7 @@ msgid ""
"\t $208000.00 Open Technology Fund\n"
"\t $77000.00 Mozilla Open Source Support\n"
"\t $5000.00 Google Summer of Code\n"
"\t- Sponsors\n"
"\t- Partners\n"
"\t 2000.00€ Mediapart\n"
"\t- T-shirts\n"
"\t 180.47€ T-shirts\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-09-20 17:54+0200\n"
"POT-Creation-Date: 2018-10-11 21:27+0200\n"
"PO-Revision-Date: 2018-01-30 20:45+0000\n"
"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
......@@ -82,10 +82,13 @@ msgstr "Declaración de ganancias para 2016\n"
msgid ""
"\tRevenues:\n"
"\t- Donations\n"
"\t $24579.15 via RiseupLabs\n"
"\t $23579.15 via RiseupLabs\n"
"\t 8246.82€ via CCT\n"
"\t 2045.81€ cash\n"
"\t 24.43Ƀ bitcoins\n"
"\t 24.33Ƀ bitcoins\n"
"\t- Partners:\n"
"\t $1000.00 ExpressVPN\n"
"\t 0.10Ƀ I2P\n"
"\t- Restricted funds (sponsor deliverables)\n"
"\t 11000.00€ Lush\n"
"\t- T-shirts\n"
......@@ -272,7 +275,7 @@ msgid ""
"\t $208000.00 Open Technology Fund\n"
"\t $77000.00 Mozilla Open Source Support\n"
"\t $5000.00 Google Summer of Code\n"
"\t- Sponsors\n"
"\t- Partners\n"
"\t 2000.00€ Mediapart\n"
"\t- T-shirts\n"
"\t 180.47€ T-shirts\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-09-20 17:54+0200\n"
"POT-Creation-Date: 2018-10-11 21:27+0200\n"
"PO-Revision-Date: 2015-10-16 13:18+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/finances/"
......@@ -84,10 +84,13 @@ msgstr "بیلان مالی سال ۲۰۱۴\n"
msgid ""
"\tRevenues:\n"
"\t- Donations\n"
"\t $24579.15 via RiseupLabs\n"
"\t $23579.15 via RiseupLabs\n"
"\t 8246.82€ via CCT\n"
"\t 2045.81€ cash\n"
"\t 24.43Ƀ bitcoins\n"
"\t 24.33Ƀ bitcoins\n"
"\t- Partners:\n"
"\t $1000.00 ExpressVPN\n"
"\t 0.10Ƀ I2P\n"
"\t- Restricted funds (sponsor deliverables)\n"
"\t 11000.00€ Lush\n"
"\t- T-shirts\n"
......@@ -277,7 +280,7 @@ msgid ""
"\t $208000.00 Open Technology Fund\n"
"\t $77000.00 Mozilla Open Source Support\n"
"\t $5000.00 Google Summer of Code\n"
"\t- Sponsors\n"
"\t- Partners\n"
"\t 2000.00€ Mediapart\n"
"\t- T-shirts\n"
"\t 180.47€ T-shirts\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-09-20 17:54+0200\n"
"POT-Creation-Date: 2018-10-11 21:27+0200\n"
"PO-Revision-Date: 2017-10-30 20:07+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -80,10 +80,13 @@ msgstr "Compte de résultat pour 2016\n"
msgid ""
"\tRevenues:\n"
"\t- Donations\n"
"\t $24579.15 via RiseupLabs\n"
"\t $23579.15 via RiseupLabs\n"
"\t 8246.82€ via CCT\n"
"\t 2045.81€ cash\n"
"\t 24.43Ƀ bitcoins\n"
"\t 24.33Ƀ bitcoins\n"
"\t- Partners:\n"
"\t $1000.00 ExpressVPN\n"
"\t 0.10Ƀ I2P\n"
"\t- Restricted funds (sponsor deliverables)\n"
"\t 11000.00€ Lush\n"
"\t- T-shirts\n"
......@@ -270,7 +273,7 @@ msgid ""
"\t $208000.00 Open Technology Fund\n"
"\t $77000.00 Mozilla Open Source Support\n"
"\t $5000.00 Google Summer of Code\n"
"\t- Sponsors\n"
"\t- Partners\n"
"\t 2000.00€ Mediapart\n"
"\t- T-shirts\n"
"\t 180.47€ T-shirts\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-09-20 17:54+0200\n"
"POT-Creation-Date: 2018-10-11 21:27+0200\n"
"PO-Revision-Date: 2017-07-27 09:04+0200\n"
"Last-Translator: \n"
"Language-Team: ita <transitails@inventati.org>\n"
......@@ -80,10 +80,13 @@ msgstr "Rendiconto finanziario per il 2015\n"
msgid ""
"\tRevenues:\n"
"\t- Donations\n"
"\t $24579.15 via RiseupLabs\n"
"\t $23579.15 via RiseupLabs\n"
"\t 8246.82€ via CCT\n"
"\t 2045.81€ cash\n"
"\t 24.43Ƀ bitcoins\n"
"\t 24.33Ƀ bitcoins\n"
"\t- Partners:\n"
"\t $1000.00 ExpressVPN\n"
"\t 0.10Ƀ I2P\n"
"\t- Restricted funds (sponsor deliverables)\n"
"\t 11000.00€ Lush\n"
"\t- T-shirts\n"
......@@ -267,7 +270,7 @@ msgid ""
"\t $208000.00 Open Technology Fund\n"
"\t $77000.00 Mozilla Open Source Support\n"
"\t $5000.00 Google Summer of Code\n"
"\t- Sponsors\n"
"\t- Partners\n"
"\t 2000.00€ Mediapart\n"
"\t- T-shirts\n"
"\t 180.47€ T-shirts\n"
......
......@@ -18,10 +18,13 @@ Income statement for 2017
Revenues:
- Donations
$24579.15 via RiseupLabs
$23579.15 via RiseupLabs
8246.82€ via CCT
2045.81€ cash
24.43Ƀ bitcoins
24.33Ƀ bitcoins
- Partners:
$1000.00 ExpressVPN
0.10Ƀ I2P
- Restricted funds (sponsor deliverables)
11000.00€ Lush
- T-shirts
......@@ -87,7 +90,7 @@ Income statement for 2016
$208000.00 Open Technology Fund
$77000.00 Mozilla Open Source Support
$5000.00 Google Summer of Code
- Sponsors
- Partners
2000.00€ Mediapart
- T-shirts
180.47€ T-shirts
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-09-20 17:54+0200\n"
"POT-Creation-Date: 2018-10-11 21:27+0200\n"
"PO-Revision-Date: 2018-04-30 06:16+0000\n"
"Last-Translator: Mrs. F <mrsf@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -73,10 +73,13 @@ msgstr "Declaração de renda de 2016\n"
msgid ""
"\tRevenues:\n"
"\t- Donations\n"
"\t $24579.15 via RiseupLabs\n"
"\t $23579.15 via RiseupLabs\n"
"\t 8246.82€ via CCT\n"
"\t 2045.81€ cash\n"
"\t 24.43Ƀ bitcoins\n"
"\t 24.33Ƀ bitcoins\n"
"\t- Partners:\n"
"\t $1000.00 ExpressVPN\n"
"\t 0.10Ƀ I2P\n"
"\t- Restricted funds (sponsor deliverables)\n"
"\t 11000.00€ Lush\n"
"\t- T-shirts\n"
......@@ -193,7 +196,7 @@ msgid ""
"\t $208000.00 Open Technology Fund\n"
"\t $77000.00 Mozilla Open Source Support\n"
"\t $5000.00 Google Summer of Code\n"
"\t- Sponsors\n"
"\t- Partners\n"
"\t 2000.00€ Mediapart\n"
"\t- T-shirts\n"
"\t 180.47€ T-shirts\n"
......
......@@ -147,35 +147,25 @@ span.title {
padding-left: 2.3em;
}
#duckduckgo {
background: #b49cd3;
padding: 2em;
#check {
margin-top: 3em;
}
#duckduckgo a {
color: #333;
font-weight: bold;
background-image: none;
padding-right: 0 !important;
#other-ways h5 {
margin-top: 1.5em;
}
#duckduckgo img {
border: none;
max-width: 100%;
height: auto;
}
/* Display #riseuplab-coinbase if JS is disabled */
#paypal {
margin-bottom: 3em;
.bitcoin-address {
display: none;
}
#check {
margin-top: 3em;
#riseuplab-coinbase {
display: block;
}
#other-ways h5 {
margin-top: 1.5em;
}
/* Indent bank account details for wire transfers */
#transfer-eur, #transfer-usd {
margin-left: 2em;
......
......@@ -356,8 +356,20 @@ permitted by law.</strong></p>
<div class="col-md-5">
<div id="bitcoin">
<h4>Bitcoin</h4>
<p><a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">[[!img bitcoin-1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2.png link="no"]]</a></p>
<p><strong>1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</strong></p>
<!--
The bitcoin addresses below ('bitcoin-address' class) are displayed
randomly according to their weight ('data-weight' attribute):
- Addresses with 'data-weight="0"' are never displayed.
- There is no maximum weight.
-->
<div id="tails-bitcoind" class="bitcoin-address" data-weight="9">
<p><a href="bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2">[[!img bitcoin-1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2.png link="no"]]</a></p>
<p><strong>1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</strong></p>
</div>
<div id="riseuplab-coinbase" class="bitcoin-address" data-weight="1">
<p><a href="bitcoin:3QirvVRntoascPfTgNTUQvKxfKwPah5FNK">[[!img bitcoin-3QirvVRntoascPfTgNTUQvKxfKwPah5FNK.png link="no"]]</a></p>
<p><strong>3QirvVRntoascPfTgNTUQvKxfKwPah5FNK</strong></p>
</div>
</div>
<div id="check">
<h4>US check</h4>
......
......@@ -89,4 +89,39 @@ document.addEventListener('DOMContentLoaded', function() {
document.getElementById('amount').value = newvalue;
});
}
// Pass-through the ?r= parameter to /donate/thanks and /donate/canceled
var url = new URL(window.location.href);
var r = url.searchParams.get("r");
if (r) {
var returnUrls = document.getElementsByClassName('return-url');
for (let i = 0; i < returnUrls.length; i++) {
let element = returnUrls[i];
let url = new URL(element.value);
element.value = url.origin + url.pathname + "?r=" + r;
}
}
// Alternate between our different bitcoin addresses
var bitcoinAddresses = document.getElementsByClassName('bitcoin-address'),
current_top_weight = 0,
picked_value,
ranges_end = [];
for (let i = 0; i < bitcoinAddresses.length; i++) {
hide(bitcoinAddresses[i]);
ranges_end[i]
= current_top_weight
= current_top_weight + parseInt(bitcoinAddresses[i].dataset.weight);
}
picked_value = Math.floor(Math.random() * current_top_weight);
for (let i = 0; i <= bitcoinAddresses.length; i++) {
if (picked_value < ranges_end[i]) {
show(bitcoinAddresses[i]);
break;
}
}
});
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment