Commit graph

3163 commits

Author SHA1 Message Date
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
Niels van der Veer
0ed66396ba
Merge branch 'master' into patch-night-watch 2022-04-05 15:23:32 +02:00
Niels van der Veer
a4ac26d56d
Merge branch 'master' into patch-boot 2022-04-05 15:23:30 +02:00
ash
525a7887ea
new reddit submissions 2022-04-05 14:22:02 +01:00
Roadcrosser
ee7b6e5575 Remove Trash Taste After Dark submission 2022-04-05 21:02:54 +08: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
n9iels
3163fcf46f Remove duplicate items of the Night Watch 2022-04-05 14:16:33 +02:00
n9iels
c149a6c0f8 Remove duplicate items of the boat 2022-04-05 14:14:07 +02:00
Epicgamer2469
7ee82e1de7 Fix Shelly (Small) Path 2022-04-05 06:41:31 -05: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
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
ash
c5a16c60c7
Update README.md 2022-04-05 10:44:52 +01:00
ash
37a5d6d22d
Update README.md 2022-04-05 10:44:19 +01:00