Code

Merge staging to master#39

Code

Closed

lancej1022 wants to merge 76 commits intoteam-snapdesk:masterteam-snapdesk/snapdesk:masterfrom snapdesk:stagingsnapdesk/snapdesk:stagingCopy head branch name to clipboard

+1,728-575

Commits

Commits on Feb 26, 2020

• added linting/formatting rules

  

  Lance Jeffers

  committed
  343d463

  Copy full SHA for 343d463

• Merge pull request #1 from lancej1022/format

  Show description for fed2ce3
  

  lancej1022

  authored
  fed2ce3

  Copy full SHA for fed2ce3

• Problem: <Some sort of bug or missing functionality>

  MrAustin2u

  committed
  6a08161

  Copy full SHA for 6a08161

• Merge branch 'master' of https://github.com/snapdesk/snapdesk

  MrAustin2u

  committed
  ea18299

  Copy full SHA for ea18299

• added eslint rule

  

  Lance Jeffers

  committed
  0c9cce6

  Copy full SHA for 0c9cce6

• Merge pull request #2 from lancej1022/eslint

  Show description for 762e859
  

  lancej1022

  authored
  762e859

  Copy full SHA for 762e859

• created a basic bootstrap menu

  

  Lance Jeffers

  committed
  512beb0

  Copy full SHA for 512beb0

• Merge pull request #3 from lancej1022/menu

  Show description for 4e3d5f0
  

  lancej1022

  authored
  4e3d5f0

  Copy full SHA for 4e3d5f0

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk

  MrAustin2u

  committed
  6a59e34

  Copy full SHA for 6a59e34

• adding prettier config

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  a4549d7

  Copy full SHA for a4549d7

• Merge pull request #4 from MrAustin2u/database

  Show description for d8976e6
  

  lancej1022

  authored
  d8976e6

  Copy full SHA for d8976e6

• adminDash in progress

  

  Lance Jeffers

  committed
  e208fd4

  Copy full SHA for e208fd4

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  21c6aeb

  Copy full SHA for 21c6aeb

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into resolveTicket

  

  Lance Jeffers

  committed
  6a2df52

  Copy full SHA for 6a2df52

• created a working resolve button -- waiting on endpoint to be finished

  

  Lance Jeffers

  committed
  685eb3c

  Copy full SHA for 685eb3c

• setup accept functionality route and middleware

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  a04ef14

  Copy full SHA for a04ef14

• Merge pull request #5 from lancej1022/resolveTicket

  Show description for 2180360
  

  lancej1022

  authored
  2180360

  Copy full SHA for 2180360

• Merge branch 'staging' into acceptRoute

  

  lancej1022

  authored
  489de0f

  Copy full SHA for 489de0f

• Merge pull request #6 from JessikeeCW/acceptRoute

  Show description for 3e3d15b
  

  lancej1022

  authored
  3e3d15b

  Copy full SHA for 3e3d15b

• ignore this

  

  Lance Jeffers

  committed
  351d8d0

  Copy full SHA for 351d8d0

• conflicts

  

  Lance Jeffers

  committed
  608bd8b

  Copy full SHA for 608bd8b

• Revert "Merge pull request #6 from JessikeeCW/acceptRoute"

  Show description for 0f44ef1
  

  lancej1022

  committed
  0f44ef1

  Copy full SHA for 0f44ef1

• Revert "Revert "Merge pull request #6 from JessikeeCW/acceptRoute""

  Show description for a2a3cd4
  

  lancej1022

  committed
  a2a3cd4

  Copy full SHA for a2a3cd4

• round 2

  

  lancej1022

  committed
  45ec214

  Copy full SHA for 45ec214

• Merge pull request #7 from lancej1022/resolveTicket

  Show description for 0e7a093
  

  lancej1022

  authored
  0e7a093

  Copy full SHA for 0e7a093

• Revert previous 2 commits: round2, PR5 merge

  

  lancej1022

  committed
  f6f29ff

  Copy full SHA for f6f29ff

• Merge pull request #8 from lancej1022/resolveTicket

  Show description for fb26342
  

  lancej1022

  authored
  fb26342

  Copy full SHA for fb26342

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into staging

  

  lancej1022

  committed
  4d46abe

  Copy full SHA for 4d46abe

Commits on Feb 27, 2020

• added accept and resolve route handler

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  043e918

  Copy full SHA for 043e918

• Merge pull request #9 from JessikeeCW/accept-resolve-router

  Show description for c6ad45a
  

  lancej1022

  authored
  c6ad45a

  Copy full SHA for c6ad45a

• working on resolve functionality

  

  lancej1022

  committed
  ff3db9c

  Copy full SHA for ff3db9c

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into staging

  

  lancej1022

  committed
  29e56a9

  Copy full SHA for 29e56a9

• Merge branch 'staging' into resolveWork

  

  lancej1022

  committed
  0670bec

  Copy full SHA for 0670bec

• created acceptTicket action in ticketAction file

  

  anthony flores

  authored and

  anthony flores

  committed
  a19f009

  Copy full SHA for a19f009

• Merge branch 'staging' into acceptTicket

  Show description for 0e55a85
  

  anthony flores

  authored and

  anthony flores

  committed
  0e55a85

  Copy full SHA for 0e55a85

• added route for cancel button

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  23fe9f3

  Copy full SHA for 23fe9f3

• Merge pull request #10 from JessikeeCW/cancel-route

  Show description for a386679
  

  lancej1022

  authored
  a386679

  Copy full SHA for a386679

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into staging

  

  lancej1022

  committed
  fcce9e6

  Copy full SHA for fcce9e6

