Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First pull/push #169

Closed
wants to merge 16 commits into from
Closed

First pull/push #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
76b346d
Merged with a merge in mac
F9Alejandro Jan 4, 2018
93ee088
Removing conflicting files to start merge
F9Alejandro Sep 8, 2018
5c00e83
New branch merge
F9Alejandro Sep 8, 2018
35b1176
Merge branch 'chalda-master'
F9Alejandro Sep 8, 2018
4782eca
Merging old with new
F9Alejandro Sep 8, 2018
19b80f2
In depth permission system based on Global/User/Role (roles are never…
F9Alejandro Sep 11, 2018
f97afc7
Fixed missing permission check of '*'
F9Alejandro Sep 11, 2018
50c1a4d
Merge branch 'master' into master
F9Alejandro Oct 21, 2018
f416f89
Merge branch 'master' of https://github.com/chalda/DiscordBot into ch…
F9Alejandro Nov 3, 2020
d206850
Merge branch 'chalda-master'
F9Alejandro Nov 3, 2020
e0c2040
Revert to 14e70e5d3befb10418c5a6991e2f5d1f091a2d9c
F9Alejandro Nov 3, 2020
1b78a51
Added userRole toggle as feature request https://github.com/chalda/Di…
F9Alejandro Nov 3, 2020
485519a
UserRole add/remove toggle quick fix
F9Alejandro Nov 8, 2020
d02bf82
Quick revert .gitignore file
F9Alejandro Nov 8, 2020
a09f460
Using linter format on conditional statements
F9Alejandro Nov 8, 2020
b646a0b
Added check of guild permission of member for MANAGE_ROLES
F9Alejandro Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ build/Release
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

#lock file
#package-lock.json

#config files
auth.json
rss.json
Expand Down
Loading