Code

sa#40

Code

Open

f6reyes wants to merge 68 commits intoDesignAtLarge:masterDesignAtLarge/ixd-skeleton:masterfrom lkryan:masterlkryan/cogs120-clf:masterCopy head branch name to clipboard

+1,943-9

Commits

Commits on Feb 18, 2021

• Added the second screen w/stylesheets and js

  lkryan

  committed
  98ab2e4

  Copy full SHA for 98ab2e4

• added both pages

  lkryan

  committed
  f40730a

  Copy full SHA for f40730a

• added club route

  

  ck-ho

  committed
  1f9d292

  Copy full SHA for 1f9d292

Commits on Feb 19, 2021

• Updated placeholder

  lkryan

  committed
  4d91c5e

  Copy full SHA for 4d91c5e

• Merge branch 'master' of https://github.com/lkryan/cogs120-clf

  Show description for 35f0fe7
  lkryan

  committed
  35f0fe7

  Copy full SHA for 35f0fe7

• added back button

  lkryan

  committed
  6ed9a90

  Copy full SHA for 6ed9a90

• k

  lkryan

  committed
  8176197

  Copy full SHA for 8176197

Commits on Feb 21, 2021

• bigger margin

  

  ck-ho

  committed
  4952700

  Copy full SHA for 4952700

• bigger margin

  

  ck-ho

  committed
  8d4be3d

  Copy full SHA for 8d4be3d

Commits on Feb 23, 2021

• Increased dimensions, made white

  lkryan

  committed
  a4bfaac

  Copy full SHA for a4bfaac

• added event page

  lkryan

  committed
  4052c53

  Copy full SHA for 4052c53

Commits on Feb 24, 2021

• added json and calendar

  f6reyes

  committed
  10b1078

  Copy full SHA for 10b1078

Commits on Feb 25, 2021

• login 1

  

  ck-ho

  committed
  e2493fe

  Copy full SHA for e2493fe

• login 1

  

  ck-ho

  committed
  b29cc66

  Copy full SHA for b29cc66

• added JSON

  

  ck-ho

  committed
  73a12c8

  Copy full SHA for 73a12c8

• added the saved events using json

  f6reyes

  committed
  3849b71

  Copy full SHA for 3849b71

Commits on Feb 26, 2021

• added json and calendar

  f6reyes

  committed
  ce89425

  Copy full SHA for ce89425

• fixed button, added modal

  lkryan

  committed
  8ab1508

  Copy full SHA for 8ab1508

• fixed link

  

  ck-ho

  committed
  6c5b23f

  Copy full SHA for 6c5b23f

• add link

  

  ck-ho

  committed
  2a55509

  Copy full SHA for 2a55509

• added json and calendar

  f6reyes

  committed
  7b1cb90

  Copy full SHA for 7b1cb90

• added json and calendar

  f6reyes

  committed
  aece439

  Copy full SHA for aece439

• added diff club events

  f6reyes

  committed
  4e7f7b0

  Copy full SHA for 4e7f7b0

• fixed typo

  lkryan

  committed
  f5dfb6d

  Copy full SHA for f5dfb6d

• fixes

  

  ck-ho

  committed
  7ee5d3d

  Copy full SHA for 7ee5d3d

• framework for heart click

  lkryan

  committed
  d7e0a52

  Copy full SHA for d7e0a52

• fixes

  

  ck-ho

  committed
  3c23a8f

  Copy full SHA for 3c23a8f

• fix login

  

  ck-ho

  committed
  6c75d3c

  Copy full SHA for 6c75d3c

• club description fix

  

  ck-ho

  committed
  8ba33c1

  Copy full SHA for 8ba33c1

• added first handler

  lkryan

  committed
  dc7b031

  Copy full SHA for dc7b031

• Merge branch 'master' of https://github.com/lkryan/cogs120-clf

  lkryan

  committed
  db3e2b2

  Copy full SHA for db3e2b2

• js file

  lkryan

  committed
  07c347d

  Copy full SHA for 07c347d

