282 commits

Author	SHA1	Message	Date
Stefano	7bf513234f	Merge branch 'master' into master	2022-04-06 08:48:55 -07:00
ash	4493f85e0c	reddit contributions	2022-04-06 16:34:36 +01:00
ash	ccddefa72c	reddit contributions	2022-04-06 16:34:04 +01:00
ash	6ab4fc48b4	reddit contributions	2022-04-06 16:32:51 +01:00
asivery	9a177b814d	Added the ability to selectively override images, removed old, commented-out code from atlas.js, added more info into the info block (position, area).	2022-04-06 15:34:51 +02:00
imskyyc	c24791ac43	Update main.js	2022-04-06 01:30:04 -07:00
Someone Somewhere	0163f8593b	Merge branch 'master' into add_2022	2022-04-05 23:07:19 +03:00
Stefano	50603f7be4	Merge branch 'master' into fix_url_id_param	2022-04-05 21:52:52 +02:00
Stefano Haagman	8a403e4709	Merge branch 'cleanup'	2022-04-05 21:51:35 +02:00
Stefano Haagman	b6406b9c33	Added overlap mode.	2022-04-05 21:26:54 +02:00
n9iels	ced71c9c92	Fix click propagnation on mobile	2022-04-05 19:29:38 +02:00
Malte Jürgens	cb98d20121	Fix URL id param	2022-04-05 18:09:47 +02:00
Malte Jürgens	f5b490124e	Change name to "The 2022 /r/place Atlas"	2022-04-05 17:53:01 +02:00
ash	6206596da1	fix and update crawler	2022-04-05 13:47:36 +01:00
ash	1f2d35b802	remove references to PR submission	2022-04-05 13:20:06 +01:00
asivery	cc88efcf36	Removed XSS in infoblock creation, moved infoblock creation into a separate file, formatted atlas.json and made it distinct by description if it's longer than 10 characters	2022-04-05 12:32:59 +02:00
asivery	4bfd98f1be	Fix path in async request	2022-04-05 11:53:26 +02:00
asivery	399dfad357	JSON, IDs migration	2022-04-05 11:48:15 +02:00
enshael	2823419d2d	Merge branch 'master' into master	2022-04-05 17:14:51 +08:00
Aeywoo	f5bbfb70f1	Merge branch 'master' into contributions/reddit-1	2022-04-05 18:43:19 +09:30
enshael	bf58535ca5	convert to new id format	2022-04-05 17:13:15 +08:00
Someone Somewhere	0b83952e7c	Merge branch 'master' into patch-1	2022-04-05 12:12:05 +03:00
ash	12e3d6aa58	Update main.js	2022-04-05 10:08:32 +01:00
ash	ea5f33c35c	Update atlas.js	2022-04-05 10:07:40 +01:00
Someone Somewhere	d80b5d68ac	Fix unbalanced brackets	2022-04-05 12:07:06 +03:00
ash	f87fac2d24	Merge branch 'master' into contributions/reddit-1	2022-04-05 10:05:45 +01:00
enshael	9b48119ebe	Convert to uuid	2022-04-05 16:58:44 +08:00
Someone Somewhere	c6cb146970	Merge branch 'master' into patch-1	2022-04-05 11:55:21 +03:00
Someone Somewhere	a916639310	Merge branch 'master' into patch-4	2022-04-05 11:53:11 +03:00
ash	fbf9765fe7	new submissions, checking for dupes	2022-04-05 09:51:22 +01:00
Someone Somewhere	7cfb298a5d	Merge branch 'master' into patch-1	2022-04-05 11:50:20 +03:00
Someone Somewhere	ee5df9ace6	Merge branch 'master' into patch-1	2022-04-05 11:48:16 +03:00
Someone Somewhere	c555a44797	Merge branch 'master' into patch-2	2022-04-05 11:43:43 +03:00
Someone Somewhere	084c81caa7	Merge branch 'master' into patch-3	2022-04-05 11:36:55 +03:00
Someone Somewhere	45f2357e27	Merge branch 'master' into patch-3	2022-04-05 11:36:36 +03:00
Aeywoo	9bbdc6c6f0	Merge branch 'master' into patch-1	2022-04-05 18:05:38 +09:30
Someone Somewhere	42a0c6c619	Merge branch 'master' into master	2022-04-05 11:33:08 +03:00
Falki	9d7ffd9d81	Update atlas.js	2022-04-05 10:28:36 +02:00
Infernio	32d840fef0	Update location of She-Ra corner ... We had to rebuilt it elsewhere. Also improve description. Broken out of #274 to make it easier to merge.	2022-04-05 10:27:11 +02:00
Oliverikx	7de07d25ef	Update atlas.js	2022-04-05 10:25:56 +02:00
ash	e7e2bc14c5	Merge branch 'master' into contributions/reddit-1	2022-04-05 09:06:01 +01:00
Aeywoo	1211b7f48c	Updated website files. ... I added a Discord Button and a Discord SVG logo to the main html page of the website, added a new CSS class to make the Discord Button hover on blue instead of being yellow on hover, added a Discord banner to the contribute tab and added a link to our discord server on the bitcoin pop-out and a link to the current GitHub owners reddit user-page.	2022-04-05 17:24:38 +09:30
SkytAsul	315d1e78a3	More accurate french flag area description	2022-04-05 09:44:51 +02:00
ash	4d6fd79368	new submissions, and move to reddit-based ID	2022-04-05 08:39:51 +01:00
ash	91b2bb82c1	reddit contributions and improvements to redditcrawl.py	2022-04-05 07:58:54 +01:00
Aeywoo	2690d8493f	Merge branch 'master' into patch-1	2022-04-05 15:53:50 +09:30
Aeywoo	7a700579c4	Merge branch 'master' into master	2022-04-05 15:52:49 +09:30
Aeywoo	eb47da76c1	Merge branch 'master' into patch-1	2022-04-05 15:51:45 +09:30
Aeywoo	f59e07a6fb	Merge branch 'master' into patch-1	2022-04-05 15:50:11 +09:30
Aeywoo	803685c619	Merge branch 'master' into decentm/vrcmg	2022-04-05 15:48:50 +09:30