-
Notifications
You must be signed in to change notification settings - Fork 79
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.
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
Beginning of Settings Page #406
Open
jonrossca
wants to merge
55
commits into
flackr:server
Choose a base branch
from
jonrossca:ui
base: server
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
cb83129
make a ui
jonrossca af2fc9c
Merge branch 'server' into ui
jonrossca 4fc89b6
rawr irc
jonrossca b179782
focus passing and enter commits
jonrossca cd99d00
beginning to style forms
jonrossca 243f6a5
submit on enter, styling forms
jonrossca 96918c4
start building server/channel panel
jonrossca 259b78d
testing
jonrossca 7a15ac0
merge
jonrossca 038b9fb
fixing merge
jonrossca 9c5304f
jump to main if connected
jonrossca f548430
checkpoint
jonrossca a65fba6
Merge branch 'server' into ui
jonrossca 2f91c37
fix for host
jonrossca 3c0af83
Merge branch 'server' into ui
jonrossca 361cf15
update list to handle new client state format
jonrossca 1ccf340
add channels as they are joined
jonrossca 4d6b5bf
fix list creation
jonrossca 94a1d84
set spot to trigger channel changes
jonrossca c088813
Merge branch 'server' of github.com:flackr/circ into server
jonrossca 0f21838
working left side
jonrossca 8d04a48
cleanup of testing styles
jonrossca b342247
update the UI
jonrossca f5a459a
spacing
jonrossca 2a3b5b7
dismiss side on selection
jonrossca 26987ad
update style of disbaled buttons
jonrossca 8df6795
Merge branch 'server' of github.com:flackr/circ into server
jonrossca 97c0d45
Merge remote-tracking branch 'origin/server' into ui
jonrossca bbfa502
show incoming messages
jonrossca 84cc30a
Merge branch 'server' of github.com:flackr/circ into server
jonrossca 8f814f2
Merge remote-tracking branch 'origin/server' into ui
jonrossca 363a9f7
missing js file
jonrossca 149ae65
load channel events
jonrossca f83c716
fix merge
jonrossca 876f704
messages can now be styled
jonrossca 611effd
remove old message parsing
jonrossca d9443a0
setup for settings and other functions
jonrossca cdf528b
launch server screen from side panel:
jonrossca 39b593d
server dialog hooked up
jonrossca 4627e5c
Merge remote-tracking branch 'origin/server' into ui
jonrossca 35a07fc
update creation logic for room list
jonrossca 711a1f4
Merge branch 'server' of github.com:flackr/circ into server
jonrossca 9b13531
Merge branch 'server' into ui
jonrossca f42aca0
history of input
jonrossca 6be3c6e
change creation of pages to prevent duplication
jonrossca c6d5df5
minor graphics tweaks
jonrossca 7a820ac
redo connect buttons
jonrossca 028f55b
vertically align headers
jonrossca f4b0625
fix merge
jonrossca 166edae
fix see through settings
jonrossca 997a61a
stop using visibility instead of display. also address code review
jonrossca 3077f43
fix tabs
jonrossca 39bef96
initial settings work, first toggle button
jonrossca 5d30aeb
Merge remote-tracking branch 'origin/server' into ui
jonrossca d244c7d
set background on new settings page
jonrossca File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like it will send the raw text, as well as parse the IRC command (lines 324-325). I think maybe this is a bad merge and these lines should be removed.