Commit Graph

42598 Commits

Author SHA1 Message Date
fani 49bcfe5bbc Belarus event 2022-09-16 14:59:39 +02:00
André Ockers c31cec35d2
Merge branch 'master' of git.fsfe.org:fsfe/fsfe-website
continuous-integration/drone/push Build is passing Details
2022-09-15 19:58:44 +02:00
fani b051b907a2 Merge pull request 'Publishing job posting' (#2786) from news-20220915-job into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2786
2022-09-15 08:20:41 +00:00
fani 8253730bd7 job posting
continuous-integration/drone/pr Build is passing Details
2022-09-15 10:18:31 +02:00
fani bc276173dc Merge pull request 'Event for software freedom day in Berlin' (#2785) from events-20220913 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2785
2022-09-13 15:25:23 +00:00
fani 78e0561375 software freedom day in Berlin
continuous-integration/drone/pr Build is passing Details
2022-09-13 17:23:03 +02:00
bonnie 3974d0f2e6 EN proofreading oxford comma (#2784)
continuous-integration/drone/push Build is passing Details
As mentioned by Richard we missed an Oxford comma in the sidebar text "Our-work"

Reviewed-on: #2784
2022-09-12 09:43:58 +00:00
mskf1383 74aff574e0 Add Persian translation for drm.info pages (#2766)
continuous-integration/drone/push Build is passing Details
This is Persian translation of drm.info pages.
Please merge it.
Thanks!

Reviewed-on: #2766
Co-authored-by: mskf1383 <mskf1383@fsfe.org>
Co-committed-by: mskf1383 <mskf1383@fsfe.org>
2022-09-12 09:10:32 +00:00
vincent 404c019615 Merge pull request 'Revert "Fix XMLParsedAsHTMLWarning in index-website.py"' (#2783) from fix-warning-website-indexer into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2783
2022-09-12 08:36:49 +00:00
vincent ff55a0aebe
Revert "Fix XMLParsedAsHTMLWarning in index-website.py"
continuous-integration/drone/pr Build is passing Details
This reverts commit 579643f6e7.
2022-09-12 10:35:58 +02:00
vincent da5aaa7b86 Merge pull request 'Fix XMLParsedAsHTMLWarning in index-website.py' (#2782) from fix-warning-website-indexer into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2782
2022-09-12 08:33:25 +00:00
vincent 579643f6e7
Fix XMLParsedAsHTMLWarning in index-website.py
continuous-integration/drone/pr Build is passing Details
Signed-off-by: Vincent Lequertier <vincent@fsfe.org>
2022-09-12 10:29:33 +02:00
vincent 58625263b5 Merge pull request 'Fix build by renaming Lina Ceballos.asc to ceballos-public.asc' (#2781) from fix-lina-key into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2781
2022-09-12 08:06:55 +00:00
vincent 2aa16de335
Fix build by renaming Lina Ceballos.asc to ceballos-public.asc
continuous-integration/drone/pr Build is passing Details
Also add a keyhref tag
2022-09-12 10:05:26 +02:00
vincent 89d4c77fb6 Merge pull request 'Add campus du libre event event-20221126-01' (#2780) from campus-du-libre-event into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2780
2022-09-12 07:51:28 +00:00
vincent ce4a49d943
Add campus du libre event event-20221126-01
continuous-integration/drone/pr Build is passing Details
Signed-off-by: Vincent Lequertier <vincent@fsfe.org>
2022-09-12 09:49:05 +02:00
Reinhard Müller 8500adf016 Update donor list
continuous-integration/drone/push Build is passing Details
2022-09-10 16:50:03 +02:00
André Ockers 66a0f3dfb6
Merge branch 'master' of git.fsfe.org:fsfe/fsfe-website 2022-09-10 14:00:42 +02:00
lina.ceballos a5f5279de9 Merge pull request 'adding Lina's public key' (#2779) from 0909Staff into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2779
2022-09-09 14:52:31 +00:00
lina.ceballos f9897311b3 adding Lina's public key
continuous-integration/drone/pr Build is passing Details
2022-09-09 16:51:13 +02:00
lina.ceballos b8d595e5f7 Merge pull request 'fixing about page Lina and pic' (#2778) from 0909team into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2778
2022-09-09 14:42:56 +00:00
lina.ceballos 457b5d61f7 fixing about page Lina and pic
continuous-integration/drone/pr Build is passing Details
2022-09-09 16:41:08 +02:00
lina.ceballos c5775b2186 Merge pull request 'Updating staff info on website' (#2777) from 0909Team into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2777
2022-09-09 14:29:42 +00:00
lina.ceballos f0415a3601 fixing pixel pictures
continuous-integration/drone/pr Build is passing Details
2022-09-09 16:27:38 +02:00
lina.ceballos ef019d908d updating Lina's info on website 2022-09-09 16:10:08 +02:00
lina.ceballos 3c115e9b20 updating Lina's info on website 2022-09-09 16:02:35 +02:00
lina.ceballos a05d4c2985 adding Evelyn to website 2022-09-09 16:02:07 +02:00
Matthias Kirschner d97f51edd6 added Evelyn
continuous-integration/drone/push Build is passing Details
2022-09-09 14:27:01 +02:00
T. E. Kalayci 306ca92ade [tr] Adding what is fs video (#2775)
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2775
Co-authored-by: T. E. Kalayci <tekrei@fsfe.org>
Co-committed-by: T. E. Kalayci <tekrei@fsfe.org>
2022-09-09 11:57:52 +00:00
bonnie 9e4f23697b New SFP with Hugo Roy (#2776)
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2776
2022-09-09 11:34:47 +00:00
eal b9a0c1a7e5 Merge pull request 'adding links to event' (#2774) from 20220908-events into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2774
2022-09-08 13:57:57 +00:00
eal 3a42e1eeab adding links to event
continuous-integration/drone/pr Build is passing Details
2022-09-08 15:50:13 +02:00
fani 4b8b550827 Merge pull request 'Replacing broken link in FYA with phones wiki' (#2773) from fya-20220907-wiki into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2773
2022-09-07 16:15:17 +00:00
fani 44c97d1be3 fixed typo
continuous-integration/drone/pr Build is passing Details
2022-09-07 18:12:49 +02:00
fani 47c64dd8f1 fixing link in NL 2022-09-07 18:10:21 +02:00
fani a8bac7ae01 fixing link in IT 2022-09-07 18:09:14 +02:00
fani 1b9b83a7a0 fixing link in EN 2022-09-07 18:08:16 +02:00
Reinhard Müller d374e63b15 Update donor list
continuous-integration/drone/push Build is passing Details
2022-09-07 10:14:58 +02:00
fani ffefcfb5b4 Merge pull request 'adding event in Utrecht' (#2772) from events-20220906 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2772
2022-09-06 15:08:45 +00:00
fani bbbc6070bf adding event in Utrecht
continuous-integration/drone/pr Build is passing Details
2022-09-06 17:07:25 +02:00
fani db83a4934b Merge pull request 'Press page new version' (#2771) from press-20220906 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2771
2022-09-06 14:45:31 +00:00
fani 082c7cc289 fixing email
continuous-integration/drone/pr Build is passing Details
2022-09-06 16:42:37 +02:00
fani 5e3c9fb893 improving appearance of video 2022-09-06 16:38:47 +02:00
fani 83cea5d596 Merge pull request 'Adding 'what is fs' video to press page' (#2770) from press-20220906 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2770
2022-09-06 14:30:54 +00:00
fani 464582d802 adding what is fs video
continuous-integration/drone/pr Build is passing Details
2022-09-06 16:29:24 +02:00
fani c27a84575a Merge pull request 'adding what is fs video' (#2769) from press-20220906 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2769
2022-09-06 14:22:11 +00:00
fani 9d2f4d4ff9 adding what is fs video
continuous-integration/drone/pr Build is passing Details
2022-09-06 16:20:07 +02:00
fani 6a6525b82c Merge pull request 'September 2022 Newsletter, ES IT NL translations' (#2768) from nl-202209 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2768
2022-09-06 08:50:47 +00:00
fani c7d692f946 translations
continuous-integration/drone/pr Build is passing Details
2022-09-06 10:46:10 +02:00
fani 3ab6298e51 Merge pull request 'sustainability conference article' (#2767) from news-20220905-demands into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2767
2022-09-05 13:24:45 +00:00