Commit Graph

1597 Commits

Author SHA1 Message Date
cfa0367250 Merge pull request 'Remove unused import' (#25) from development into alpha
Reviewed-on: #25
2024-11-11 10:57:51 +01:00
b685a9b7b8 Merge branch 'alpha' into development 2024-11-11 10:57:44 +01:00
caffeb4ee8 Remove unused import 2024-11-11 11:57:00 +02:00
62416dcf82 Merge pull request 'Setting reset functionality and author ID to bulk delete logs' (#24) from development into alpha
Reviewed-on: #24
2024-11-11 10:55:25 +01:00
2a9aef7d1e Merge branch 'alpha' into development 2024-11-11 10:55:08 +01:00
36e320ab1b Add author id to bulk delete logs 2024-11-11 11:53:25 +02:00
b3898a498b Make ping quotes sequential but shuffled 2024-10-29 13:26:26 +02:00
f9d57ab0b6 Merge branch 'development' of https://git.corgi.wtf/Galactic/galactic-bot into development 2024-10-28 19:14:15 +02:00
5d7b3c1cee Implement functionality to reset settings 2024-10-28 19:14:13 +02:00
aba057a01a Merge pull request 'Infraction logging bugfix' (#23) from development into alpha
Reviewed-on: #23
2024-10-27 21:23:20 +01:00
6cf1f0bc1a Merge branch 'alpha' into development 2024-10-27 21:23:11 +01:00
ad685d0143 Merge branch 'development' of https://git.corgi.wtf/Galactic/galactic-bot into development 2024-10-27 22:21:02 +02:00
80081515ac Bugfix for infractions being logged wrong 2024-10-27 22:20:58 +02:00
2151e3c912 Merge pull request 'Fix bot not sending infraction in DMs when removing from server' (#21) from development into alpha
Reviewed-on: #21
2024-10-23 12:39:48 +02:00
10b161d170 Merge branch 'alpha' into development 2024-10-23 12:39:29 +02:00
34cd19edb0 Fix bot not sending infraction in DMs when removing from server 2024-10-23 13:36:59 +03:00
00b165b925 Merge pull request 'development' (#20) from development into alpha
Reviewed-on: #20
2024-10-17 21:57:10 +02:00
948a5a5d08 Merge branch 'alpha' into development 2024-10-17 21:57:00 +02:00
f163f2c9ea Debug statement 2024-10-17 22:50:34 +03:00
09a72bfc83 Upgrade deps and linter rules 2024-10-07 15:14:28 +03:00
56a191df7d Merge branch 'beta' into alpha 2024-10-02 08:25:29 +02:00
c55986da93 bump version (#18)
Reviewed-on: #18
2024-10-02 08:24:50 +02:00
02fc061196 Merge branch 'alpha' into development 2024-10-02 08:24:36 +02:00
62d21dd905 bump version 2024-10-02 09:24:11 +03:00
25d371c862 Merge branch 'development' into alpha 2024-09-30 20:43:47 +03:00
689fe5ec70 bugfix 2024-09-30 20:40:27 +03:00
e19c418863 Botban feature (#16)
+ More logging
+ Docker compose for databases

Reviewed-on: #16
Co-authored-by: Navy <navydotgif@gmail.com>
Co-committed-by: Navy <navydotgif@gmail.com>
2024-09-30 17:50:49 +02:00
d0d7c6cf4a Merge remote-tracking branch 'origin/alpha' into development 2024-09-30 18:48:59 +03:00
ebed2cfeb9 Added more error logging 2024-09-30 18:46:09 +03:00
c037a8abe9 Update readme 2024-09-30 17:59:56 +03:00
9119316438 Refactor how wrappers store data
Added botban inhibitor
Added docker compose for bootstrapping databases
2024-09-30 17:56:24 +03:00
79f7c00670 Fix order of operations 2024-07-28 18:51:07 +03:00
7a32ee3f26 Merge readme 2024-07-26 17:40:30 +03:00
fb743b8c45 Merge 2024-07-26 17:36:36 +03:00
a7739ee927 Merge branch 'alpha' into beta 2024-07-26 17:35:44 +03:00
7440edda96 Update alpha branch (#13)
\+ Quotes to ping command
\+ Contributor acknowledgements

Reviewed-on: #13
Co-authored-by: Navy.gif <navydotgif@gmail.com>
Co-committed-by: Navy.gif <navydotgif@gmail.com>
2024-07-26 16:34:12 +02:00
d963cf3db5 Merge main 2024-07-26 17:32:29 +03:00
51ec1189c0 Added quotes to ping command 2024-07-26 17:11:13 +03:00
390c0ee840 upgrade dependencies 2024-07-26 17:11:01 +03:00
8199399323 Include past contributor list 2024-07-26 17:10:48 +03:00
2c58d15c49 Update main branch (#12)
\+ License and copyright attribution
\+ Readme
\+ JSDoc comments
\+ Link to repo in help command
\* Refactor poll command
\* Attempted fix for dangling child process
\* Reduce unnecessary db calls in moderation manager

Reviewed-on: #12
2024-07-26 15:26:42 +02:00
9fd5f48fc6 Merge branch 'main' into beta 2024-07-26 15:26:17 +02:00
c96d63c3bd Update beta branch (#11)
\+ License and copyright attribution
\+ Readme
\+ JSDoc comments
\+ Link to repo in help command

Reviewed-on: #11
Co-authored-by: Navy.gif <navydotgif@gmail.com>
Co-committed-by: Navy.gif <navydotgif@gmail.com>
2024-07-22 17:01:26 +02:00
34923bee9e Merge 2024-07-20 14:48:44 +03:00
dc2602724c Merge branch 'development' into alpha 2024-07-20 14:44:45 +03:00
fa45aeab42 Add link to repo in help command 2024-07-20 14:42:16 +03:00
ccb5ce3000 Add jsdoc comments 2024-07-19 21:35:30 +03:00
c081cdc1bf Update readme 2024-07-19 21:30:01 +03:00
2c4c4702b4 upgrade yarn 2024-07-19 21:29:55 +03:00
cc3ca2580d Merge branch 'development' of https://git.corgi.wtf/galactic/galactic-bot into development 2024-07-19 19:59:50 +03:00