* I rebased Sven's code on the latest version of Bootstrap (from 4 alpha 6 to
4.2.1)
Don't worry, I will keep you in the loop for now and there will still be plenty
to do after version one is being rolled out.
I will write an email shortly about the blog and that I cut corners :) That
needs to be sorted eventually and I am happy to get some help with that.
Best,
-Michael
On Wed, 2018-07-18 at 13:08 +0200, Sven wrote:
> Great news.
> I am really sorry that at the moment I can’t help, I really like the project
> and I hope that in the near future I will have some time to help you again.
>
> Greetings,
> Sven
>
> > On 18. Jul 2018, at 13:02, Michael Tremer <michael.tremer@ipfire.org> wrote:
> >
> > Hello *,
> >
> > for the time being, I am taking over from Sven who is caught up in work and
> > I
> > really need to move forward rolling out the website as soon as possible now.
> >
> > So I will keep you posted with a few updates that I am making. I am also
> > doing
> > some backend works and this is a short summary of what I did this week:
> >
> > * I removed the planet & news pages
> > * I added a new backend for the blog and merged all news and
> > planet posts together
> > * I added a nice full-text search :)
> > * I cleaned up some of the backend code and this will continue
> >
> > On the frontend side:
> >
> > * I rebased Sven's code on the latest version of Bootstrap (from 4 alpha 6
> > to
> > 4.2.1)
> > * I moved a lot of the CSS into variables and it is now dynamically compiled
> > from SASS to CSS when ever something is changed.
> > * I removed loads of old pages that we no longer need as well as images (so
> > loads and loads of house-keeping)
> >
> > * I implemented the blog
> > For this I have loads of questions, requests and ideas for improvements
> > which I will put into a separate email
> >
> > * I implemented the form to the donation page
> > I did that in a slightly different way because the popup won't work since
> > we will already have a popup that encourages people to make their donation
> > a recurring one - please see that as a proposal. I will also send an extra
> > email about the donation page
> >
> > * I also tried to rework pages like the legal page. I guess I failed
> > terribly on
> > that one design-wise. So we will have to talk what we can do about the other
> > pages.
> >
> > At the moment the site isn't online. I am installing a new web server that
> > will
> > host it for now and soon will be running the production version of it. I
> > will
> > let you know when that is online.
> >
> > Best,
> > -Michael
> >
> > On Wed, 2018-05-30 at 12:21 +0100, Michael Tremer wrote:
> > > Hello,
> > >
> > > I just wanted to make a request about the donation page.
> > >
> > > Can we have a field where people can enter a comment? Some people just
> > > write
> > > "Thank you" and some other write what features they would like to see in
> > > the
> > > future and this is usually a good way to communicate that.
> > >
> > > It could potentially go under the address input. It doesn't have to be
> > > very
> > > big.
> > > Only two lines or so.
> > >
> > > Best,
> > > -Michael
> > >
> > > On Tue, 2018-05-22 at 16:01 +0100, Michael Tremer wrote:
> > > > Ah cool, just found it (again :D).
> > > >
> > > > Is there any progress with the implementation of that, yet?
> > > >
> > > > I guess you might want to remove the <form> tag that I added again, but
> > > > I
> > > > suppose the functionality is clear through this.
> > > >
> > > > -Michael
> > > >
> > > > On Tue, 2018-05-22 at 16:51 +0200, Sven wrote:
> > > > > We have a layout for the address-stuff.
> > > > >
> > > > >
> > > > > > On 22. May 2018, at 16:39, Michael Tremer <michael.tremer@ipfire.org
> > > > > > >
> > > > > > wrote:
> > > > > >
> > > > > > Hello guys,
> > > > > >
> > > > > > I continued working on the backend of the donation stuff since
> > > > > > contract
> > > > > > work
> > > > > > with the payment providers is soon coming to an end I would like to
> > > > > > be
> > > > > > able
> > > > > > to
> > > > > > accept donations through this as soon as possible.
> > > > > >
> > > > > > So the backend work has kept me busy for weeks now and I have a
> > > > > > rough
> > > > > > version
> > > > > > running that sends out the right emails with SEPA mandates in PDF
> > > > > > forms
> > > > > > and
> > > > > > so
> > > > > > on...
> > > > > >
> > > > > > On the frontend, this is now super easy to use and I implemented
> > > > > > everything
> > > > > > that
> > > > > > we need so far:
> > > > > >
> > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commitdiff;h=2c361abc1a73
> > > > > > d9c
> > > > > > 7b
> > > > > > 3f
> > > > > > f8d
> > > > > > 82da5e769e7378a128
> > > > > >
> > > > > > The huge change in donate.html is just because I added a <form> tag
> > > > > > and
> > > > > > indented
> > > > > > every line in the block by one tab.
> > > > > >
> > > > > > All the magic happens in handlers.py. When a user clicks on the
> > > > > > donate
> > > > > > button,
> > > > > > we will send a request to my accounting software with all the
> > > > > > details
> > > > > > and
> > > > > > then
> > > > > > redirect the user to the right payment page. Fairly easy. So far
> > > > > > they
> > > > > > will
> > > > > > never
> > > > > > come back.
> > > > > >
> > > > > > As you can see in the code, I added dummy values for the name,
> > > > > > address
> > > > > > and
> > > > > > some
> > > > > > other inputs. So far I think we don't even have designs for that
> > > > > > part of
> > > > > > the
> > > > > > donation form. Is that correct Maurice?
> > > > > >
> > > > > > @Sven: Is the application back up and running on your development
> > > > > > machine?
> > > > > >
> > > > > > Best,
> > > > > > -Michael
> > > > > >
> > > > > > On Tue, 2018-05-01 at 12:20 +0100, Michael Tremer wrote:
> > > > > > > Hello,
> > > > > > >
> > > > > > > yes I will have a look at that. It has been a bit of a problem
> > > > > > > since
> > > > > > > it
> > > > > > > is
> > > > > > > hosted in a different data centre and connecting back to the main
> > > > > > > database
> > > > > > > using
> > > > > > > a VPN. If that is unavailable for a bit, the webapp loses
> > > > > > > connectivity
> > > > > > > to
> > > > > > > the
> > > > > > > database and from then on there are those issues.
> > > > > > >
> > > > > > > Please just shoot me an email when ever it breaks down and I can
> > > > > > > restart
> > > > > > > it.
> > > > > > >
> > > > > > > Best,
> > > > > > > -Michael
> > > > > > >
> > > > > > > On Fri, 2018-04-27 at 19:46 +0000, Maurice Gesswein wrote:
> > > > > > > > Unfortunately dev.ipfire.org is pretty often down, not reachable
> > > > > > > > or
> > > > > > > > shows
> > > > > > > > 500
> > > > > > > > error. No issues with www.ipfire.org. Any chance that you could
> > > > > > > > fix
> > > > > > > > this
> > > > > > > > permanently Michael? :)
> > > > > > > >
> > > > > > > > On Thu, Apr 26, 2018 at 8:29 PM Michael Tremer <michael.tremer@i
> > > > > > > > pfir
> > > > > > > > e.
> > > > > > > > or
> > > > > > > > g>
> > > > > > > > wrote:
> > > > > > > > > Hey,
> > > > > > > > >
> > > > > > > > > the backend for the fireinfo country thing is being
> > > > > > > > > implemented:
> > > > > > > > >
> > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commitdiff;h=e400e3
> > > > > > > > > 7d7
> > > > > > > > > af
> > > > > > > > > 60
> > > > > > > > > ebc
> > > > > > > > > 45
> > > > > > > > > 45ec8966a6dd7ff5c213e5
> > > > > > > > >
> > > > > > > > > I adjusted the website a little bit and removed the other two
> > > > > > > > > dials.
> > > > > > > > > This
> > > > > > > > > is
> > > > > > > > > just for showing how this works, but I am sure you won't be
> > > > > > > > > happy
> > > > > > > > > with
> > > > > > > > > what
> > > > > > > > > I
> > > > > > > > > did, so please feel free to change.
> > > > > > > > >
> > > > > > > > > Best,
> > > > > > > > > -Michael
> > > > > > > > >
> > > > > > > > > On Thu, 2018-04-26 at 10:14 +0100, Michael Tremer wrote:
> > > > > > > > > > Could one of you create a bug ticket then to remind me what
> > > > > > > > > > this
> > > > > > > > > > site
> > > > > > > > > > nagivation
> > > > > > > > > > issue was about again?
> > > > > > > > > >
> > > > > > > > > > So far we have four tickets open and many many are already
> > > > > > > > > > closed:
> > > > > > > > > >
> > > > > > > > > > https://bugzilla.ipfire.org/showdependencygraph.cgi?id=11314
> > > > > > > > > >
> > > > > > > > > > -Michael
> > > > > > > > > >
> > > > > > > > > > On Thu, 2018-04-26 at 07:50 +0200, Sven wrote:
> > > > > > > > > > > Of course we have to fix the bugs.
> > > > > > > > > > > But for example the sidebar navigation bug has no entry in
> > > > > > > > > > > the
> > > > > > > > > > > bugzilla
> > > > > > > > >
> > > > > > > > > and
> > > > > > > > > > > on
> > > > > > > > > > > my computer the text overlaps but I can’t see the
> > > > > > > > > > > flickering.
> > > > > > > > > > > I know that there is still a lot to do without design work
> > > > > > > > > > > from
> > > > > > > > > > > your
> > > > > > > > >
> > > > > > > > > part,
> > > > > > > > > > > Maurice.
> > > > > > > > > > >
> > > > > > > > > > > Greetings,
> > > > > > > > > > > Sven
> > > > > > > > > > >
> > > > > > > > > > > > Am 25.04.2018 um 18:10 schrieb Maurice Gesswein
> > > > > > > > > > > > <maurice.gesswei
> > > > > > > > > > > > n@ip
> > > > > > > > > > > > fi
> > > > > > > > >
> > > > > > > > > re.o
> > > > > > > > > > > > rg
> > > > > > > > > > > > > :
> > > > > > > > > > > >
> > > > > > > > > > > > First, this is no fingerpointing or something like that.
> > > > > > > > > > > > This
> > > > > > > > > > > > is
> > > > > > > > > > > > not
> > > > > > > > > > > > a
> > > > > > > > > > > > rude
> > > > > > > > > > > > comment! I'm wondering what about the major available
> > > > > > > > > > > > bugs
> > > > > > > > > > > > like
> > > > > > > > >
> > > > > > > > > flickering
> > > > > > > > > > > > Sidenavigation during browser resize and overlapping
> > > > > > > > > > > > text in
> > > > > > > > > > > > the
> > > > > > > > > > > > left
> > > > > > > > > > > > sidebar at the feature page? Should this be fixed in the
> > > > > > > > > > > > very
> > > > > > > > > > > > end?
> > > > > > > > > > > > In
> > > > > > > > > > > > other
> > > > > > > > > > > > words there are some major and a lot of minor bugs which
> > > > > > > > > > > > could
> > > > > > > > > > > > be
> > > > > > > > > > > > addressed
> > > > > > > > > > > > while no new designs/layouts are available.
> > > > > > > > > > > >
> > > > > > > > > > > > My next todo is the blog article. Defining the text
> > > > > > > > > > > > formation.
> > > > > > > > > > > > Think
> > > > > > > > >
> > > > > > > > > I'll
> > > > > > > > > > > > have a bit of time to work on this during the next 2-3
> > > > > > > > > > > > weeks.
> > > > > > > > > > > >
> > > > > > > > > > > > Best, Maurice
> > > > > > > > > > > >
> > > > > > > > > > > > Sven <sven.hoehn@posteo.de> schrieb am Mi., 25. Apr.
> > > > > > > > > > > > 2018,
> > > > > > > > > > > > 16:58:
> > > > > > > > > > > > > This week busy … hope to have a bit of time the next
> > > > > > > > > > > > > weeks.
> > > > > > > > > > > > >
> > > > > > > > > > > > > Yes, please implement the stats in the backend.
> > > > > > > > > > > > >
> > > > > > > > > > > > > What is with the Planet do we rename it to Blog and
> > > > > > > > > > > > > move
> > > > > > > > > > > > > it
> > > > > > > > > > > > > to
> > > > > > > > > > > > > the
> > > > > > > > >
> > > > > > > > > top
> > > > > > > > > > > > > navigation?
> > > > > > > > > > > > >
> > > > > > > > > > > > > > Am 25.04.2018 um 14:59 schrieb Michael Tremer
> > > > > > > > > > > > > > <michael.treme
> > > > > > > > > > > > > > r@ip
> > > > > > > > > > > > > > fi
> > > > > > > > >
> > > > > > > > > re.o
> > > > > > > > > > > > > > rg
> > > > > > > > > > > > > > :
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Thanks for the quick answer.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > On Wed, 2018-04-25 at 14:47 +0200, Sven wrote:
> > > > > > > > > > > > > > > at the moment no news from my side.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > How is your availability in the next few days and
> > > > > > > > > > > > > > weeks?
> > > > > > > > > > > > > > Are
> > > > > > > > > > > > > > you
> > > > > > > > >
> > > > > > > > > quite
> > > > > > > > > > > > >
> > > > > > > > > > > > > busy with
> > > > > > > > > > > > > > other things or do you think that we can make some
> > > > > > > > > > > > > > good
> > > > > > > > > > > > > > progress?
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > > But if you order the page content, we still have
> > > > > > > > > > > > > > > to
> > > > > > > > > > > > > > > decide
> > > > > > > > > > > > > > > which
> > > > > > > > > > > > >
> > > > > > > > > > > > > Fireinfo
> > > > > > > > > > > > > > > Stats to put on the homepage.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Yes, thanks for reminding me. Let's go with the
> > > > > > > > > > > > > > following
> > > > > > > > > > > > > > two
> > > > > > > > >
> > > > > > > > > things:
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > * The latest version and how many systems are
> > > > > > > > > > > > > > running it
> > > > > > > > > > > > > > (as
> > > > > > > > > > > > > > we
> > > > > > > > >
> > > > > > > > > have
> > > > > > > > > > > > > > it
> > > > > > > > > > > > > > already).
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > * As a second thing, let's pick a random country for
> > > > > > > > > > > > > > each
> > > > > > > > > > > > > > request
> > > > > > > > > > > > >
> > > > > > > > > > > > > (potentially
> > > > > > > > > > > > > > one of the top 20 or so where percentages are not
> > > > > > > > > > > > > > toooo
> > > > > > > > > > > > > > small,
> > > > > > > > >
> > > > > > > > > maybe
> > > > > > > > > > > > >
> > > > > > > > > > > > > everything
> > > > > > > > > > > > > > above 1%) and show the gauge for how many of the
> > > > > > > > > > > > > > systems
> > > > > > > > > > > > > > are
> > > > > > > > >
> > > > > > > > > running
> > > > > > > > > > > > > > in
> > > > > > > > > > > > >
> > > > > > > > > > > > > that
> > > > > > > > > > > > > > country.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > So for example: Germany (45%) or Switzerland (5%)
> > > > > > > > > > > > > > and so
> > > > > > > > > > > > > > on.
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > I guess that is a quite interesting statistic and
> > > > > > > > > > > > > > better
> > > > > > > > > > > > > > than
> > > > > > > > > > > > > > what
> > > > > > > > >
> > > > > > > > > CPU
> > > > > > > > > > > > >
> > > > > > > > > > > > > people
> > > > > > > > > > > > > > are using because Intel is quite obvious any ways...
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Do you want me to implement the backend like last
> > > > > > > > > > > > > > time?
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > Best,
> > > > > > > > > > > > > > -Michael
> > > > > > > > > > > > > >
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > Greetings,
> > > > > > > > > > > > > > > Sven
> > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Am 25.04.2018 um 14:02 schrieb Michael Tremer
> > > > > > > > > > > > > > > > <michael.tremer@
> > > > > > > > >
> > > > > > > > > ipfi
> > > > > > > > > > > > > > > > re.o
> > > > > > > > > > > > >
> > > > > > > > > > > > > rg>:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Hello,
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > me again. I went ahead and made a few changes to
> > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > website.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > This is mostly all backend:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > * A bit of tidying up of some messy code or
> > > > > > > > > > > > > > > > changes
> > > > > > > > > > > > > > > > that
> > > > > > > > > > > > > > > > don't
> > > > > > > > > > > > > > > > change
> > > > > > > > > > > > >
> > > > > > > > > > > > > much:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > f251
> > > > > > > > > > > > > > > > 6d
> > > > > > > > >
> > > > > > > > > b73f
> > > > > > > > > > > > > > > > 9605
> > > > > > > > > > > > >
> > > > > > > > > > > > > 7891fb
> > > > > > > > > > > > > > > > 6a69
> > > > > > > > > > > > > > > > c0351c2fac2676ef
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 9876
> > > > > > > > > > > > > > > > 8e
> > > > > > > > >
> > > > > > > > > 99ed
> > > > > > > > > > > > > > > > 1189
> > > > > > > > > > > > >
> > > > > > > > > > > > > c8cacc
> > > > > > > > > > > > > > > > 7744
> > > > > > > > > > > > > > > > 0efc3e75c23e18aa
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 1633
> > > > > > > > > > > > > > > > 48
> > > > > > > > >
> > > > > > > > > f570
> > > > > > > > > > > > > > > > 1f04
> > > > > > > > > > > > >
> > > > > > > > > > > > > d97fec
> > > > > > > > > > > > > > > > c0c8
> > > > > > > > > > > > > > > > c9b688057b294ec1
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 22e0
> > > > > > > > > > > > > > > > 13
> > > > > > > > >
> > > > > > > > > 5f6f
> > > > > > > > > > > > > > > > 5d1f
> > > > > > > > > > > > >
> > > > > > > > > > > > > 8cd8fd
> > > > > > > > > > > > > > > > 9540
> > > > > > > > > > > > > > > > b1c8c52ca0d1cce1
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 195d
> > > > > > > > > > > > > > > > 8e
> > > > > > > > >
> > > > > > > > > ea71
> > > > > > > > > > > > > > > > 97e8
> > > > > > > > > > > > >
> > > > > > > > > > > > > 3e7b71
> > > > > > > > > > > > > > > > 616f
> > > > > > > > > > > > > > > > 0632f5e2fb4452c5
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > a49b
> > > > > > > > > > > > > > > > 54
> > > > > > > > >
> > > > > > > > > 22cd
> > > > > > > > > > > > > > > > 97e0
> > > > > > > > > > > > >
> > > > > > > > > > > > > f64fa9
> > > > > > > > > > > > > > > > dc7b
> > > > > > > > > > > > > > > > 47367d2bb16945ee
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 3e7c
> > > > > > > > > > > > > > > > 6c
> > > > > > > > >
> > > > > > > > > cdef
> > > > > > > > > > > > > > > > 6e5b
> > > > > > > > > > > > >
> > > > > > > > > > > > > 63f9b0
> > > > > > > > > > > > > > > > 1576
> > > > > > > > > > > > > > > > 6cfb894931b43e65
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 14cd
> > > > > > > > > > > > > > > > 4f
> > > > > > > > >
> > > > > > > > > a8c6
> > > > > > > > > > > > > > > > b404
> > > > > > > > > > > > >
> > > > > > > > > > > > > 1ba0dd
> > > > > > > > > > > > > > > > 3c48
> > > > > > > > > > > > > > > > 46561d50421d97f6
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > ba43
> > > > > > > > > > > > > > > > a8
> > > > > > > > >
> > > > > > > > > 92f7
> > > > > > > > > > > > > > > > 3a6b
> > > > > > > > > > > > >
> > > > > > > > > > > > > 68bccd
> > > > > > > > > > > > > > > > ef23
> > > > > > > > > > > > > > > > bf9d28ac49557e4f
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > * I dropped the link to the Google Plus page.
> > > > > > > > > > > > > > > > Nobody
> > > > > > > > > > > > > > > > seems
> > > > > > > > > > > > > > > > to
> > > > > > > > >
> > > > > > > > > be
> > > > > > > > > > > > > > > > using
> > > > > > > > > > > > >
> > > > > > > > > > > > > that:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 962f
> > > > > > > > > > > > > > > > de
> > > > > > > > >
> > > > > > > > > e989
> > > > > > > > > > > > > > > > 7085
> > > > > > > > > > > > >
> > > > > > > > > > > > > 35f3b1
> > > > > > > > > > > > > > > > 60e3
> > > > > > > > > > > > > > > > 814d9d7fe0cb2686
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > * And the bigger changes are those two:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > 7c06
> > > > > > > > > > > > > > > > 05
> > > > > > > > >
> > > > > > > > > e897
> > > > > > > > > > > > > > > > 41c3
> > > > > > > > > > > > >
> > > > > > > > > > > > > b0792c
> > > > > > > > > > > > > > > > 0fe1
> > > > > > > > > > > > > > > > 07459098ba248b7d
> > > > > > > > > > > > > > > > https://git.ipfire.org/?p=ipfire.org.git;a=commi
> > > > > > > > > > > > > > > > tdif
> > > > > > > > > > > > > > > > f;
> > > > > > > > > > > > > > > > h=
> > > > > > > > > > > > > > > > e52b
> > > > > > > > > > > > > > > > 45
> > > > > > > > >
> > > > > > > > > b601
> > > > > > > > > > > > > > > > f908
> > > > > > > > > > > > >
> > > > > > > > > > > > > e7bf44
> > > > > > > > > > > > > > > > 77f9
> > > > > > > > > > > > > > > > 615ce674ce1de8da
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > The first one drops the wishlist. I do not think
> > > > > > > > > > > > > > > > that
> > > > > > > > > > > > > > > > it
> > > > > > > > > > > > > > > > is
> > > > > > > > >
> > > > > > > > > wise
> > > > > > > > > > > > > > > > to
> > > > > > > > > > > > >
> > > > > > > > > > > > > follow
> > > > > > > > > > > > > > > > this
> > > > > > > > > > > > > > > > any more. We should rather encourage people to
> > > > > > > > > > > > > > > > set
> > > > > > > > > > > > > > > > up
> > > > > > > > > > > > > > > > a
> > > > > > > > >
> > > > > > > > > recurring
> > > > > > > > > > > > >
> > > > > > > > > > > > > donation
> > > > > > > > > > > > > > > > instead of searching features that are
> > > > > > > > > > > > > > > > interesting
> > > > > > > > > > > > > > > > enough to
> > > > > > > > > > > > > > > > donate
> > > > > > > > > > > > >
> > > > > > > > > > > > > some
> > > > > > > > > > > > > > > > money
> > > > > > > > > > > > > > > > to because that takes money away from security-
> > > > > > > > > > > > > > > > related
> > > > > > > > > > > > > > > > things
> > > > > > > > >
> > > > > > > > > that
> > > > > > > > > > > > > > > > are
> > > > > > > > > > > > >
> > > > > > > > > > > > > just
> > > > > > > > > > > > > > > > not
> > > > > > > > > > > > > > > > very exciting for our users.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > The second one drop the entire German
> > > > > > > > > > > > > > > > translation.
> > > > > > > > > > > > > > > > We
> > > > > > > > > > > > > > > > still
> > > > > > > > >
> > > > > > > > > have a
> > > > > > > > > > > > > > > > lot
> > > > > > > > > > > > >
> > > > > > > > > > > > > of
> > > > > > > > > > > > > > > > work
> > > > > > > > > > > > > > > > ahead of us and I am going to improve some of
> > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > texts,
> > > > > > > > > > > > > > > > but
> > > > > > > > > > > > > > > > I
> > > > > > > > > > > > > > > > cannot
> > > > > > > > > > > > >
> > > > > > > > > > > > > afford
> > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > time to do this for German as well. Nobody seems
> > > > > > > > > > > > > > > > to
> > > > > > > > > > > > > > > > care
> > > > > > > > > > > > > > > > about
> > > > > > > > >
> > > > > > > > > a
> > > > > > > > > > > > >
> > > > > > > > > > > > > localized
> > > > > > > > > > > > > > > > website anyways since the wiki is only English
> > > > > > > > > > > > > > > > for a
> > > > > > > > > > > > > > > > while.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Please let me know your comments.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > I also merged everything from your branch
> > > > > > > > > > > > > > > > together
> > > > > > > > > > > > > > > > with
> > > > > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > changes to
> > > > > > > > > > > > >
> > > > > > > > > > > > > the
> > > > > > > > > > > > > > > > website in the meantime. Sven, please continue
> > > > > > > > > > > > > > > > working
> > > > > > > > > > > > > > > > on
> > > > > > > > > > > > > > > > that
> > > > > > > > > > > > > > > > branch
> > > > > > > > > > > > >
> > > > > > > > > > > > > now.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > You can do this as follows:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > git fetch origin
> > > > > > > > > > > > > > > > git reset --hard origin/next
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > And then just keep committing and pushing to
> > > > > > > > > > > > > > > > your
> > > > > > > > > > > > > > > > repository
> > > > > > > > >
> > > > > > > > > as
> > > > > > > > > > > > > > > > usual.
> > > > > > > > > > > > >
> > > > > > > > > > > > > The
> > > > > > > > > > > > > > > > first
> > > > > > > > > > > > > > > > push needs to overwrite the old branch:
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > git push shoehn +master
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > The plus sign overwrites all changes in the old
> > > > > > > > > > > > > > > > branch.
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > Best,
> > > > > > > > > > > > > > > > -Michael
> > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > On Wed, 2018-04-25 at 11:06 +0100, Michael
> > > > > > > > > > > > > > > > Tremer
> > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > Any status update other than this?
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > Let me know where I can support. I am excited
> > > > > > > > > > > > > > > > > about
> > > > > > > > > > > > > > > > > the
> > > > > > > > >
> > > > > > > > > website
> > > > > > > > > > > > > > > > > and
> > > > > > > > > > > > >
> > > > > > > > > > > > > think
> > > > > > > > > > > > > > > > > we
> > > > > > > > > > > > > > > > > are
> > > > > > > > > > > > > > > > > close to rolling it out. What is left on the
> > > > > > > > > > > > > > > > > todo
> > > > > > > > > > > > > > > > > list?
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > -Michael
> > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > On Tue, 2018-04-24 at 10:55 +0100, Michael
> > > > > > > > > > > > > > > > > Tremer
> > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > Yeah, but right now we are not even anywhere
> > > > > > > > > > > > > > > > > > near
> > > > > > > > > > > > > > > > > > 250
> > > > > > > > > > > > > > > > > > EUR
> > > > > > > > >
> > > > > > > > > a
> > > > > > > > > > > > > > > > > > month,
> > > > > > > > > > > > >
> > > > > > > > > > > > > so
> > > > > > > > > > > > > > > > > > this
> > > > > > > > > > > > > > > > > > is
> > > > > > > > > > > > > > > > > > really really pointless...
> > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > On Mon, 2018-04-23 at 17:19 +0200, Sven
> > > > > > > > > > > > > > > > > > wrote:
> > > > > > > > > > > > > > > > > > > 25000 Euro each month would be great :-D
> > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > Am 23.04.2018 um 12:31 schrieb Michael
> > > > > > > > > > > > > > > > > > > > Tremer
> > > > > > > > >
> > > > > > > > > <michael.tre
> > > > > > > > > > > > > > > > > > > > mer@ipfi
> > > > > > > > > > > > >
> > > > > > > > > > > > > re
> > > > > > > > > > > > > > > > > > > > .org
> > > > > > > > > > > > > > > > > > > > > :
> > > > > > > > > > > > > > > > > > > >
> > > > > > > > > > > > > > > > > > > > They generally do offer
> > > > > > > > > > > > > > > > > > > > that, but require a minimum turnover of
> > > > > > > > > > > > > > > > > > > > 25000
> > > > > > > > > > > > > > > > > > > > EUR
> > > > > > > > > > > > > > > > > > > > each
> > > > > > > > > > > > > > > > > > > > month
>
>