303 commits

Author	SHA1	Message	Date
ash	1f2d35b802	remove references to PR submission	2022-04-05 13:20:06 +01:00
ash	7b5ae57f39	Merge branch 'master' into master	2022-04-05 12:15:07 +01:00
ash	64de9ef6a1	merge fix	2022-04-05 12:12:36 +01:00
Aeywoo	dd83773745	Added new Image. ... Added a newer image of r/place closer to the whiteout.	2022-04-05 20:39:25 +09:30
ash	a6f352753b	merge	2022-04-05 12:05:48 +01:00
ash	1933a5aebd	latest reddit updates and dupe prevention logic	2022-04-05 11:55:45 +01:00
Aeywoo	e40a2730b0	Merge branch 'master' into master	2022-04-05 20:15:15 +09:30
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
ash	989f11f4cc	latest reddit updates	2022-04-05 11:32:11 +01:00
ash	e98e52d0c6	fix newlines on json	2022-04-05 11:10:50 +01: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
Someone Somewhere	60161da1b3	Fix minor typo	2022-04-05 12:17:37 +03: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
Aeywoo	339b4fd3ba	Merge branch 'master' into patch-1	2022-04-05 15:47:43 +09:30
Aeywoo	7e1de1824a	Merge branch 'master' into patch-1	2022-04-05 15:44:13 +09:30
Aeywoo	99ecdc9b29	Merge branch 'master' into patch-1	2022-04-05 15:42:51 +09:30
Aeywoo	5ba479241e	Merge branch 'master' into decentm/vrchat	2022-04-05 15:41:43 +09:30
Aeywoo	498b6d1945	Merge branch 'master' into patch-1	2022-04-05 15:40:18 +09:30