Commit graph

  • 417cc53a9a Merge branch 'master' into kustomize Naramsim 2024-06-02 11:56:24 +0200
  • b772c7f1fc trigger cicd Naramsim 2024-06-02 11:50:29 +0200
  • fa6ccb64ca
    Merge pull request #1092 from Indyandie/fix/oas-tags Alessandro Pezzè 2024-06-02 18:47:47 +0900
  • b2043858ce
    Merge pull request #1103 from PokeAPI/prune Alessandro Pezzè 2024-06-02 18:45:22 +0900
  • 4e4de2d46e chore: prune images #1103 Naramsim 2024-06-02 11:39:26 +0200
  • 91a0e651ce
    Merge branch 'master' into fix/oas-tags #1092 A 2024-05-31 19:00:20 -0500
  • 38acc5b9bb
    Merge pull request #1102 from DMJamboe/patch-1 Alessandro Pezzè 2024-05-31 23:45:43 +0900
  • ee0815b56d
    Remove max_turns and min_turns from poison fang #1102 Samuel Evans 2024-05-31 11:26:32 +0100
  • 2838060f0a
    Merge branch 'master' into fix/oas-tags Alessandro Pezzè 2024-05-31 16:31:03 +0900
  • cb1732920a
    Merge branch 'master' into rename-malie-city-id-768 Alessandro Pezzè 2024-05-31 14:51:36 +0900
  • 7f8a9dbc52
    Merge pull request #1099 from WitherredAway/patch-1 Alessandro Pezzè 2024-05-31 14:50:14 +0900
  • 7a709f1fc9
    Merge branch 'master' into patch-1 #1099 Alessandro Pezzè 2024-05-31 14:49:56 +0900
  • b036eacb86
    docs(openapi): generate spec indyandie 2024-05-31 00:16:39 -0500
  • f3918c26cb
    docs: update tag descriptions indyandie 2024-05-30 23:58:29 -0500
  • b5cece1536
    Merge pull request #1094 from DanielSmith13/patch-1 Alessandro Pezzè 2024-05-31 13:50:45 +0900
  • 843ff18385
    fix: typo indyandie 2024-05-30 23:42:14 -0500
  • 11283138a8
    Fix typo in Teal Mask item identifier Witherr 2024-05-29 00:15:39 +0530
  • 091bb6be25 Implemented suggested change of renaming Malie City id=768 in locations.csv O-Tahmas 2024-05-28 15:51:05 +0100
  • 172a53f536
    Update encounter_condition_value_prose.csv #1094 DanielSmith13 2024-05-26 15:00:32 +0100
  • 488053d798
    Update encounter_method_prose.csv DanielSmith13 2024-05-26 15:00:08 +0100
  • 367ca03761 Removed duplicate entry in locations.csv #1095 O-Tahmas 2024-05-26 12:19:45 +0100
  • b06fd1bd36
    fix(fmt): run make format indyandie 2024-05-25 02:44:13 -0500
  • 1af5aaee29
    Update encounter_method_prose.csv DanielSmith13 2024-05-24 17:53:35 +0100
  • 7335327088
    docs(openapi): generate yaml indyandie 2024-05-24 01:26:24 -0500
  • 435545a0db
    fix(drf-spectacular): use correct type (Tag Object), add descriptions, URLs indyandie 2024-05-24 01:24:15 -0500
  • 8999159e2c
    refactor(drf-spectacular): maintain operation order in api.py indyandie 2024-05-24 01:21:13 -0500
  • f4645353fc
    Merge pull request #1091 from edenbynever/update-machines Alessandro Pezzè 2024-05-23 12:17:45 +0200
  • 6de55cc1b8 Include expansion TMs in SV #1091 Eden Bynever 2024-05-21 11:50:44 -0400
  • 279cb3d672 Add SV/TM/ID machines Eden Bynever 2024-05-21 10:33:45 -0400
  • 351c340804 Add TMs 172 through 229 as items Eden Bynever 2024-05-21 10:21:25 -0400
  • 2eee0126a9 Add BDSP machines Eden Bynever 2024-05-21 10:13:14 -0400
  • fa9aa4f107
    Merge pull request #1087 from Indyandie/docs/q_query_string_param Alessandro Pezzè 2024-05-12 19:24:36 +0200
  • 434dadf6e0
    refactor(oas): add decorators to PokeapiCommonViewset class #1087 indyandie 2024-05-11 02:28:19 -0500
  • 43e9fb5d2b
    Merge branch 'master' into docs/q_query_string_param A 2024-05-10 00:57:07 -0500
  • 937dbd5bda
    refactor(nix): remove comments and unused code, start zsh (QoL) indyandie 2024-05-10 00:44:59 -0500
  • c4a10e006a
    docs(oas): describe q query string parameter indyandie 2024-05-10 00:21:30 -0500
  • 03237957fc
    fix(oas): define id path parameter indyandie 2024-05-10 00:04:44 -0500
  • bdc9fa98e6
    Merge pull request #1084 from PokeAPI/deploy-gql Alessandro Pezzè 2024-05-09 21:11:24 +0200
  • 06048a97df
    Merge branch 'master' into deploy-gql #1084 deploy-gql Alessandro Pezzè 2024-05-09 21:11:15 +0200
  • 47a6f45142
    Create D: #1085 user@jetbrains.com 2024-05-08 15:17:37 -1000
  • 98416bf2c5
    Merge branch 'master' into docker-compose-dev #1081 Alessandro Pezzè 2024-05-08 22:31:29 +0200
  • a8d24a493f
    Merge pull request #1059 from PokeAPI/compose-v2 Alessandro Pezzè 2024-05-08 22:03:47 +0200
  • 79a8d2bfaf
    Merge branch 'master' into compose-v2 #1059 Alessandro Pezzè 2024-05-08 21:14:35 +0200
  • f26e4ba0bb feat: update all containers while redeploying data/better strategy Naramsim 2024-05-08 21:00:06 +0200
  • 367fbe1899
    Merge pull request #1083 from GreatNovaDragon/master Alessandro Pezzè 2024-05-08 20:52:37 +0200
  • 6cb8b0636c language id in item prose for linking cord #1083 Sebastien Bürky 2024-05-07 19:02:53 +0200
  • e7aec9cba6 item flags for the linking cord Sebastien Bürky 2024-05-07 18:58:50 +0200
  • 8e2593c446 Add Linking cord Sebastien Bürky 2024-05-07 18:54:23 +0200
  • 174a5bcc4d feat: mount folder only for devs Naramsim 2024-05-07 11:10:54 +0200
  • 1b8e38f9ba fix: force action #1079 kustomize-test Naramsim 2024-05-06 22:34:06 +0200
  • 9f71226a77 oas: query q #1078 Naramsim 2024-05-06 22:31:43 +0200
  • a328c161ac chore: test gql with a greater timeout Naramsim 2024-05-06 22:30:35 +0200
  • 5575d2476a
    Merge pull request #1076 from PokeAPI/revert-openapi Alessandro Pezzè 2024-05-06 21:06:03 +0200
  • b37cae4952 cicd: generate openapi schema #1076 revert-openapi Naramsim 2024-05-06 13:23:30 +0200
  • 940b124db7 revert: remove win Naramsim 2024-05-06 13:21:29 +0200
  • 22f1580a68 revert: remove win Naramsim 2024-05-06 13:14:43 +0200
  • b4cedb37d7 try: build win Naramsim 2024-05-06 13:09:08 +0200
  • c799a7f227 fix: remove LE/feat: bump deps Naramsim 2024-05-06 13:04:36 +0200
  • b51950d60c revert: add back cargo and rust, drop LE Naramsim 2024-05-04 23:02:06 +0200
  • 0ca7f5d8fc revert: drop cargo and rust Naramsim 2024-05-04 22:54:12 +0200
  • 8088236c6f cicd: build other platforms but armv6 Naramsim 2024-05-04 22:52:51 +0200
  • b2ef3eba0f fix: merge in one command and delete .build-deps Naramsim 2024-05-04 22:09:03 +0200
  • 66a381fa51 fix: remove && Naramsim 2024-05-04 21:56:25 +0200
  • 69a10a04c8 fix: add rust and cargo Naramsim 2024-05-04 21:53:02 +0200
  • 8276c42823
    refactor: remove outdated file Alessandro Pezzè 2024-05-04 19:31:51 +0200
  • 9b0748c267
    Merge pull request #1075 from GreatNovaDragon/master Alessandro Pezzè 2024-05-04 17:10:43 +0200
  • 7564cd1d3b Remove an empty line #1075 Sebastien Bürky 2024-05-04 15:05:20 +0200
  • 7b83e61665 add missing comma Sebastien Bürky 2024-05-04 15:01:00 +0200
  • 0418db5a19 Merge branch 'master' of https://github.com/PokeAPI/pokeapi Sebastien Bürky 2024-05-04 14:55:05 +0200
  • 940fcac448 Add Stellar Type Sebastien Bürky 2024-05-04 14:53:44 +0200
  • 0ecbf73565
    Merge pull request #1065 from JVMartyns/feat/pokemon_partial_name_query_filter Alessandro Pezzè 2024-05-03 19:30:53 +0200
  • 45abdfdf11
    Merge branch 'master' into feat/pokemon_partial_name_query_filter #1065 Alessandro Pezzè 2024-05-02 22:39:05 +0200
  • cba4a0a872
    Merge pull request #1046 from Indyandie/openapi-nix Alessandro Pezzè 2024-05-02 22:35:31 +0200
  • d4712727b0
    Merge branch 'master' into openapi-nix #1046 Alessandro Pezzè 2024-05-02 21:47:14 +0200
  • 3669470e54
    Merge pull request #1072 from GreatNovaDragon/patch-1 Alessandro Pezzè 2024-04-25 21:51:27 +0200
  • 72d36d8870
    Let's Snuggle Forever and Plasma-Fists had their effects accidentally switched #1072 Sebastien Bürky 2024-04-25 19:24:17 +0200
  • 408ae20d1a testing works honey tree encounters done #1070 Brennan Gravanda 2024-04-24 22:58:37 -0400
  • e0a9f3cb7c stuck on tests again Brennan Gravanda 2024-04-24 22:46:30 -0400
  • 09b6a52aaf new api format stuck on tests again Brennan Gravanda 2024-04-24 21:11:55 -0400
  • 8dedbb72e6 testing works Brennan Gravanda 2024-04-21 12:32:37 -0400
  • b00ce5405f still struggling with tests Brennan Gravanda 2024-04-20 13:32:30 -0400
  • d5a6bd9bd8 still struggling with tests Brennan Gravanda 2024-04-20 13:08:13 -0400
  • b11c5d4d02 trying to make test Brennan Gravanda 2024-04-19 12:30:01 -0400
  • 0ca46928b9 attempting to merge Brennan Gravanda 2024-04-15 21:58:48 -0400
  • e874bb9a5a
    Merge pull request #3 from RyaBlake/evolutions-in-pokemon Nick Manos 2024-04-10 16:38:58 -0400
  • 9454dc2c6c finished with honey tree encounters Brennan Gravanda 2024-04-10 16:13:58 -0400
  • 2537156900 data uploads to database Brennan Gravanda 2024-04-10 15:14:41 -0400
  • a5d9dc475e data uploads to database Brennan Gravanda 2024-04-10 15:14:08 -0400
  • 34a89a405c
    Update API documentation for pokemon api Nick Manos 2024-04-09 23:23:37 -0400
  • 173e27aafe
    Add tests for evolution chain in pokemon api Nick Manos 2024-04-09 22:29:06 -0400
  • d45697b4fe
    Nest short version of evolution chain in species part of api response Nick Manos 2024-04-09 21:48:17 -0400
  • ed5d44c92b
    Add evolves_from_species and species_evolution_chain to pokemon api Nick Manos 2024-04-09 21:23:45 -0400
  • d2395bb30e honey tree csv finished Brennan Gravanda 2024-04-08 15:54:14 -0400
  • 176fdf3417 style: apply format using black JVMartyns 2024-04-08 11:05:29 -0300
  • eb70b7012c format file api.py JVMartyns 2024-04-08 10:51:12 -0300
  • 0471f98941 feat: add the query parameter q to search for pokemon using a partial name JVMartyns 2024-04-08 10:27:14 -0300
  • 0c039f3bbd
    Merge pull request #1064 from chamipon/Paldean-Genea-Flavour-Text Alessandro Pezzè 2024-04-06 22:11:16 +0200
  • ff6ab3d65d Pokemon 1020 -1023 - English genus from "Paladox" to "Paradox" #1064 chamipon 2024-04-05 15:27:02 -0400
  • ae797cf3ca Pokemon 1011 - 1017 English genus chamipon 2024-04-05 15:25:33 -0400
  • 26bbfd92a8 Pokemon Species 1009 - 10025 English flavour text chamipon 2024-04-05 15:18:21 -0400