444 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Aeywoo	d9f2f17cb6	Merge pull request #384 from m654z/redditcrawl-fix ... Fix encoding issue	2022-04-05 20:49:08 +09:30
Aeywoo	5560a2f788	Merge branch 'master' into redditcrawl-fix	2022-04-05 20:48:48 +09:30
ash	388e2affa0	Merge pull request #379 from Aeywoo/master ... Added new Image.	2022-04-05 12:16:31 +01:00
ash	05cd11af53	Merge branch 'master' into master	2022-04-05 12:15:55 +01:00
Aeywoo	35d31c9e6f	Merge pull request #377 from ProstoSanja/master ... Validate JSON schema before merging	2022-04-05 20:45:51 +09:30
Someone Somewhere	9e77c4231c	Fix encoding issue	2022-04-05 14:15:30 +03:00
ash	7b5ae57f39	Merge branch 'master' into master	2022-04-05 12:15:07 +01:00
Aeywoo	30efa18e27	Merge branch 'master' into master	2022-04-05 20:43:39 +09:30
ash	64de9ef6a1	merge fix	2022-04-05 12:12:36 +01:00
Alex Tsernoh	0af5dec5f3	Merge branch 'master' into master	2022-04-05 12:10:15 +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
Alex Tsernoh	1b877ec12f	run on pull requests	2022-04-05 12:04:50 +01:00
Alex Tsernoh	c448fab01b	stupid typo again	2022-04-05 12:03:32 +01:00
Alex Tsernoh	8ed9659cdb	make path to atlas a variable	2022-04-05 12:02:43 +01:00
ash	bbac7e9fef	Merge branch 'contributions/reddit'	2022-04-05 11:58:33 +01:00
Alex Tsernoh	5108f7ff36	stupid typo	2022-04-05 11:57:19 +01:00
ash	1933a5aebd	latest reddit updates and dupe prevention logic	2022-04-05 11:55:45 +01:00
Alex Tsernoh	1e8264a020	Initial action	2022-04-05 11:53:53 +01:00
Aeywoo	445be39898	Merge pull request #365 from asivery/master ... 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 20:23:38 +09:30
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
Aeywoo	dc330d4e25	Merge pull request #362 from Codixer/feature/crawler ... update crawler to reject already submitted	2022-04-05 19:58:05 +09:30
Aeywoo	428fed6a96	Merge branch 'master' into feature/crawler	2022-04-05 19:56:18 +09:30
ash	3e2f998116	update crawler to reject already submitted	2022-04-05 11:25:12 +01:00
Aeywoo	d43a5ad120	Merge pull request #358 from Codixer/patch-1 ... fix newlines on json	2022-04-05 19:45:36 +09:30
ash	e98e52d0c6	fix newlines on json	2022-04-05 11:10:50 +01:00
ash	6f9fd822c9	Merge pull request #347 from asivery/master ... JSON, IDs migration	2022-04-05 10:55:13 +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
Aeywoo	72c97a2ad3	Merge pull request #338 from Codixer/m654z-patch-2 ... Fix minor typo	2022-04-05 18:49:25 +09:30
Someone Somewhere	60161da1b3	Fix minor typo	2022-04-05 12:17:37 +03:00
Aeywoo	12c79a2cb5	Merge pull request #216 from enshael/master ... Add r/grandorder entries	2022-04-05 18:46:55 +09:30
enshael	2823419d2d	Merge branch 'master' into master	2022-04-05 17:14:51 +08:00
Aeywoo	f19f2a76ac	Merge pull request #297 from Codixer/contributions/reddit-1 ... new submissions, and move to reddit-based ID	2022-04-05 18:43:37 +09:30
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	07155f9353	Merge pull request #77 from Pabszito/patch-1 ... Change "OSU" to "osu!", add Rocket League	2022-04-05 12:12:38 +03:00
Someone Somewhere	0b83952e7c	Merge branch 'master' into patch-1	2022-04-05 12:12:05 +03:00
ash	a72dfe73c7	Merge branch 'master' into contributions/reddit-1	2022-04-05 10:11:16 +01:00
Aeywoo	7492129177	Merge pull request #334 from Codixer/m654z-patch-1 ... Fix unbalanced brackets	2022-04-05 18:39:55 +09:30
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	af1c8a8001	Merge pull request #74 from flokkies/patch-1 ... add Gem Galaxies	2022-04-05 11:55:45 +03:00
Someone Somewhere	c6cb146970	Merge branch 'master' into patch-1	2022-04-05 11:55:21 +03:00
Someone Somewhere	5d1a605b02	Merge pull request #73 from wafflecoffee/patch-4 ... Add Modrinth	2022-04-05 11:53:27 +03:00