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
Luke Robles
29c3416aaf
Merge branch 'master' of gitlab.com:ldooks/dragon-bot
2017-08-18 09:19:24 -07:00
Luke Robles
c044b7d055
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
a6d0946f50
Delete bitbucket-pipelines.yml
2017-08-18 00:01:07 +00:00
Luke Robles
b8542dd755
Fix runner tag
2017-08-17 16:53:40 -07:00
Luke Robles
858e6b11b0
Fix paramenter
2017-08-17 16:52:53 -07:00
Luke Robles
8285dbb92e
Try with build and deploy as one step
2017-08-17 16:51:42 -07:00
Luke Robles
cc91a1151b
updating build step tags
2017-08-17 16:46:15 -07:00
Luke Robles
9c75b2b5a6
Updating docker password variable
2017-08-17 16:44:39 -07:00
Luke Robles
47808e4fdf
trying pipelines again
2017-08-17 16:36:55 -07:00
Luke Robles
d0e583236c
trying with docker in docker image
2017-08-17 16:30:59 -07:00
Luke Robles
e918b095a6
Add all necessary python modules for linting
2017-08-17 16:25:57 -07:00
Luke Robles
9c40975d26
only lint for python errors
2017-08-17 16:24:29 -07:00
Luke Robles
fe24e28e28
Adding pipeline.yml file
2017-08-17 16:23:37 -07:00
Luke Robles
0ce3d5df58
Adding pipeline.yml file
2017-08-17 16:22:02 -07:00
Luke Robles
9021a4e459
Adding pipeline.yml file
2017-08-17 16:21:08 -07:00
Luke Robles
24c89ff5bb
Blocking pushes to master
2017-08-17 12:29:44 -07:00
Luke Robles
a2fd953e02
Cleaning up the test script
2017-08-17 12:22:15 -07:00
68e667f852
Merged in wolfram (pull request #30 )
...
Adding in wolfram alpha functionality, see #21
2017-08-17 18:57:14 +00:00
Luke Robles
abff3e6313
Removing this unnecessary else
2017-08-17 10:23:12 -07:00
Luke Robles
f4911c7eaf
Adding in wolfram alpha functionality
2017-08-17 10:21:29 -07:00
Luke Robles
c15036e413
removing unused imports
2017-08-17 00:28:58 -07:00
