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
d5dcf5d51c
Removing unnecessary else
2017-08-19 18:03:04 -05:00
3d10ccaf89
Merge branch 'fix_lewd' into 'master'
...
Actually return a link
See merge request !32
2017-08-19 23:01:10 +00:00
d784f75763
Actually return a link
2017-08-19 17:56:30 -05:00
8f8f1f25bc
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
8264a780cc
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
ba72688d8d
Merge branch 'master' of gitlab.com:ldooks/dragon-bot
2017-08-18 09:19:24 -07:00
b75a1402d8
Blocking pushes to master
...
Adding pipeline.yml file
Adding pipeline.yml file
Adding pipeline.yml file
only lint for python errors
Add all necessary python modules for linting
trying with docker in docker image
trying pipelines again
Updating docker password variable
updating build step tags
Try with build and deploy as one step
Fix paramenter
Fix runner tag
Delete bitbucket-pipelines.yml
2017-08-18 09:18:49 -07:00
b78cb0c9ce
Delete bitbucket-pipelines.yml
2017-08-18 00:01:07 +00:00
38ad4f823d
Fix runner tag
2017-08-17 16:53:40 -07:00
746c8d1328
Fix paramenter
2017-08-17 16:52:53 -07:00
d7b59bce61
Try with build and deploy as one step
2017-08-17 16:51:42 -07:00
bd462d19aa
updating build step tags
2017-08-17 16:46:15 -07:00
1b90b8c4a5
Updating docker password variable
2017-08-17 16:44:39 -07:00
e44b26e013
trying pipelines again
2017-08-17 16:36:55 -07:00
1f7bd1c62c
trying with docker in docker image
2017-08-17 16:30:59 -07:00
09b3cb7fed
Add all necessary python modules for linting
2017-08-17 16:25:57 -07:00
eae9ba7d86
only lint for python errors
2017-08-17 16:24:29 -07:00
59750ec040
Adding pipeline.yml file
2017-08-17 16:23:37 -07:00
acb4449ecd
Adding pipeline.yml file
2017-08-17 16:22:02 -07:00
0f3415d6a0
Adding pipeline.yml file
2017-08-17 16:21:08 -07:00
41f0b30818
Blocking pushes to master
2017-08-17 12:29:44 -07:00
994c3c9f96
Cleaning up the test script
2017-08-17 12:22:15 -07:00
50515caef5
Merged in wolfram (pull request #30 )
...
Adding in wolfram alpha functionality, see #21
2017-08-17 18:57:14 +00:00
b0d01bb697
Removing this unnecessary else
2017-08-17 10:23:12 -07:00
d6a4e39c0a
Adding in wolfram alpha functionality
2017-08-17 10:21:29 -07:00
615ba38880
removing unused imports
2017-08-17 00:28:58 -07:00
f59c3ce21e
Merged in lewds (pull request #29 )
...
Moving lewds into its own module and alphabatizing all the if statements in dragon-bot.py
2017-08-17 07:28:16 +00:00
cecfb20bab
Also alphabatizing the imports
2017-08-17 00:27:34 -07:00
