Commit Graph

42570 Commits

Author SHA1 Message Date
fani a218ea2e26 correcting BuB event entry in EN DE
continuous-integration/drone/pr Build is passing Details
2022-09-22 17:57:27 +02:00
fani 23037d641e changing video to peertube link in press DE ES FR 2022-09-22 17:53:15 +02:00
fani aa8659fbb7 changing video to peertube link 2022-09-22 15:45:56 +02:00
bonnie 1f6715f25e Merge pull request 'added Persian language code' (#2791) from add_Persian_lang into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2791
2022-09-22 10:51:28 +00:00
gabriel.ku 2bda438967 Merge pull request 'updating Legal FAQ page' (#2792) from UPDATELEGALFAQ into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2792
2022-09-22 09:56:16 +00:00
gabriel.ku 933ba7db96 updating errors in Legal FAQ page
continuous-integration/drone/pr Build is passing Details
2022-09-22 11:54:37 +02:00
André Ockers d3d4b6d270
NL translation of DMA activity
continuous-integration/drone/push Build is passing Details
2022-09-21 18:59:11 +02:00
fani ff30c27b94 Merge pull request 'Removed delay warning from promo material' (#2793) from fixes-20220921 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2793
2022-09-21 15:49:11 +00:00
fani e88b78ac90 removed delay warning in promo material
continuous-integration/drone/pr Build is passing Details
2022-09-21 17:45:25 +02:00
fani 4e72f74d4b adding link to job posting email 2022-09-21 17:38:27 +02:00
gabriel.ku 6bc2bc0b31 updating Legal FAQ page
continuous-integration/drone/pr Build is failing Details
2022-09-21 16:04:31 +02:00
bonnie c8a70e6c1e added Persian language code
continuous-integration/drone/pr Build is passing Details
2022-09-21 14:44:40 +02:00
gabriel.ku ef5c1af8cc Merge pull request 'Updating NGI page to correct errors' (#2790) from NGI-PAGE-UPDATES into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2790
2022-09-21 09:28:07 +00:00
gabriel.ku 1a3c328166 Updating NGI page to correct errors
continuous-integration/drone/pr Build is passing Details
2022-09-21 11:25:44 +02:00
Matthias Kirschner ebf216582d remove the registration period
continuous-integration/drone/push Build is passing Details
2022-09-20 12:53:17 +02:00
fani f5ddefa1dc Merge pull request 'correcting date in event' (#2788) from events-20220916 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2788
2022-09-16 13:50:54 +00:00
fani c4e75801c3 correcting date
continuous-integration/drone/pr Build is passing Details
2022-09-16 15:49:40 +02:00
fani 550c20ef89 Merge pull request 'Adding 2 Ada events, 2 REUSE events, Minsk meetup' (#2787) from events-20220916 into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #2787
2022-09-16 13:39:05 +00:00
fani 8101b7728d Ada at Landesvertretung
continuous-integration/drone/pr Build is passing Details
2022-09-16 15:36:58 +02:00
fani 9aa2918906 adding link to Belarus event 2022-09-16 15:09:56 +02:00
fani 7e56d56e9d Ada event 2022-09-16 15:06:29 +02:00
fani 9d3624441f REUSE event 2022-09-16 15:01:31 +02:00
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