47200 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tobias Diekershoff	2b2f9da4c0	fix typo	2025-01-24 19:13:58 +01:00
Tobias Diekershoff	1aa927700e	Fix city name, swap URL for the event ... work by @ dfajfer We used the ILFS template for the event. Also, Wrocław and Poznań had the same description	2025-01-24 18:45:16 +01:00
Bonnie Mehring	67f9a8febc	YH4F update webpage ... * Add link to peertube playlist from yh4f * Fix distance between proxmox image and color boxes	2025-01-24 12:27:51 +00:00
anaghz	15907e6ab5	Merge pull request 'adding missing FOSDEM events' (#4794) from 20250124-events into master ... Reviewed-on: #4794	2025-01-24 11:45:23 +00:00
Ana Galan	1dbe023072	adding missing FOSDEM events	2025-01-24 12:46:55 +01:00
Bonnie Mehring	8a796f40d2	IloveFS events fix (#4789) ... * Fix UTC time * Fix Polish event Warsaw to have same text in EN and PL * Add missing time to UK event Reviewed-on: #4789 Co-authored-by: Bonnie Mehring <bonnie@fsfe.org> Co-committed-by: Bonnie Mehring <bonnie@fsfe.org>	2025-01-24 10:42:01 +00:00
anaghz	1b6701ae55	Merge pull request 'adding mastodon link and changing image' (#4788) from news-20250124-routerfreedom into master ... Reviewed-on: #4788	2025-01-24 10:35:49 +00:00
Ana Galan	5685ee8c8d	adding mastodon link and changing image	2025-01-24 11:36:21 +01:00
bonnie	71148e1d15	Merge pull request 'IlvoeFS events' (#4787) from Ilovefs-webpage-NBG-patch into master ... Reviewed-on: #4787	2025-01-24 09:25:06 +00:00
Bonnie Mehring	f92765796e	IlvoeFS events ... * Change order to alphabetic order :) * NBG event: fix zip code, building description * Add Zurick event (succeeds #4766	2025-01-24 10:22:10 +01:00
Ana Galan	3b5212188f	adding router freedom news item	2025-01-24 09:49:43 +01:00
anaghz	f98fc7a528	Merge pull request 'adding router freedom news item' (#4786) from news-20250124-routerfreedom into master ... Reviewed-on: #4786	2025-01-24 08:48:04 +00:00
Sofía Aritz	93fc4c22bd	Implement YH4F videobox (#4773) ... Implemented using PeerTube iframes because now you can disable P2P for iframes [1]. The `talks` element is only added to the English page because the talks are in English. If YH4F talks are carried out in other languages, it should be as simple as creating a `talks.[lang].xml` file with the links and adding the `talks` element to the respective page. From a GDPR perspective, as long as the talks are hosted in the FSFE's PeerTube and the `p2p` option is set to `0`, there shouldn't be any problems. [1] https://docs.joinpeertube.org/api/embed-player#p2p Reviewed-on: #4773 Reviewed-by: bonnie <bonnie@fsfe.org> Co-authored-by: Sofía Aritz <sofiaritz@fsfe.org> Co-committed-by: Sofía Aritz <sofiaritz@fsfe.org>	2025-01-24 08:34:40 +00:00
anaghz	421b2eeb92	Merge pull request 'adding router news item in DE for journalists' (#4785) from news-20250124-routerDE into master ... Reviewed-on: #4785	2025-01-23 16:55:21 +00:00
Ana Galan	e5b7854ee4	adding router news item in DE for journalists	2025-01-23 17:56:59 +01:00
Ana Galan	bb26e380d7	adding router news item in DE for journalists0	2025-01-23 17:53:00 +01:00
anaghz	49b443f0ea	Merge pull request 'adding router news item in DE for journalists0' (#4784) from news-20250124-routerDE into master ... Reviewed-on: #4784	2025-01-23 16:51:58 +00:00
Sofía Aritz	ad450b2a4d	Correct name of Wrocław	2025-01-23 14:31:27 +01:00
Sofía Aritz	0c2a84bae8	Add Nuremberg registration link	2025-01-23 14:26:46 +01:00
Sofía Aritz	a25a1e58ef	Move Luxembourg to the bottom	2025-01-23 14:17:00 +01:00
Sofía Aritz	c07f749031	Add Poznań and Wrocławska, and finish Luxembourg Ville	2025-01-23 12:53:43 +00:00
epiric	af1535f31c	adding Luxembourg	2025-01-23 12:53:43 +00:00
anaghz	a746782c9f	Merge pull request 'fixig device neutrality tags' (#4782) from 20250123-tags into master ... Reviewed-on: #4782	2025-01-23 12:48:46 +00:00
Ana Galan	b953e2cd38	fixig device neutrality tags	2025-01-23 13:49:10 +01:00
Bonnie Mehring	5102edabce	SFP fix typo ... s/xplores/explores	2025-01-23 12:27:33 +01:00
tobiasd	aa52951653	Merge pull request 'fixing link' (#4780) from 20250123-ling into master ... Reviewed-on: #4780	2025-01-23 09:46:34 +00:00
Tobias Diekershoff	65da8920a5	fixing link ... thx @yrar for noticing	2025-01-23 10:44:07 +01:00
tobiasd	80445059fe	Merge pull request 'ADD-event-20250218-01-01-f5a8e00679ee996c' (#4777) from ADD-event-20250218-01-01-f5a8e00679ee996c into master ... Reviewed-on: #4777	2025-01-23 08:57:32 +00:00
anaghz	f4ab53a208	Merge pull request 'fixing contact details in page' (#4779) from 20250122-ilovefs into master ... Reviewed-on: #4779	2025-01-22 15:27:52 +00:00
Ana Galan	3140ed13d6	fixing contact details in page	2025-01-22 16:29:43 +01:00
Bonnie Mehring	a0f6fbe454	SFP add mastodon link + highlights tag	2025-01-22 16:04:04 +01:00
fsfe-website/cgi-bin/registerevent.php	132b8a5477	Commit generated by fsfe-website/cgi-bin/registerevent, to add event fsfe.org/events/2025/event-20250218-01.en.xml ... Signed-off-by: fsfe-website/cgi-bin/registerevent.php <syshackers@fsfe.org>	2025-01-22 14:49:42 +00:00
Bonnie Mehring	cd16203f3c	News item for new SFP episode (#4771) ... *TODO: Waiting for transcript to finish Reviewed-on: #4771 Co-authored-by: Bonnie Mehring <bonnie@fsfe.org> Co-committed-by: Bonnie Mehring <bonnie@fsfe.org>	2025-01-22 14:31:26 +00:00
Tobias Diekershoff	533c92fbbf	update status	2025-01-22 15:30:42 +01:00
dario	8303e5d241	Merge pull request 'fixing avatar' (#4775) from fixdarioavatar into master ... Reviewed-on: #4775	2025-01-22 11:54:24 +00:00
Dario Presutti	641a76972c	fixing avatar	2025-01-22 12:53:01 +01:00
dario	e04425ed70	Merge pull request 'modifing darios avatar' (#4774) from fixdariopic into master ... Reviewed-on: #4774	2025-01-22 11:42:20 +00:00
Dario Presutti	36a0ce25e7	modifing darios avatar	2025-01-22 12:40:51 +01:00
dario	fa1ea28fcf	Merge pull request 'updating personal page' (#4772) from dariospage into master ... Reviewed-on: #4772	2025-01-22 11:13:33 +00:00
Dario Presutti	9deb5bbad2	updating darios page	2025-01-22 12:12:22 +01:00
Dario Presutti	b3dba2b935	updating personal page	2025-01-22 11:57:51 +01:00
Matthias Kirschner	3fa885512a	fix link after renaming	2025-01-22 09:49:42 +01:00
Matthias Kirschner	ace77dc66a	add DCP reference	2025-01-21 16:11:19 +01:00
anaghz	a5d9196350	Merge pull request 'adding mastodon link to Ada movie news item and changing picture' (#4770) from news-20250121-movie into master ... Reviewed-on: #4770	2025-01-21 13:31:09 +00:00
Ana Galan	420eedcbb6	adding mastodon link to Ada movie news item and changing picture	2025-01-21 14:32:47 +01:00
Ana Galan	941dcc6419	adding Ada movie news item	2025-01-21 14:12:02 +01:00
anaghz	ac5303d45a	Merge pull request 'adding Ada movie news item' (#4769) from news-20250121-movie into master ... Reviewed-on: #4769	2025-01-21 13:10:34 +00:00
Tobias Diekershoff	0ed8307b36	update movie page ... added some spacing after the videos	2025-01-21 13:40:04 +01:00
anaghz	8342f6d91a	Merge pull request 'Update fsfe.org/activities/ada-zangemann/movie.fr.xhtml' (#4767) from ada-movie into master ... Reviewed-on: #4767	2025-01-21 12:12:48 +00:00
anaghz	6f282bf0d1	Update fsfe.org/activities/ada-zangemann/movie.fr.xhtml ... adding space between movie and text	2025-01-21 12:08:37 +00:00