Commit Graph

Select branches

Hide Pull Requests

development

master

Mono Color

• 946590a3a1 Merge pull request #59 from dustinpianalto/pls-merge-me development Dusty.P 2018-06-21 10:49:08 -08:00
• 222760f6a0 Merge branch 'development' into pls-merge-me Dusty.P 2018-06-21 10:48:39 -08:00
• 6f7e3b4bbc Fixed another thingy regarding borked paths. nya~ 2018-06-21 19:35:02 +01:00
• ba27d7c390 Removed a ) nya~ 2018-06-21 19:27:32 +01:00
• 0a9ab007e5 Fixed borked path for tags. nya~ 2018-06-21 19:26:58 +01:00
• 66d994023e Removed junk from merge conflict issue. nya~ 2018-06-21 19:26:18 +01:00
• 08f1903871 Unborked a thing. nya~ 2018-06-21 19:25:12 +01:00
• 63d852f37b Fixed syntax error. nya~ 2018-06-21 19:22:04 +01:00
• 776b8d009c Update bot_management.py davfsa 2018-06-21 20:19:16 +02:00
• b189f2ca5e Oops nya~ 2018-06-21 19:17:29 +01:00
• 1ddf767074 Logs and reports broken cogs on restart. nya~ 2018-06-21 19:17:05 +01:00
• f4b0f03a23 Fixed path issue. nya~ 2018-06-21 19:10:34 +01:00
• 671e08ca5a Update. (#2) nya~ 2018-06-21 19:09:49 +01:00
• fe143678fe Updated some files davfsa 2018-06-21 20:04:07 +02:00
• 8f70fcc142 Update sebi_machine_launcher.sh davfsa 2018-06-21 19:56:08 +02:00
• 6b8bda9223 Merge branch 'neko404notfound-development' into development davfsa 2018-06-21 19:50:13 +02:00
• 0a4baee373 Merge branch 'development' of https://github.com/neko404notfound/Sebi-Machine into neko404notfound-development davfsa 2018-06-21 19:49:24 +02:00
• e62845ade8 Git pulls after four consecutive crashes. nya~ 2018-06-21 18:35:17 +01:00
• 1bd8873803 Fixed typos davfsa 2018-06-21 19:33:34 +02:00
• 3fa91bbcce Update bot_management.py davfsa 2018-06-21 19:06:20 +02:00
• 38b6ff65a4 Update bot_management.py davfsa 2018-06-21 18:58:49 +02:00
• 057e1210b7 Merge pull request #58 from AggPro/patch-5 davfsa 2018-06-21 16:03:11 +02:00
• 76b5d1df8f Changed d.js-start back to d.js Agg 2018-06-21 15:42:44 +03:00
• f2fd478dc8 Merge pull request #57 from AggPro/patch-4 davfsa 2018-06-21 13:28:24 +02:00
• b7f90c990e readded d.js-start Agg 2018-06-21 13:50:11 +03:00
• edfebad791 Merge pull request #56 from AggPro/patch-3 davfsa 2018-06-21 12:25:51 +02:00
• d5194bba3d added new responses to agree Agg 2018-06-21 12:32:31 +03:00
• 2a9c202436 Update bot_management.py davfsa 2018-06-21 09:07:41 +00:00
• 4f5a1b518a Renamed src package to sebimachine. neko404notfound 2018-06-21 10:02:54 +01:00
• 7f14b015ce Update bot_management.py davfsa 2018-06-21 08:41:29 +00:00
• 2eb5ac124c Update bot_management.py davfsa 2018-06-21 08:40:23 +00:00
• 788da95c11 Update bot_management.py davfsa 2018-06-21 08:31:36 +00:00
• 001d6aa0ac Removed execution permission. neko404notfound 2018-06-21 09:31:02 +01:00
• 6b44995333 Readded dockerfile as heroku uses it apparently..? neko404notfound 2018-06-21 09:28:25 +01:00
• 1a4af0c766 Updated .gitignore and removed docker stuff, since we are not using it. neko404notfound 2018-06-21 09:26:41 +01:00
• 5a67f1c732 Fixed license in package.json neko404notfound 2018-06-21 09:25:29 +01:00
• ff3b43c2e6 Removed package-lock, gitignored. neko404notfound 2018-06-21 09:24:41 +01:00
• dd3fd2ea68 Added .gitattributes neko404notfound 2018-06-21 09:23:31 +01:00
• 8d579f5bb3 Changed CRLF to LF, passed over code with black to normalise formatting. neko404notfound 2018-06-21 09:21:54 +01:00
• f6c4a5a570 Update (#1) nya~ 2018-06-21 09:20:10 +01:00
• 40a182cc43 Update bot_management.py davfsa 2018-06-21 08:18:16 +00:00
• 113737f2fd Merge pull request #54 from AggPro/patch-2 davfsa 2018-06-20 20:28:09 +02:00
• 9267acf8fb Aaa Agg 2018-06-20 21:27:51 +03:00
• 871a5f73be Update bot_management.py davfsa 2018-06-20 20:20:06 +02:00
• 327a5e74d2 Merge pull request #53 from AggPro/patch-1 davfsa 2018-06-20 20:19:09 +02:00
• 02c3f1e685 Added ban command Agg 2018-06-20 21:17:31 +03:00
• 7321413c90 Update bot_management.py davfsa 2018-06-20 20:03:28 +02:00
• c6efae9635 Update bot_management.py davfsa 2018-06-20 20:01:45 +02:00
• 239261eeaf Update bot_management.py davfsa 2018-06-20 19:55:50 +02:00
• 423edf1a3a Merge remote-tracking branch 'origin/development' into development davfsa 2018-06-20 19:49:43 +02:00
• 6b1dd09a98 Updated bot_management.py davfsa 2018-06-20 19:49:32 +02:00
• 0f80146172 Updated bot_management.py davfsa 2018-06-20 19:49:03 +02:00
• 6ae7113f5d Merge pull request #52 from neko404notfound/patch-2 davfsa 2018-06-20 19:43:45 +02:00
• cd286222c1 Fixed broken import someone didn't check. neko404notfound 2018-06-20 18:42:48 +01:00
• db0391d8af Merge pull request #51 from neko404notfound/patch-1 Dusty.P 2018-06-20 09:40:18 -08:00
• 7f2f4a32ca Fixed a stupid typo. neko404notfound 2018-06-20 18:39:47 +01:00
• 39838d3e79 removed numpy import Dustin Pianalto 2018-06-20 09:39:22 -08:00
• a76394b568 Update requirements.txt davfsa 2018-06-20 19:15:32 +02:00
• 3ebf0e22f8 Merge pull request #50 from neko404notfound/neko404notfound-venv-patch davfsa 2018-06-20 19:04:07 +02:00
• becc2d3ade Update sebi_machine_launcher.sh neko404notfound 2018-06-20 18:03:24 +01:00
• 6b9a9cc968 Update sebi_machine_launcher.sh neko404notfound 2018-06-20 18:00:16 +01:00
• 09384a7efa Merge pull request #49 from neko404notfound/development davfsa 2018-06-20 18:57:01 +02:00
• 76f7e0c36e Requirements and traps. neko404notfound 2018-06-20 17:51:25 +01:00
• 1f8856b277 Changed so that people with manage roles can add and delete tags davfsa 2018-06-20 17:48:14 +02:00
• 5caf602f79 Changed discord.Member to discord.User in invite davfsa 2018-06-19 22:34:50 +02:00
• 0fb83df922 Renamed start to tutorial davfsa 2018-06-19 22:15:29 +02:00
• 5ae0bd4b20 Fixed indentation error davfsa 2018-06-19 22:08:28 +02:00
• 8247bb5469 Merge remote-tracking branch 'origin/development' into development davfsa 2018-06-19 22:07:09 +02:00
• a8fd644218 Added a new command "finish" Finished invite davfsa 2018-06-19 22:06:08 +02:00
• 0c4b735e41 Added some files to gitignore davfsa 2018-06-19 22:05:09 +02:00
• ce8bd68193 Removed a useless command from moderation.py davfsa 2018-06-19 22:04:47 +02:00
• 6c2857e5c8 Update extensions.txt Mr-Blob 2018-06-19 10:03:24 +00:00
• a9cca0cff6 Create music.py Mr-Blob 2018-06-19 10:03:04 +00:00
• ccd6f14efc Create noblock.py Mr-Blob 2018-06-19 10:02:21 +00:00
• 844d3a4869 Create __init__.py Mr-Blob 2018-06-19 10:00:36 +00:00
• 6c80b5832b pep8 Dustin Pianalto 2018-06-18 10:31:32 -08:00
• 3d508968d4 Merge remote-tracking branch 'origin/development' into development Dustin Pianalto 2018-06-18 10:30:37 -08:00
• 315b48c235 Update bot_management.py davfsa 2018-06-18 20:30:13 +02:00
• d906d375f7 pep8 Dustin Pianalto 2018-06-18 10:30:07 -08:00
• 5736945447 Update bot_management.py davfsa 2018-06-18 08:24:15 +00:00
• 5a01692f6b Update bot_management.py davfsa 2018-06-16 11:32:07 +02:00
• b95269c234 Update bot_management.py davfsa 2018-06-16 11:27:14 +02:00
• 7ce9b3dd52 Update bot_management.py davfsa 2018-06-16 11:23:38 +02:00
• 86521e8e50 Update bot_management.py davfsa 2018-06-16 11:01:44 +02:00
• aef00702a7 Update bot_management.py davfsa 2018-06-16 11:01:06 +02:00
• c966615a80 Update bot_management.py davfsa 2018-06-16 11:00:03 +02:00
• 0772281ab2 Fixed indentaion errors davfsa 2018-06-16 10:56:57 +02:00
• 3f0252909f Update bot_management.py davfsa 2018-06-16 10:55:32 +02:00
• 313e103ef8 Added invite command davfsa 2018-06-16 10:50:14 +02:00
• 97524ce9bd Remove on_message Dustin Pianalto 2018-06-16 00:12:46 -08:00
• c43efe5801 Ignore self Dustin Pianalto 2018-06-16 00:06:13 -08:00
• 7aefcf5856 Fixed a little error davfsa 2018-06-16 10:04:13 +02:00
• 79342626a2 Fixed a typo davfsa 2018-06-16 10:01:02 +02:00
• 8e5f0c3fd7 Added a bot-invite "command" (still-testing) davfsa 2018-06-16 09:58:21 +02:00
• 82978b1822 Added a bot-invite "command" (still-testing) davfsa 2018-06-16 09:50:39 +02:00
• 62ca50b390 Update bot_management.py davfsa 2018-06-15 20:10:30 +02:00
• a90d7264bf Upated bot_management davfsa 2018-06-15 19:13:01 +02:00
• 51aabdf9d7 Delete bot_management.py davfsa 2018-06-15 19:11:09 +02:00
• 549f94a7c2 Updated bot_management.py davfsa 2018-06-15 19:03:17 +02:00
• f73d0b89d2 Added emojis for Paginator Dustin Pianalto 2018-06-15 01:42:43 -08:00