aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'master'Adelyn Breedlove2018-12-21102-12782/+1181
|\
| * Update READMEAdelyn Breelove2018-12-211-4/+4
| * Implement most channel methodsAdelyn Breelove2018-12-213-5/+85
| * Working with Discord's channel bullshitAdelyn Breelove2018-12-206-14/+93
| * Fix member abstraction and helper methodsAdelyn Breelove2018-12-197-42/+327
| * Add proper type parsing to GuildAdelyn Breelove2018-12-193-50/+93
| * More type abstraction stuffAdelyn Breelove2018-12-1912-9/+60
| * Re-arrange autogen serialization files and incorporate into dune fileAdelyn Breelove2018-12-1983-13205/+181
| * Some refactoring of http codeAdelyn Breelove2018-12-175-148/+185
| * More stuffAdelyn Breelove2018-12-178-11/+20
| * Some abstractionsAdelyn Breelove2018-12-1722-189/+1003
| * Add a few sigsAdelyn Breedlove2018-12-175-20/+45
* | Merge branch 'dev' into 'master'Adelyn Breedlove2018-12-15118-1131/+14067
|\|
| * MergingAdelyn Breedlove2018-12-1498-675/+689
| |\
| | * A few metafile updatesAdelyn Breelove2018-12-142-3/+8
| | * Add READMEAdelyn Breelove2018-12-141-0/+26
| | * Add LICENSEAdelyn Breelove2018-12-141-0/+21
| | * A few odds and endsAdelyn Breelove2018-12-142-32/+44
| | * Improve endpoint module and add Message abstractionAdelyn Breelove2018-12-144-208/+195
| | * Working and pretty message replying!Adelyn Breelove2018-12-143-3/+56
| | * Add a helper script for working with atdgenAdelyn Breelove2018-12-141-0/+7
| | * There's a lot going onAdelyn Breelove2018-12-1493-463/+412
| * | Merge branch 'dev' of https://gitlab.com/Mishio595/disml into devAdelyn Breedlove2018-12-1391-310/+12932
| |\|
| | * Fix more dispatch issuesAdelyn Breelove2018-12-1329-286/+926
| | * Working on deriving types from jsonAdelyn Breelove2018-12-1388-266/+12202
| | * Add rate limit handlingAdelyn Breelove2018-12-133-40/+86
| * | Merge branch 'dev' of https://gitlab.com/Mishio595/disml into devAdelyn Breedlove2018-12-1224-217/+286
| |\|
| | * Update my name in disml.opamAdelyn Breelove2018-12-121-2/+2
| | * Fix Sharder.Make sigAdelyn Breelove2018-12-121-1/+1
| | * Complete event dispatchAdelyn Breelove2018-12-128-49/+57
| | * Work on event dispatch and add model derivesAdelyn Breelove2018-12-1219-167/+228
| * | Merge branch 'dev' of https://gitlab.com/Mishio595/disml into devMishio5952018-12-031-4/+35
| |\|
| | * Add retry on connect fail logicAdelyn Breelove2018-12-031-4/+35
| * | Merge branch 'dev' of https://gitlab.com/Mishio595/disml into devMishio5952018-11-301-9/+15
| |\|
| | * Fix the multiple reconnect issueAdelyn Breelove2018-11-301-9/+15
| * | Merge branch 'master' of https://gitlab.com/Mishio595/disml into devMishio5952018-11-302-0/+46
| |\ \ | |/ / |/| / | |/
* | Merge branch 'patch-1' into 'master'Adelyn Breedlove2018-11-191-2/+9
|\ \
| * | Update README.mdAdelyn Breedlove2018-11-191-2/+9
|/ /
* | Merge branch 'patch-1' into 'master'Adelyn Breedlove2018-11-191-0/+18
|\ \
| * | Add READMEAdelyn Breedlove2018-11-191-0/+18
|/ /
* | Merge branch 'add-license' into 'master'Adelyn Breedlove2018-11-191-0/+21
|\ \
| * | Add LICENSEAdelyn Breedlove2018-11-191-0/+21
|/ /
* | Merge branch 'dev' into 'master'Adelyn Breedlove2018-11-193-10/+50
|\ \
* \ \ Merge branch 'dev' into 'master'Adelyn Breedlove2018-11-192-2/+9
|\ \ \
* \ \ \ Merge branch 'dev' into 'master'Adelyn Breedlove2018-11-1816-181/+656
|\ \ \ \
* \ \ \ \ Merge branch 'dev' into 'master'Adelyn Breedlove2018-11-146-60/+142
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'dev' into 'master'Adelyn Breedlove2018-11-103-2/+32
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch 'dev' into 'master'Adelyn Breedlove2018-11-102-34/+69
|\ \ \ \ \ \ \
| | | | | | | * some improvementsMishio5952018-11-301-4/+5
| | | | | | | * Fix all the errors from coding without merlinMishio5952018-11-298-67/+232