|
|
737f306410
|
Merge branch 'stock' into 'master'
fixed?
See merge request ldooks/dragon-bot!49
|
2017-09-25 03:14:36 +00:00 |
|
Jason Ji
|
ef4992152d
|
fixed?
|
2017-09-24 18:25:22 -07:00 |
|
Jason Ji
|
311e4aa34b
|
Merge branch 'stock' into 'master'
stock
See merge request ldooks/dragon-bot!48
|
2017-09-25 01:04:59 +00:00 |
|
Jason Ji
|
eadaca1b76
|
stock help msg
|
2017-09-24 17:59:20 -07:00 |
|
Jason Ji
|
5a711b34d5
|
stock plugin mk1
|
2017-09-24 17:31:03 -07:00 |
|
Jason Ji
|
1ca27f890e
|
Merge branch 'weather' into 'master'
Weather
See merge request ldooks/dragon-bot!47
|
2017-09-24 21:13:37 +00:00 |
|
Jason Ji
|
ad3ebc5a7c
|
clean up clean up
|
2017-09-24 12:06:45 -07:00 |
|
Jason Ji
|
d8c3dd00e2
|
Merge branch 'weather' of https://gitlab.com/ldooks/dragon-bot into weather
|
2017-09-24 12:00:12 -07:00 |
|
Jason Ji
|
0c4a3abf23
|
code cleanup
|
2017-09-24 11:59:57 -07:00 |
|
Jason Ji
|
a1f8b9b381
|
Merge branch 'master' into 'weather'
# Conflicts:
# app/dragon-bot.py
# app/help_methods.py
|
2017-09-22 20:18:09 +00:00 |
|
|
|
6d1b09bb16
|
Smug faces yall
|
2017-09-22 13:00:22 -07:00 |
|
Jason Ji
|
c23fd43b51
|
prints emoji for current status weather
|
2017-09-21 23:51:23 -07:00 |
|
Jason Ji
|
b98adee81b
|
Merge branch 'pout' into 'master'
Adding pout
See merge request ldooks/dragon-bot!46
|
2017-09-22 06:42:37 +00:00 |
|
|
|
42621e395f
|
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 |
|
|
|
975358d003
|
Fixing the fucked up help output
|
2017-09-22 05:20:37 +00:00 |
|
|
|
6f3d6db5d6
|
Adding pout
|
2017-09-21 21:31:54 -07:00 |
|
|
|
8eafaa54ba
|
Merge branch 'weather' into 'master'
Weather
See merge request ldooks/dragon-bot!44
|
2017-09-22 03:53:06 +00:00 |
|
Jason Ji
|
7097a266c6
|
Weather
|
2017-09-22 03:53:06 +00:00 |
|
Jason Ji
|
e6dfe0ef90
|
updated help for weather
|
2017-09-21 19:09:52 -07:00 |
|
Jason Ji
|
6ab5197242
|
janky fix to handle messages
|
2017-09-21 18:40:46 -07:00 |
|
Jason Ji
|
df156c351b
|
fixed variable name issue
|
2017-09-21 18:34:01 -07:00 |
|
Jason Ji
|
3ecad82a28
|
handling string inputs properly
|
2017-09-21 18:31:34 -07:00 |
|
Jason Ji
|
7c60380ba9
|
Merge branch 'weather' of https://gitlab.com/ldooks/dragon-bot into weather
|
2017-09-21 18:30:49 -07:00 |
|
Jason Ji
|
4a59bd0506
|
handle string inputs
|
2017-09-21 18:30:34 -07:00 |
|
Jason Ji
|
d8f2cbd9d7
|
fixed message handling for weather
|
2017-09-22 01:18:58 +00:00 |
|
Jason Ji
|
2e4354bc71
|
Merge remote-tracking branch 'refs/remotes/origin/weather' into weather
|
2017-09-21 18:08:18 -07:00 |
|
Jason Ji
|
f19ab88534
|
shoot me in the face i forgot to add this
|
2017-09-21 18:06:35 -07:00 |
|
Jason Ji
|
2adfaa0a51
|
Merge branch 'weather' into 'master'
weather
See merge request ldooks/dragon-bot!38
|
2017-09-22 01:01:22 +00:00 |
|
Jason Ji
|
2c5907d6ec
|
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
|
2fb964b5b3
|
weather 2.0 - added emojis, made things look nicer
|
2017-09-21 17:50:36 -07:00 |
|
|
|
bae7b00f75
|
change cleanup number to 10
|
2017-09-21 16:18:46 -07:00 |
|
|
|
a06abca026
|
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
|
8b00f273b3
|
added help message for homepage
|
2017-09-20 16:37:33 +00:00 |
|
Tyler Hodapp
|
9029d631ae
|
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
|
9a7d24bcbb
|
Add support for fuckinghomepage.com. Fixes #23
|
2017-09-19 17:08:51 -06:00 |
|
|
|
204b14cc1e
|
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 |
|
|
|
1e48dc1d10
|
Send users a PM with their roles
|
2017-09-14 20:28:04 +00:00 |
|
|
|
3ca9a13aa6
|
Updating pipeline url
|
2017-09-11 11:02:20 -07:00 |
|
|
|
114ef38768
|
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
|
9b42ebfb16
|
it works lol
|
2017-09-04 17:56:44 -07:00 |
|
Jason Ji
|
2d3d8cf10d
|
pyowm xd
|
2017-09-04 13:59:37 -07:00 |
|
Jason Ji
|
5f9f68fc74
|
weather memes
|
2017-09-04 13:55:18 -07:00 |
|
|
|
50605eb589
|
Rewrite of the help output. now it will PM you
|
2017-09-02 00:56:34 -04:00 |
|
|
|
73c1bc1fd6
|
Updating readme
|
2017-08-31 21:50:25 -07:00 |
|
|
|
84b156aa9a
|
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 |
|
|
|
895dbb345d
|
Remove bad words from the danbooru search. Fixes #24
|
2017-08-23 20:36:05 -07:00 |
|
|
|
534301ebec
|
Spacing to wallpaer module
|
2017-08-20 16:27:09 -05:00 |
|
|
|
560f8a503a
|
Move the avatar stuff into its own module to keep things clean
|
2017-08-20 14:40:41 -05:00 |
|
|
|
c9ce94c73e
|
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 |
|
|
|
726c8424bb
|
randomize profile pic on launch and create a get from reddit function
|
2017-08-20 16:50:17 +00:00 |
|