• Added a shiton of hearts

  lkryan

  committed
  fc4f3b6

  Copy full SHA for fc4f3b6

• Finishing touches on Club screen

  lkryan

  committed
  e4f03bd

  Copy full SHA for e4f03bd

• updates

  lkryan

  committed
  be03fd5

  Copy full SHA for be03fd5

• club json

  f6reyes

  committed
  c3b4ecd

  Copy full SHA for c3b4ecd

• more updates

  lkryan

  committed
  99e79c6

  Copy full SHA for 99e79c6

• admendum

  lkryan

  committed
  6d340c7

  Copy full SHA for 6d340c7

Commits on Mar 2, 2021

• responsive mode & google sign-in

  

  ck-ho

  committed
  77c799f

  Copy full SHA for 77c799f

Commits on Mar 3, 2021

• combined click functions

  lkryan

  committed
  7fd4b67

  Copy full SHA for 7fd4b67

• Made a series of changes, couldn't figure out json fml

  lkryan

  committed
  877454a

  Copy full SHA for 877454a

• Merge branch 'master' of https://github.com/lkryan/cogs120-clf

  f6reyes

  committed
  3bde8d9

  Copy full SHA for 3bde8d9

• Merge branch 'master' of https://github.com/lkryan/cogs120-clf

  f6reyes

  committed
  2afdaf5

  Copy full SHA for 2afdaf5

• delete

  lkryan

  committed
  623ab7c

  Copy full SHA for 623ab7c

Commits on Mar 4, 2021

• lawn photo

  lkryan

  committed
  030f194

  Copy full SHA for 030f194

• added seperate clubs

  lkryan

  committed
  7938bb4

  Copy full SHA for 7938bb4

• login new index

  

  ck-ho

  committed
  299db8f

  Copy full SHA for 299db8f

• somework on the push

  f6reyes

  committed
  ac9b419

  Copy full SHA for ac9b419

Commits on Mar 5, 2021

• fked up event page

  f6reyes

  committed
  dd665ad

  Copy full SHA for dd665ad

• couldnt do .get/.push

  f6reyes

  committed
  6f07fb7

  Copy full SHA for 6f07fb7

• test

  

  ck-ho

  committed
  46aec1d

  Copy full SHA for 46aec1d

• test

  

  ck-ho

  committed
  e1b90be

  Copy full SHA for e1b90be

• version fix

  

  ck-ho

  committed
  00ddc94

  Copy full SHA for 00ddc94

• header link

  

  ck-ho

  committed
  5992fcb

  Copy full SHA for 5992fcb

Commits on Mar 8, 2021

• Cleaned up header

  lkryan

  committed
  1f258db

  Copy full SHA for 1f258db

Commits on Mar 11, 2021

• finsished the add event

  lkryan

  committed
  d1b4c53

  Copy full SHA for d1b4c53

Commits on Mar 12, 2021

• css

  

  ck-ho

  committed
  f1a0169

  Copy full SHA for f1a0169

• Images

  lkryan

  committed
  7b0e4e8

  Copy full SHA for 7b0e4e8

• updated color

  lkryan

  committed
  442862f

  Copy full SHA for 442862f

• updated main club page

  lkryan

  committed
  963d80c

  Copy full SHA for 963d80c

• styling overhaul

  

  ck-ho

  committed
  088e63a

  Copy full SHA for 088e63a

• updated blue

  lkryan

  committed
  767be69

  Copy full SHA for 767be69

• white

  lkryan

  committed
  6689ca3

  Copy full SHA for 6689ca3

Commits on Mar 13, 2021

• added some hierarchy for upcoming and calendar

  f6reyes

  committed
  a350282

  Copy full SHA for a350282

• changes

  lkryan

  committed
  172539d

  Copy full SHA for 172539d

• changes

  lkryan

  committed
  09e96db

  Copy full SHA for 09e96db

• changes

  lkryan

  committed
  b842537

  Copy full SHA for b842537

Commits on Mar 14, 2021

• updated calendar

  lkryan

  committed
  b07eb94

  Copy full SHA for b07eb94