Code

Beginning of Settings Page#406

Code

Open

jonrossca wants to merge 55 commits intoflackr:serverflackr/circ:serverfrom jonrossca:uijonrossca/circ:uiCopy head branch name to clipboard

+109-4

Commits

Commits on Jul 12, 2016

• make a ui

  jonrossca

  committed
  cb83129

  Copy full SHA for cb83129

• Merge branch 'server' into ui

  jonrossca

  committed
  af2fc9c

  Copy full SHA for af2fc9c

• rawr irc

  jonrossca

  committed
  4fc89b6

  Copy full SHA for 4fc89b6

• focus passing and enter commits

  jonrossca

  committed
  b179782

  Copy full SHA for b179782

Commits on Jul 13, 2016

• beginning to style forms

  jonrossca

  committed
  cd99d00

  Copy full SHA for cd99d00

• submit on enter, styling forms

  jonrossca

  committed
  243f6a5

  Copy full SHA for 243f6a5

• start building server/channel panel

  jonrossca

  committed
  96918c4

  Copy full SHA for 96918c4

• testing

  jonrossca

  committed
  259b78d

  Copy full SHA for 259b78d

• merge

  jonrossca

  committed
  7a15ac0

  Copy full SHA for 7a15ac0

• fixing merge

  jonrossca

  committed
  038b9fb

  Copy full SHA for 038b9fb

• jump to main if connected

  jonrossca

  committed
  9c5304f

  Copy full SHA for 9c5304f

• checkpoint

  jonrossca

  committed
  f548430

  Copy full SHA for f548430

• Merge branch 'server' into ui

  jonrossca

  committed
  a65fba6

  Copy full SHA for a65fba6

• fix for host

  jonrossca

  committed
  2f91c37

  Copy full SHA for 2f91c37

• Merge branch 'server' into ui

  jonrossca

  committed
  3c0af83

  Copy full SHA for 3c0af83

• update list to handle new client state format

  jonrossca

  committed
  361cf15

  Copy full SHA for 361cf15

• add channels as they are joined

  jonrossca

  committed
  1ccf340

  Copy full SHA for 1ccf340

• fix list creation

  jonrossca

  committed
  4d6b5bf

  Copy full SHA for 4d6b5bf

• set spot to trigger channel changes

  jonrossca

  committed
  94a1d84

  Copy full SHA for 94a1d84

• Merge branch 'server' of github.com:flackr/circ into server

  jonrossca

  committed
  c088813

  Copy full SHA for c088813

Commits on Jul 14, 2016

• working left side

  jonrossca

  committed
  0f21838

  Copy full SHA for 0f21838

• cleanup of testing styles

  jonrossca

  committed
  8d04a48

  Copy full SHA for 8d04a48

• update the UI

  jonrossca

  committed
  b342247

  Copy full SHA for b342247

• spacing

  jonrossca

  committed
  f5a459a

  Copy full SHA for f5a459a

• dismiss side on selection

  jonrossca

  committed
  2a3b5b7

  Copy full SHA for 2a3b5b7

• update style of disbaled buttons

  jonrossca

  committed
  26987ad

  Copy full SHA for 26987ad

• Merge branch 'server' of github.com:flackr/circ into server

  jonrossca

  committed
  8df6795

  Copy full SHA for 8df6795

• Merge remote-tracking branch 'origin/server' into ui

  jonrossca

  committed
  97c0d45

  Copy full SHA for 97c0d45

• show incoming messages

  jonrossca

  committed
  bbfa502

  Copy full SHA for bbfa502

• Merge branch 'server' of github.com:flackr/circ into server

  jonrossca

  committed
  84cc30a

  Copy full SHA for 84cc30a

• Merge remote-tracking branch 'origin/server' into ui

  jonrossca

  committed
  8f814f2

  Copy full SHA for 8f814f2

• missing js file

  jonrossca

  committed
  363a9f7

  Copy full SHA for 363a9f7

• load channel events

  jonrossca

  committed
  149ae65

  Copy full SHA for 149ae65

• fix merge

  jonrossca

  committed
  f83c716

  Copy full SHA for f83c716

• messages can now be styled

  jonrossca

  committed
  876f704

  Copy full SHA for 876f704

• remove old message parsing

  jonrossca

  committed
  611effd

  Copy full SHA for 611effd

• setup for settings and other functions

  jonrossca

  committed
  d9443a0

  Copy full SHA for d9443a0

• launch server screen from side panel:

  jonrossca

  committed
  cdf528b

  Copy full SHA for cdf528b

• server dialog hooked up

  jonrossca

  committed
  39b593d

  Copy full SHA for 39b593d

• Merge remote-tracking branch 'origin/server' into ui

  jonrossca

  committed
  4627e5c

  Copy full SHA for 4627e5c

• update creation logic for room list

  jonrossca

  committed
  35a07fc

  Copy full SHA for 35a07fc

• Merge branch 'server' of github.com:flackr/circ into server

  jonrossca

  committed
  711a1f4

  Copy full SHA for 711a1f4

• Merge branch 'server' into ui

  jonrossca

  committed
  9b13531

  Copy full SHA for 9b13531

Commits on Jul 15, 2016

• history of input

  jonrossca

  committed
  f42aca0

  Copy full SHA for f42aca0

• change creation of pages to prevent duplication

  jonrossca

  committed
  6be3c6e

  Copy full SHA for 6be3c6e

• minor graphics tweaks

  jonrossca

  committed
  c6d5df5

  Copy full SHA for c6d5df5

• redo connect buttons

  jonrossca

  committed
  7a820ac

  Copy full SHA for 7a820ac

• vertically align headers

  jonrossca

  committed
  028f55b

  Copy full SHA for 028f55b

• fix merge

  jonrossca

  committed
  f4b0625

  Copy full SHA for f4b0625

• fix see through settings

  jonrossca

  committed
  166edae

  Copy full SHA for 166edae

• stop using visibility instead of display. also address code review

  jonrossca

  committed
  997a61a

  Copy full SHA for 997a61a

• fix tabs

  jonrossca

  committed
  3077f43

  Copy full SHA for 3077f43

• initial settings work, first toggle button

  jonrossca

  committed
  39bef96

  Copy full SHA for 39bef96

• Merge remote-tracking branch 'origin/server' into ui

  jonrossca

  committed
  5d30aeb

  Copy full SHA for 5d30aeb

• set background on new settings page

  jonrossca

  committed
  d244c7d

  Copy full SHA for d244c7d