469 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Someone Somewhere	cdf4a96c90	Merge branch 'master' into removewin7	2022-04-05 17:26:10 +03:00
Someone Somewhere	228fc9c396	Merge pull request #411 from Roadcrosser/addthing ... Update Trash Taste description	2022-04-05 17:24:56 +03:00
Someone Somewhere	3591f38dd6	Merge branch 'master' into addthing	2022-04-05 17:24:25 +03:00
Someone Somewhere	08d27ec25e	Merge pull request #415 from galenguyer/master ... Fix description for Computer Science House	2022-04-05 17:22:56 +03:00
Someone Somewhere	6fee690ce6	Merge branch 'master' into master	2022-04-05 17:22:30 +03:00
Someone Somewhere	915309d654	Merge pull request #413 from prezmop/sunupdate ... Updated the description for The Sun	2022-04-05 17:20:10 +03:00
Galen Guyer	88a0197853	Fix description for Computer Science House	2022-04-05 10:19:20 -04:00
prezmop	76d36f052e	Updated the description for The Sun	2022-04-05 16:10:11 +02:00
Roadcrosser	e56bc91ce9	Merge branch 'Codixer:master' into addthing	2022-04-05 22:06:20 +08:00
Roadcrosser	97d1cb2072	Update Trash Taste Description	2022-04-05 22:05:42 +08:00
Jabster28	a341d88762	fix: remove windows 7 menu	2022-04-05 14:55:15 +01:00
Aeywoo	fc0f4c5bb5	Merge pull request #346 from Codixer/feature/contributing ... Feature/contributing	2022-04-05 23:00:02 +09:30
Aeywoo	fd643db23d	Merge branch 'master' into feature/contributing	2022-04-05 22:59:08 +09:30
ash	ec976f2342	Merge pull request #403 from Codixer/contributions/reddit ... new reddit submissions	2022-04-05 14:28:03 +01:00
Aeywoo	1bd793ca5b	Merge branch 'master' into contributions/reddit	2022-04-05 22:57:47 +09:30
ash	525a7887ea	new reddit submissions	2022-04-05 14:22:02 +01:00
Stefano	3f84f17bce	Merge pull request #397 from Codixer/contributions/reddit ... Contributions/reddit	2022-04-05 14:58:24 +02:00
Stefano	2e96ba2b13	Merge pull request #395 from Codixer/feature/remove-pr ... fix and update crawler	2022-04-05 14:57:02 +02:00
ash	8331a06423	new reddit submissions	2022-04-05 13:53:09 +01:00
ash	7c5ba7d1c8	Merge branch 'master' into feature/remove-pr	2022-04-05 13:50:21 +01:00
ash	6206596da1	fix and update crawler	2022-04-05 13:47:36 +01:00
Aeywoo	b61a660c04	Merge pull request #391 from Codixer/feature/remove-pr ... remove references to PR submission	2022-04-05 22:16:12 +09:30
ash	1f2d35b802	remove references to PR submission	2022-04-05 13:20:06 +01:00
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