• Merge branch 'staging' into resolveWork

  

  lancej1022

  committed
  57300b7

  Copy full SHA for 57300b7

• Merge branch 'staging' into acceptTicket

  

  anthony flores

  authored and

  anthony flores

  committed
  39fbc2e

  Copy full SHA for 39fbc2e

• Created middleware and server routes for organization tickets.

  MrAustin2u

  committed
  e8ed11a

  Copy full SHA for e8ed11a

• Merge pull request #11 from MrAustin2u/orgticket

  Show description for ee790a5
  

  lancej1022

  authored
  ee790a5

  Copy full SHA for ee790a5

• working

  

  lancej1022

  committed
  40aff05

  Copy full SHA for 40aff05

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into staging

  

  lancej1022

  committed
  b3639b7

  Copy full SHA for b3639b7

• adding accept ticket functionality

  

  anthony flores

  authored and

  anthony flores

  committed
  75ab0fd

  Copy full SHA for 75ab0fd

• Merge branch 'staging' into acceptTicket

  

  anthony flores

  authored and

  anthony flores

  committed
  f5889ee

  Copy full SHA for f5889ee

• fixed addTicket parseInt issue where we aren't able to create tickets

  ch-brian

  committed
  680c5b0

  Copy full SHA for 680c5b0

• Merge pull request #12 from floresa22/acceptTicket

  Show description for 412bd20
  

  lancej1022

  authored
  412bd20

  Copy full SHA for 412bd20

• finished resolve functionality

  

  lancej1022

  committed
  13e51cd

  Copy full SHA for 13e51cd

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into staging

  

  lancej1022

  committed
  fdfb362

  Copy full SHA for fdfb362

• Merge pull request #13 from ch-brian/addTicketBug

  Show description for cc608c5
  

  lancej1022

  authored
  cc608c5

  Copy full SHA for cc608c5

• updated

  

  lancej1022

  committed
  d23ea1a

  Copy full SHA for d23ea1a

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into staging

  

  lancej1022

  committed
  6c49a34

  Copy full SHA for 6c49a34

• added ticketid to the ticketActions

  

  lancej1022

  committed
  4f94aa7

  Copy full SHA for 4f94aa7

• Merge pull request #14 from lancej1022/resolveWork

  Show description for f138f60
  

  lancej1022

  authored
  f138f60

  Copy full SHA for f138f60

• Created conditional logic for whether in dev or production mode to redirect to localhost:3000 or localhost:8080

  MrAustin2u

  committed
  c986b63

  Copy full SHA for c986b63

• Merge branch 'staging' into updateUrl

  MrAustin2u

  committed
  eebe505

  Copy full SHA for eebe505

• Merge pull request #15 from MrAustin2u/updateUrl

  Show description for 0f2a994
  

  lancej1022

  authored
  0f2a994

  Copy full SHA for 0f2a994

• fixed bugs with accept button. accept button now properly queries database. cancel button now properly queries database.

  ch-brian

  committed
  7ab7e41

  Copy full SHA for 7ab7e41

• Merge pull request #16 from ch-brian/staging

  Show description for b34be48
  

  lancej1022

  authored
  b34be48

  Copy full SHA for b34be48

• working on home page

  

  lancej1022

  committed
  bddcf24

  Copy full SHA for bddcf24

• Merge branch 'staging' into homepage

  

  lancej1022

  committed
  d4bf75a

  Copy full SHA for d4bf75a

• redesigned home page

  

  lancej1022

  committed
  eff7fc1

  Copy full SHA for eff7fc1

• Merge pull request #17 from lancej1022/homepage

  Show description for 9d45532
  

  lancej1022

  authored
  9d45532

  Copy full SHA for 9d45532

• Refactor on patch request endpoints to make code DRYer. Attempt to style pending buttons but getting overridden by css

  ch-brian

  committed
  2f5883e

  Copy full SHA for 2f5883e

• Merge pull request #18 from ch-brian/newRoutesForPatch

  Show description for 7d8c7b9
  

  lancej1022

  authored
  7d8c7b9

  Copy full SHA for 7d8c7b9

• AdminDashboard now has access to redux store

  ch-brian

  committed
  7d36ab9

  Copy full SHA for 7d36ab9

• added admin boolean. Created an endpoint for organization/users and a query to select all users from an organization.

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  e1d1793

  Copy full SHA for e1d1793

• Merge branch 'staging' of https://github.com/snapdesk/snapdesk into staging

  ch-brian

  committed
  4feafdd

  Copy full SHA for 4feafdd

• Merge pull request #19 from ch-brian/newRoutesForPatch

  Show description for f683268
  

  lancej1022

  authored
  f683268

  Copy full SHA for f683268

• updated admin data type to be boolean. default is set to false

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  afc4783

  Copy full SHA for afc4783

• Merge branch 'staging' into adminboolean

  

  Jessika Campbell

  authored and

  Jessika Campbell

  committed
  ed44aa9

  Copy full SHA for ed44aa9

• Merge pull request #21 from JessikeeCW/adminboolean

  Show description for b968d8a
  

  lancej1022

  authored
  b968d8a

  Copy full SHA for b968d8a

• adminDash Redux Boilerplate

  ch-brian

  committed
  3f71953

  Copy full SHA for 3f71953

• merging upstream staging to adminDash boilerplate

  ch-brian

  committed
  f94d837

  Copy full SHA for f94d837

• Merge pull request #22 from ch-brian/adminDash

  Show description for 19b4b73
  

  lancej1022

  authored
  19b4b73

  Copy full SHA for 19b4b73