Commit Graph

333 Commits (a1f676582b2e1ee41290a8abc2840e197c6bf2b4)

Author SHA1 Message Date
Joey Hines a1f676582b Merge pull request 'Carolyn best editor' (#2) from doc_update into main
Reviewed-on: https://git.canopymc.net/Geoffrey/Geoffrey-Django/pulls/2
2021-07-16 01:34:16 +00:00
Joey Hines cc87bdcba9 Merge branch 'main' into doc_update 2021-07-16 01:34:11 +00:00
Joey Hines 18f57b9e08
Carolyn best editor 2021-07-15 19:33:34 -06:00
Joey Hines 3426f3150f Merge pull request 'Updated Getting Started Section' (#1) from doc_update into main
Reviewed-on: https://git.canopymc.net/Geoffrey/Geoffrey-Django/pulls/1
2021-07-16 01:11:10 +00:00
Joey Hines 25fb1d91fa
Updated Getting Started Section 2021-07-15 19:10:33 -06:00
Joey Hines 7d91f9e8a4 Check if `primary_location` is null in Player.json() 2020-10-10 12:14:02 -05:00
Joey Hines 1e0500d4df Merge remote-tracking branch 'gitea/main' into main 2020-10-10 12:07:09 -05:00
Joey Hines f2bf227ce0 Allow primary location to be blank 2020-10-10 12:06:56 -05:00
Joey Hines beea98e006 Allow primary location to be blank 2020-10-10 12:06:10 -05:00
Joey Hines a7b2413136 Merge pull request 'Sort item names in `info` alphabetically' (#28) from issue/info_item_sort into main
Reviewed-on: https://git.etztech.xyz/ZeroHD/Geoffrey/pulls/28
2020-10-10 18:46:36 +02:00
Joey Hines 52c8b2757d Sort item names in `info` alphabetically
+ Fixed primary location
2020-10-09 08:30:29 -05:00
Joey Hines 8b473d4024 Merge branch 'v2' of git.etztech.xyz:ZeroHD/Geoffrey into v2 2020-10-09 08:05:16 -05:00
Joey Hines 9362f40e2b Missing migration 2020-10-09 08:03:17 -05:00
Joey Hines abaeba3b52 Merge pull request 'First pass of a GraphQL API' (#25) from graphql-api into v2
Reviewed-on: https://git.etztech.xyz/ZeroHD/Geoffrey/pulls/25
2020-10-08 22:57:36 +02:00
Joey Hines 9eabf09fc0 Added item_listing query
+ items can be searched or all items can be returned
+ Added missing migration
2020-08-22 13:39:25 -05:00
Joey Hines 2f846de921 Added a way to set a primary location
+ Can be retrieved from the GraphQL API
+ Fixed `resolve_player` query
2020-08-22 13:29:49 -05:00
Joey Hines ec49b7c873 First pass of a GraphQL API
+ All location types can be queried based on name or id
+ If no query parameters are provided, all locations are returned
+ Integrated with the api tokens for the other APIs
2020-08-16 12:06:51 -05:00
Ben Maurer 1f61f400b4 Added the restock_multiple command using iregex to query items (#24)
Removed previously added restock_multiple command and replaced icontains
with iregex in the restock command

Added the restock_multiple command using iregex to query items

Reviewed-on: https://git.etztech.xyz/ZeroHD/Geoffrey/pulls/24
2020-08-12 02:14:28 +02:00
Joey Hines 2e1967cb5a Fixed issue with register 2020-01-08 20:01:56 -06:00
Joey Hines aa9505a04d Fixed null issue for discord uuid 2020-01-08 19:55:21 -06:00
Joey Hines 7018e83ddc Added plugin to docs 2020-01-08 15:06:32 -06:00
Joey Hines 2329dab84f Fixed typo in `loc_child_obj` 2020-01-08 14:56:14 -06:00
Joey Hines 2f2fd0f200 Fixed add_farm and some help messages 2020-01-08 14:46:01 -06:00
Joey Hines e50fe0d4e4 Added attractions to admin page and fixed point of interest issue 2020-01-08 14:33:25 -06:00
Joey Hines cb8a1586a2 Added support for setting the dimension of a location
+ This is internal information at the moment, but may be visible later.
2020-01-08 14:24:17 -06:00
Joey Hines 76714a7736 Allow discord_uuid field to be blank on Player model 2019-12-23 10:15:09 -06:00
Joey Hines 48615762f7 Small typo in last commit 2019-12-21 15:56:36 -05:00
Joey Hines c6fadd4a00 Added support to re-register to add a discord uuid
+ With plugin support, users can be created without discord uuids
+ When a player wants to use geoffrey in discord, they just need to register in discord
2019-12-21 15:52:57 -05:00
Joey Hines 9104ae9bd0 Use `settings.configure()` to create django settings for doc building
+ Allows docs to be built on other machines
2019-12-13 21:59:37 -06:00
Joey Hines cbd7c02117 Updated bot docs for service file and startup script 2019-12-13 21:54:06 -06:00
Joey Hines 38df420552 Combined public and private docs together 2019-12-03 18:10:54 -06:00
Joey Hines 42257a1750 Restricted price per item to 3 decimal points 2019-10-05 10:47:05 -05:00
Joey Hines 8b244dd438 Fixed shop location in item listing template 2019-10-05 10:44:43 -05:00
Joey Hines f723aaa40b Fixed dynmap iframe and the info block on location pages 2019-10-03 10:51:04 -05:00
Joey Hines a59cfc8632 Added `help` to the tutorial 2019-09-30 15:18:52 -05:00
Joey Hines 19e9500a1f Fixed navbar links being broken 2019-09-30 14:38:18 -05:00
Joey Hines 21bce0bae4 Added public documentation 2019-09-30 14:19:26 -05:00
Joey Hines 1570264272 Setting "GEOFFREY_DYNMAP_URL" to none disabled the dynmap iframe 2019-09-29 14:55:28 -05:00
Joey Hines e5723e260d Added points of interest to `loc_child_obj`
+ fixes issues with not being able to find the page for POI objects
2019-09-27 21:49:54 -05:00
Joey Hines 743c64fd17 Updated bot setup docs 2019-09-27 16:15:43 -05:00
Joey Hines 2c1c5d214f Various command fixes 2019-09-26 10:22:55 -05:00
Joey Hines 6b210cf0de Fixed 'add_resident' 2019-09-25 20:13:57 -05:00
Joey Hines 02845efaf2 Fixed `?selling_price` 2019-09-25 20:02:58 -05:00
Joey Hines 00d4f136de Fixed POST request key issue 2019-09-25 18:43:02 -05:00
Joey Hines d51b78af8d Fixed some issues in the docs 2019-09-21 09:13:57 -05:00
Joey Hines 5c3010d233 Added models_api perm
+ This will be used for the model API and for Townffrey
2019-09-17 11:23:47 -05:00
Joey Hines 57f3d2fa83 Added bot setup to the docs 2019-08-21 12:47:25 -05:00
Joey Hines 00b5fb3de9 Updated docs 2019-08-21 08:27:59 -05:00
Joey Hines 057064eadd Fixed issues formatting issue with more than one owner on the website 2019-08-21 07:55:28 -05:00
Joey Hines 3483f2a6c6 Added a basic db router to prevent conflicts with other django apps
+ Also included missed migration file
2019-08-21 07:53:39 -05:00