Commit graph

323 commits

Author SHA1 Message Date
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
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
Aeywoo
b1000c83e5
Merge branch 'master' into patch-1 2022-04-05 15:34:10 +09:30
Aeywoo
f927287375
Merge branch 'master' into master 2022-04-05 15:31:50 +09:30
Aeywoo
cda334478b
Merge branch 'master' into master 2022-04-05 14:58:57 +09:30
Aeywoo
b1cc4c2ac4
Merge branch 'master' into master 2022-04-05 14:53:01 +09:30
Aeywoo
bda1630ba5
Merge branch 'master' into patch-1 2022-04-05 14:46:59 +09:30
ShadowForests
12de95feeb
Fix Kaf website link
This updates the Kaf website link to point to the correct location
2022-04-04 22:15:17 -07:00
Aeywoo
8bbff58c11
Merge branch 'master' into patch-1 2022-04-05 14:41:05 +09:30
ShadowForests
3fb4b7063e
Fix Kaf outline
This fixes the Kaf outline to properly surround the area to include one missing 1-pixel layer of the outline
2022-04-04 22:07:48 -07:00
Aeywoo
1722c6588e
Merge branch 'master' into patch-2 2022-04-05 14:31:31 +09:30
Aeywoo
b4f6665ce3
Merge branch 'master' into patch-1 2022-04-05 14:30:29 +09:30
Aeywoo
23432707b7
Merge branch 'master' into patch-1 2022-04-05 14:29:23 +09:30
Aeywoo
303ad6bd81
Updated atlas.js
Please do not place any value higher than 0 above the first entry of atlas.js.
2022-04-05 14:27:19 +09:30
Aeywoo
eca1545c71
Merge branch 'master' into patch-1 2022-04-05 14:25:25 +09:30
Aeywoo
2ea6ff712e
Merge branch 'master' into master 2022-04-05 14:24:20 +09:30
Aeywoo
557c1e20e8
Merge branch 'master' into patch-2 2022-04-05 14:21:49 +09:30
Aeywoo
a9b88e3a3a
Updated atlas.js
Replaced an extra right curly bracket (}) with a regular right bracket (]).
2022-04-05 14:19:56 +09:30
Aeywoo
c6047b4450
Merge branch 'master' into patch-1 2022-04-05 14:17:38 +09:30
Aeywoo
c8870c9e20
Merge branch 'master' into patch-1 2022-04-05 14:15:27 +09:30
enshael
776c47c658 Update Abby's Entry 2022-04-05 12:44:27 +08:00
Aeywoo
5940bf5417
Updated atlas.js
Removed extra right bracket (]) causing an Invalid destructuring assignment target.
2022-04-05 14:12:59 +09:30
enshael
2bda6762e9 Add more related entries 2022-04-05 12:39:58 +08:00
Aeywoo
f8a6d89a18
Merge branch 'master' into patch-1 2022-04-05 14:07:17 +09:30
Aeywoo
34be1510cc
Merge branch 'master' into patch-1 2022-04-05 14:05:17 +09:30
Aeywoo
7711096b05
Merge branch 'master' into patch-1 2022-04-05 14:02:13 +09:30
Aeywoo
22fcd7d956
Updated atlas.js
Added missing comma.
2022-04-05 13:59:35 +09:30
Aeywoo
1cf913fe88
Merge branch 'master' into master 2022-04-05 13:58:25 +09:30
Aeywoo
3f8f61504b
Merge branch 'master' into patch-1 2022-04-05 13:55:00 +09:30
Aeywoo
f11617a832
Merge branch 'master' into master 2022-04-05 13:53:11 +09:30
Aeywoo
e37f06fa6f
Merge branch 'master' into master 2022-04-05 13:51:24 +09:30
Aeywoo
6567910652
Merge branch 'master' into patch-1 2022-04-05 13:49:06 +09:30
Aeywoo
a32a9fe6c7
Merge branch 'master' into patch-2 2022-04-05 13:47:19 +09:30
Aeywoo
03c5ce2fda
Merge branch 'master' into patch-1 2022-04-05 13:45:42 +09:30
Aeywoo
c4ba1d5a69
Merge branch 'master' into patch-1 2022-04-05 13:41:25 +09:30
enshael
8443007c48 Merge branch 'master' of github.com:enshael/place-atlas 2022-04-05 12:10:07 +08:00
enshael
923916498b Add more related entries 2022-04-05 12:09:49 +08:00
Aeywoo
a525c750b8
Merge branch 'master' into patch-1 2022-04-05 13:39:43 +09:30
Aeywoo
f278e0f1e5
Merge branch 'master' into patch-1 2022-04-05 13:36:21 +09:30
Aeywoo
2206382712
Merge branch 'master' into patch-1 2022-04-05 13:34:46 +09:30
enshael
5b9a33a0ee Add 8bit saber
https://www.reddit.com/r/placeAtlas2/comments/twl909/new_entry_for_rgrandorder/
2022-04-05 12:02:21 +08:00
Aeywoo
6dad547b84
Updated atlas.js
Added missing comma.
2022-04-05 13:29:54 +09:30
Aeywoo
2879b47966
Merge branch 'master' into patch-1 2022-04-05 13:28:30 +09:30
enshael
7725b0f9a1
Merge branch 'master' into master 2022-04-05 11:53:30 +08:00
enshael
dcf2c302cb Add r/nekoarc 2022-04-05 11:53:04 +08:00
Aeywoo
49117389db
Merge branch 'master' into master 2022-04-05 13:23:00 +09:30
Aeywoo
4215cdb8ff
Merge branch 'master' into patch-1 2022-04-05 13:20:05 +09:30
enshael
c248a05877
Merge branch 'master' into master 2022-04-05 11:47:32 +08:00
Aeywoo
0b461ad1d6
Missing comma.
Added a missing comma from reviewing conflicts.
2022-04-05 13:15:50 +09:30
Aeywoo
2a4da3cfda
Merge branch 'master' into patch-1 2022-04-05 13:13:30 +09:30
enshael
365f1ffe11 Add r/grandorder entries 2022-04-05 11:41:26 +08:00
Aeywoo
bdde05ad87
Merge branch 'master' into master 2022-04-05 13:05:45 +09:30
Aeywoo
279ddb9be2
Merge branch 'master' into patch-3 2022-04-05 13:02:58 +09:30
Aeywoo
e1bd5eb653
Merge branch 'master' into master 2022-04-05 12:59:09 +09:30
Aeywoo
ff06dc0ca3
Merge branch 'master' into patch-1 2022-04-05 12:57:27 +09:30
Aeywoo
f6cddc2065
Merge branch 'master' into patch-1 2022-04-05 12:53:25 +09:30