Merge Rewrite into Master #2
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit ee869e5.
…tures/clientconfigs
New Client Configs Feature
* Add ClientRank to User * Add Nickname and Colour objects to User
|
This PR has been automatically built and hosted by our build system, you can access it here: https://2.chatchain.co |
Redesign WebApp for new style and layout. Major Thanks to: * AnotherFoxGuy * PoroUsedSnax * SnaddyVitch-Dispenser * tobias-g
|
This PR has been automatically built and hosted by our build system, you can access it here: https://2.chatchain.co |
* Seperate .Net Core Identity out of WebApp and into IdentityServer4. * Create ChatChainCommon lib to store files and such between services. * Switch configuration to IOptions instead of plain environment variables * Fix stuff and stuff
|
This PR has been automatically built and hosted by our build system, you can access it here: https://2.chatchain.co |
Moves clients and groups into organisations instead of users, allows inviting other users into an organisation, permissions, etc.
|
This PR has been automatically built and hosted by our build system, you can access it here: https://2.chatchain.co |
|
This PR has been automatically built and hosted by our build system, you can access it here: https://2.chatchain.co |
|
This PR has been automatically built and hosted by our build system, you can access it here: https://2.chatchain.co |
* Update UserEventUseCase.cs * Update ClientEventUseCase.cs
* Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile
* Working on Auth and Docker-Services- * Adding services to the docker-compose file * fix Dockerfile * Update README.md * update to 2.1.301 * Updating to newer ASP.Net core packages and Container references * Fixing discordian server compile via docker. * Working! * Clean Architecture working! * Rework Hub and hopefully get everything working * All dockerfiles setup and fixed * Should have fixed everything * Codacy 1 * Codacy 2 * Init, should be working * Update Dockerfile * fix runtime error * allow for requests by group as well * fix stats request * Send Client object along with StatsResponse * init * Revert "Merge remote-tracking branch 'origin/master' into event-changes" This reverts commit ee869e5. * Server <-> Server communication * changes * add simple startup script * global.json * Update Dockerfile * Update Dockerfile * Update appsettings.json * Update appsettings.json * change hub name * update to 2.1.301 * Update Dockerfile * rename * update sdk * testing * init * commit * rewriting and stuff * commit * commit * commit * Debug * testing * Push * Move to MongoDB * Moved to MongoDB and Fully Functioning! * Docker added * whoops..... * Ocelot and more docker * changes * docker testing * commit * commit * coomit * remove some html stuff * redis backplane * wait * docker wait * test * test * test2 * test3 * PublicOrigin * testing * testing2 * testing3 * testing * testing2 * testing3 * testing4 * testing5 * testing6 * testing7 * testing8 * identityserver mongodb testing * testing1 * testing2 * testing3 * testing4 * testing5 * testing6 * testing7 wtf * testing8 * testing9 holy cow * testing10 * testing11 * testing12 * testing13 * testing14 * testing15 * testing16 * testing17 -- possible revert * fixy fix * testing18 * testing19 -- possible revert * testing20 * testing21 * testing22 * testing23 * testing24 -- dumbo * testing15 * testing16 * testing25 * testing26 * testing27 * testing28 * testing29 * testing30 * testing31 * testing32 * testing33 * testing34 * testing35 * testing36 * testing37 -- previous works btw * testing38 * testing39 * testing40 * testing41 * testing42 * testing43 * testing44 * testing45 * test46 * testing47 * testing48 * testing49 * testing * testing50 * testing51 * testing52 * testing53 * testing54 * 5 * testing56 * testing57 * testing58 * testing59 * testing60 * testing61 * testing62 * testing63 * Cleanup the code a bunch * Change methods and names to be more meaningful * Allow for Extra data to be given with Client and User events * Add Client and Group Description fields - Testing 1 * Hotfix client/groups * Client/Groups files extra comment * Allow server to work without an email sender setup * Fix last commit maybe * Again try and fix last commit * Rename IdentityServer WebApp to just WebApp * Fix for previous * Delete .DS_Store * Delete global.json * Update ChatChainHub.cs * Update ChatChainHub.cs * Update ChatChainHub.cs * Update ChatChainHub.cs * Update ChatChainHub.cs * Update ChatChainHub.cs * Update ChatChainHub.cs * Update Index.cshtml * Delete .DS_Store * Delete .DS_Store * Fix Namespaces * Test One * Fix 1 * Test two * fix * fix 2 * fix 3 * test Three * test Four * test Four - fix * test Four - fix * test Four - fix - that was dumb * test Five * test Six * test Seven * test Seven - fix * test Eight * test nine -- make it look prettier * Test 10 with Hub * Update Startup.cs * Update Startup.cs * Update Startup.cs * Update Startup.cs * Update Startup.cs * Update README.md * Update ChatChainHub.cs * better wording * remove Unused object * remove Unused object and a couple comments * Update README.md * Update README.md * Client/User Ranks feature (#7) * Add ClientRank to User * Add Nickname and Colour objects to User * Website redesign (#29) Redesign WebApp for new style and layout. Major Thanks to: * AnotherFoxGuy * PoroUsedSnax * SnaddyVitch-Dispenser * tobias-g * Seperate Accounts from WebApp (#31) * Seperate .Net Core Identity out of WebApp and into IdentityServer4. * Create ChatChainCommon lib to store files and such between services. * Switch configuration to IOptions instead of plain environment variables * Fix stuff and stuff * Organisations! (#32) Moves clients and groups into organisations instead of users, allows inviting other users into an organisation, permissions, etc. * Hotfix Permissions display and saving * Working! * Clean Architecture working! * Rework Hub and hopefully get everything working * All dockerfiles setup and fixed * Should have fixed everything * Codacy 1 * Codacy 2 * Init, should be working * Update Dockerfile * fix runtime error * allow for requests by group as well * fix stats request * Send Client object along with StatsResponse * commit * working * fixes * fix docker files Co-authored-by: Marc Hermans <[email protected]> Co-authored-by: Edgar <[email protected]>
* Update UserEventUseCase.cs * Update ClientEventUseCase.cs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is where ChatChain begins, once this is ready and merged it will be version 1.0 of the ChatChain service!
Features so far: