Jason Ji
|
1cd1a148f4
|
Merge branch 'weather' into 'master'
Weather
See merge request ldooks/dragon-bot!47
|
2017-09-24 21:13:37 +00:00 |
|
Jason Ji
|
a901b0b374
|
clean up clean up
|
2017-09-24 12:06:45 -07:00 |
|
Jason Ji
|
362458a853
|
Merge branch 'weather' of https://gitlab.com/ldooks/dragon-bot into weather
|
2017-09-24 12:00:12 -07:00 |
|
Jason Ji
|
b34acd125e
|
code cleanup
|
2017-09-24 11:59:57 -07:00 |
|
Jason Ji
|
54e77d4cd2
|
Merge branch 'master' into 'weather'
# Conflicts:
# app/dragon-bot.py
# app/help_methods.py
|
2017-09-22 20:18:09 +00:00 |
|
Luke Robles
|
bf5343291c
|
Smug faces yall
|
2017-09-22 13:00:22 -07:00 |
|
Jason Ji
|
2249e5a2d1
|
prints emoji for current status weather
|
2017-09-21 23:51:23 -07:00 |
|
Jason Ji
|
99ff1588be
|
Merge branch 'pout' into 'master'
Adding pout
See merge request ldooks/dragon-bot!46
|
2017-09-22 06:42:37 +00:00 |
|
|
|
31ef6e965a
|
Merge branch 'fix_help' into 'master'
Fixing the fucked up help output
See merge request ldooks/dragon-bot!45
|
2017-09-22 05:20:37 +00:00 |
|
|
|
0b954fc8ae
|
Fixing the fucked up help output
|
2017-09-22 05:20:37 +00:00 |
|
Luke Robles
|
c2736e74bc
|
Adding pout
|
2017-09-21 21:31:54 -07:00 |
|
|
|
6d305bdb34
|
Merge branch 'weather' into 'master'
Weather
See merge request ldooks/dragon-bot!44
|
2017-09-22 03:53:06 +00:00 |
|
Jason Ji
|
c134178456
|
Weather
|
2017-09-22 03:53:06 +00:00 |
|
Jason Ji
|
dd6db6b935
|
updated help for weather
|
2017-09-21 19:09:52 -07:00 |
|
Jason Ji
|
bfe662ddaa
|
janky fix to handle messages
|
2017-09-21 18:40:46 -07:00 |
|
Jason Ji
|
b3434fa898
|
fixed variable name issue
|
2017-09-21 18:34:01 -07:00 |
|
Jason Ji
|
9e414eac17
|
handling string inputs properly
|
2017-09-21 18:31:34 -07:00 |
|
Jason Ji
|
a2f528e011
|
Merge branch 'weather' of https://gitlab.com/ldooks/dragon-bot into weather
|
2017-09-21 18:30:49 -07:00 |
|
Jason Ji
|
43003f7a6b
|
handle string inputs
|
2017-09-21 18:30:34 -07:00 |
|
Jason Ji
|
8771c9e8ab
|
fixed message handling for weather
|
2017-09-22 01:18:58 +00:00 |
|
Jason Ji
|
f19d3754f6
|
Merge remote-tracking branch 'refs/remotes/origin/weather' into weather
|
2017-09-21 18:08:18 -07:00 |
|
Jason Ji
|
5310b0d7db
|
shoot me in the face i forgot to add this
|
2017-09-21 18:06:35 -07:00 |
|
Jason Ji
|
bbfe817d9d
|
Merge branch 'weather' into 'master'
weather
See merge request ldooks/dragon-bot!38
|
2017-09-22 01:01:22 +00:00 |
|
Jason Ji
|
a973e87af7
|
Merge branch 'master' into 'weather'
# Conflicts:
# .gitlab-ci.yml
# Dockerfile
# Dockerfile-test-env
Resolved by importing both PyOWM and BeautifulSoup4
|
2017-09-22 00:56:10 +00:00 |
|
Jason Ji
|
a5d623dde7
|
weather 2.0 - added emojis, made things look nicer
|
2017-09-21 17:50:36 -07:00 |
|
|
|
337293e220
|
change cleanup number to 10
|
2017-09-21 16:18:46 -07:00 |
|
|
|
3f9daaaa3d
|
Merge branch 'homepage' into 'master'
added help message for homepage
See merge request ldooks/dragon-bot!42
|
2017-09-20 16:37:33 +00:00 |
|
Tyler Hodapp
|
1168e3e048
|
added help message for homepage
|
2017-09-20 16:37:33 +00:00 |
|
Tyler Hodapp
|
965aaa3d6c
|
Merge branch 'homepage' into 'master'
Add support for fuckinghomepage.com. Fixes #23
Closes #23
See merge request ldooks/dragon-bot!40
|
2017-09-19 23:27:58 +00:00 |
|
Zoid
|
61bc14154b
|
Add support for fuckinghomepage.com. Fixes #23
|
2017-09-19 17:08:51 -06:00 |
|
|
|
d1cdced138
|
Merge branch 'roles' into 'master'
Send users a PM with their roles
See merge request ldooks/dragon-bot!39
|
2017-09-14 20:28:05 +00:00 |
|
|
|
4eb33e374d
|
Send users a PM with their roles
|
2017-09-14 20:28:04 +00:00 |
|
Luke Robles
|
236d78f0d8
|
Updating pipeline url
|
2017-09-11 11:02:20 -07:00 |
|
|
|
0dc058508a
|
Merge branch 'redoing_help' into 'master'
Rewrite of the help output. now it will PM you
See merge request !37
|
2017-09-05 15:48:38 +00:00 |
|
Jason Ji
|
c82597635a
|
it works lol
|
2017-09-04 17:56:44 -07:00 |
|
Jason Ji
|
f672f5a5f1
|
pyowm xd
|
2017-09-04 13:59:37 -07:00 |
|
Jason Ji
|
45a759ba6a
|
weather memes
|
2017-09-04 13:55:18 -07:00 |
|
Luke Robles
|
03eef33b9a
|
Rewrite of the help output. now it will PM you
|
2017-09-02 00:56:34 -04:00 |
|
Luke Robles
|
3702b58de4
|
Updating readme
|
2017-08-31 21:50:25 -07:00 |
|
|
|
622c813a18
|
Merge branch 'worksafe_module' into 'master'
Remove bad words from the danbooru search. Fixes #24
Closes #24
See merge request !35
|
2017-08-24 05:36:37 +00:00 |
|
Luke Robles
|
89864801b3
|
Remove bad words from the danbooru search. Fixes #24
|
2017-08-23 20:36:05 -07:00 |
|
Luke Robles
|
f6db134e49
|
Spacing to wallpaer module
|
2017-08-20 16:27:09 -05:00 |
|
Luke Robles
|
22c9f954c5
|
Move the avatar stuff into its own module to keep things clean
|
2017-08-20 14:40:41 -05:00 |
|
|
|
f9a82feb76
|
Merge branch 'reddit_image' into 'master'
randomize profile pic on launch and create a get from reddit function
See merge request !33
|
2017-08-20 16:50:18 +00:00 |
|
|
|
d78c043a15
|
randomize profile pic on launch and create a get from reddit function
|
2017-08-20 16:50:17 +00:00 |
|
Luke Robles
|
c556d67b1a
|
Removing unnecessary else
|
2017-08-19 18:03:04 -05:00 |
|
|
|
28f9fdd3b0
|
Merge branch 'fix_lewd' into 'master'
Actually return a link
See merge request !32
|
2017-08-19 23:01:10 +00:00 |
|
Luke Robles
|
17eace836d
|
Actually return a link
|
2017-08-19 17:56:30 -05:00 |
|
|
|
c419c4fc6f
|
Merge branch 'role_check' into 'master'
Really big PR. Building out a role check module and linting a lot of the bot…
Closes #22
See merge request !31
|
2017-08-19 01:18:01 +00:00 |
|
Luke Robles
|
17cd95d971
|
Really big PR.\nBuilding out a role check module and linting a lot of the bot for cleanliness. Fixes #22
|
2017-08-18 17:22:15 -05:00 |
|
