GVSU/marten-application
GVSU
/
marten-application
1
0
Fork 0
Code Pull Requests Releases Activity

Commit Graph

  • 55775e10b9 new api keys master Al Duncanson 2019-01-05 12:50:07 -0500
  • 37c5733014
         Merge pull request #75 from alDuncanson/bugfix/little-things Alex Duncanson 2018-12-17 10:51:35 -0500
  • 119f89489b Removed CSS I added that doesn't actually make a difference. WildScotsmen 2018-12-17 01:38:56 -0500
  • 29933ccb71 Fixed issue with background image getting a server error. WildScotsmen 2018-12-17 01:24:15 -0500
  • 2b664334a2 Fixed bug where paper would go off screen WildScotsmen 2018-12-17 01:21:01 -0500
  • 7b0b1de103
         Merge pull request #74 from alDuncanson/homePageRedo develop Alex Duncanson 2018-12-16 20:48:31 -0500
  • 4afa4395d7 Added multiple schemas to home page, removed similar species gallery and added similar species images to correct home page section. Changed the Paper stylings for the About and Home sections for consistency. ajmaley 2018-12-16 14:04:02 -0500
  • 305f405468 Merge branch 'master' of https://github.com/alDuncanson/marten-application ajmaley 2018-12-12 11:25:38 -0500
  • f31d29f76c
         Merge pull request #73 from alDuncanson/bugfix/list Alex Duncanson 2018-12-12 00:34:35 -0500
  • 0e9a85e803 Fixed issue with sighting list, although I hate my solution. wildscotsmen 2018-12-11 23:54:52 -0500
  • e9b5e1f9cd
         Update readme.md Alex Duncanson 2018-12-11 17:22:47 -0500
  • 49e019e770
         Update readme.md Alex Duncanson 2018-12-11 17:17:35 -0500
  • e0138753b5 Merge branch 'master' of https://github.com/alDuncanson/marten-application into bugfix/router WildScotsmen 2018-12-11 17:09:43 -0500
  • 72bc8d6552
         Merge pull request #72 from alDuncanson/bugfix/router Alex Duncanson 2018-12-11 17:02:22 -0500
  • bf789b4c73 Fixed switch logic suddenly not being in code anymore. WildScotsmen 2018-12-11 17:00:18 -0500
  • 93f86ea46a icon size change Al Duncanson 2018-12-11 16:53:49 -0500
  • 8b2fe49b31 Fixed router. WildScotsmen 2018-12-11 16:52:23 -0500
  • 6d4d73afdd Somewhat fixed router issue. WildScotsmen 2018-12-11 16:04:36 -0500
  • 216f177fdb Merge branch 'master' of https://github.com/alDuncanson/marten-application into refactor/contact-text WildScotsmen 2018-12-11 15:23:26 -0500
  • e28ed603ed sidebar fix Al Duncanson 2018-12-11 15:10:50 -0500
  • edfbabe08a Shotgunned a fix for gallery page titles. WildScotsmen 2018-12-11 15:06:27 -0500
  • bf28f3e7b9 style fixes Al Duncanson 2018-12-11 15:06:23 -0500
  • 1778f02d9e Changed the text on the contact page to sponsor's wishes. WildScotsmen 2018-12-11 15:01:38 -0500
  • a486cc0e79 Merge branch 'master' of https://github.com/alDuncanson/marten-application WildScotsmen 2018-12-11 14:46:30 -0500
  • c664b36d55 style fixes Al Duncanson 2018-12-11 12:22:06 -0500
  • 8548110ecd
         Merge pull request #71 from alDuncanson/feature/routing Alex Duncanson 2018-12-11 10:31:50 -0500
  • 6fab7d94a2 minor fix Al Duncanson 2018-12-11 10:26:47 -0500
  • f676b1c1a8 resolved conflicts Al Duncanson 2018-12-11 10:23:11 -0500
  • 19cba81fff implemented react router Al Duncanson 2018-12-11 10:20:18 -0500
  • 65967c3e68
         Merge pull request #70 from alDuncanson/icons-and-fixes Alex Duncanson 2018-12-11 10:16:48 -0500
  • b2ec6c9388 Merge branch 'master' into icons-and-fixes Al Duncanson 2018-12-10 22:27:50 -0500
  • acc7aa5d98 finished new icons Al Duncanson 2018-12-10 22:01:42 -0500
  • ce2a1e8727 small fixes and icons Al Duncanson 2018-12-10 21:50:46 -0500
  • fa84b6ce71
         Merge pull request #68 from alDuncanson/feature/developers-in-about Alex Duncanson 2018-12-10 19:01:56 -0500
  • 0d6186a3ba
         Merge pull request #69 from alDuncanson/feature/trail-cam-fixes Alex Duncanson 2018-12-10 19:01:14 -0500
  • d879236e67 Added paper to collections. WildScotsmen 2018-12-10 17:25:42 -0500
  • 37eba8454a Added summary. WildScotsmen 2018-12-10 16:57:13 -0500
  • 80cd14091e Merge branch 'master' of https://github.com/alDuncanson/marten-application WildScotsmen 2018-12-10 16:44:40 -0500
  • df5052a917 Fixed collection bug issue. Bug was caused by ordering assumption I made. ajmaley 2018-12-10 16:09:30 -0500
  • bcb4115467 Fixed quiz answers. wildscotsmen 2018-12-10 15:33:49 -0500
  • 3feec479f2 Initial feature commit. wildscotsmen 2018-12-10 13:58:01 -0500
  • 4d989193dd Merge branch 'master' of https://github.com/alDuncanson/marten-application ajmaley 2018-12-07 13:40:28 -0500
  • b3a819800c add hotjar Al Duncanson 2018-12-07 13:32:49 -0500
  • e14a8ef31e Merge branch 'master' of https://github.com/alDuncanson/marten-application ajmaley 2018-12-07 12:56:49 -0500
  • d677a6f3a4
         Merge pull request #66 from alDuncanson/galleryRedo2 Alex Duncanson 2018-12-06 10:03:50 -0500
  • 5e29fc0312 Merge branch 'master' into galleryRedo2 Al Duncanson 2018-12-06 10:01:39 -0500
  • 3581d03a48 Merge branch 'galleryRedo2' ajmaley 2018-12-06 09:59:58 -0500
  • 163121b22e Gallery not recovering from slow network bug fix ajmaley 2018-12-05 20:35:45 -0500
  • 50dda54b4e
         Merge pull request #65 from alDuncanson/refactor/restructure-and-minor-bugfix Jacob McCloughan 2018-12-05 17:42:31 -0500
  • bebd42aa3a All image ajmaley 2018-12-05 17:32:07 -0500
  • 58a87bdda0 Fixing Gallery bug ajmaley 2018-12-05 17:31:40 -0500
  • cbac4ec5e6 Moved index.css into css folder for consistency's sake. wildscotsmen 2018-12-03 03:04:42 -0500
  • bb5b90330f Fixed merge conflicts. wildscotsmen 2018-12-03 02:31:21 -0500
  • ecad9c69df
         Merge pull request #64 from alDuncanson/feature/theme-cookies Jacob McCloughan 2018-12-03 02:27:57 -0500
  • 54b1378458
         Merge pull request #63 from alDuncanson/refactor/index-and-manifest Jacob McCloughan 2018-12-03 02:27:48 -0500
  • 0ac722ed11 Fixed formatting in App.js. wildscotsmen 2018-12-02 21:15:24 -0500
  • caae81f87f Theme changing now sets a cookie! This means that the chosen theme persists between sessions. wildscotsmen 2018-12-02 21:13:16 -0500
  • 800c21fc39 Removed commented out code and auto structured index. wildscotsmen 2018-12-02 17:53:13 -0500
  • aeb880d8fa Updated file and folder names. Made updates to Readme. wildscotsmen 2018-12-01 21:06:28 -0500
  • d8119c8773 Fixed minor bug with theme swap and restructured components folder. wildscotsmen 2018-12-01 19:56:09 -0500
  • c9a771d1bc Merge branch 'master' of https://github.com/alDuncanson/marten-application into refactor/index-and-manifest wildscotsmen 2018-11-30 19:44:41 -0500
  • 61631af341 Finalized index.html and manifest.json wildscotsmen 2018-11-30 19:44:27 -0500
  • 85bc95cd54
         Merge pull request #62 from alDuncanson/feature/theme-swapping Jacob McCloughan 2018-11-30 18:45:10 -0500
  • be1f4585e7 Made link color more consistent with Material UI indigo. WildScotsmen 2018-11-30 17:51:20 -0500
  • 0bca2064c6 Fixed Disqus link color lookin nasty. WildScotsmen 2018-11-30 17:47:52 -0500
  • e6d152e1b6 Prevented having both drawers in side bar open at the same time. WildScotsmen 2018-11-30 17:13:58 -0500
  • a06f991888 Added Typography to App Drawer to ensure all icons change with swap. WildScotsmen 2018-11-30 16:00:49 -0500
  • aabdc2f384 Merge branch 'master' of https://github.com/alDuncanson/marten-application WildScotsmen 2018-11-30 15:45:43 -0500
  • 7815c18dee Added Typography to SightingDetail wildscotsmen 2018-11-29 23:58:09 -0500
  • 0dd7ce50d2 Added theme swapping. wildscotsmen 2018-11-29 23:55:21 -0500
  • c3974fe5ea
         Merge pull request #61 from alDuncanson/flamelinkCollectionOrder Jacob McCloughan 2018-11-29 22:05:40 -0500
  • 4f8e6f9e34 Merge branch 'master' of https://github.com/alDuncanson/marten-application WildScotsmen 2018-11-27 20:51:45 -0500
  • c76d1fbeb6 Reordering the collection entries works now. ajmaley 2018-11-27 17:46:12 -0500
  • 68c1c9bdac
         Merge pull request #60 from alDuncanson/similarSpeciesGallery Alex Duncanson 2018-11-26 08:39:07 -0500
  • 0f4f10f285 Added similar species gallery ajmaley 2018-11-25 20:16:11 -0500
  • 7722e2006f
         Merge pull request #56 from alDuncanson/feature/contact-page Alex Duncanson 2018-11-25 17:52:18 -0500
  • 8b9fd2303d Fixed more merge conflicts. WildScotsmen 2018-11-25 17:46:49 -0500
  • 260e08512f Fixed merge conflict. WildScotsmen 2018-11-25 17:44:25 -0500
  • ce9f5e9c51
         Merge pull request #54 from alDuncanson/flamelinkGalleries Alex Duncanson 2018-11-25 17:43:15 -0500
  • cde8f9837d
         Merge pull request #55 from alDuncanson/feature/map-edits Alex Duncanson 2018-11-25 17:42:16 -0500
  • 2ce84767dd
         Merge pull request #57 from alDuncanson/WildScotsmen-readme-patch Alex Duncanson 2018-11-25 17:41:48 -0500
  • 6323458cb3
         Update readme.md Jacob McCloughan 2018-11-25 17:38:06 -0500
  • 0678f7d20b
         Updated readme.md Jacob McCloughan 2018-11-25 17:35:50 -0500
  • 073e039148 Pulled in Joey's code and made it work with mine. WildScotsmen 2018-11-25 16:53:56 -0500
  • 7937ae1fb2 fixed map Al Duncanson 2018-11-25 16:50:17 -0500
  • 43f80c7750 Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/contact-page WildScotsmen 2018-11-25 16:41:13 -0500
  • 21e8d594bf Merge branch 'master' of https://github.com/alDuncanson/marten-application WildScotsmen 2018-11-25 16:40:58 -0500
  • 970449fc5f Added titles to pages. WildScotsmen 2018-11-25 16:37:26 -0500
  • 89762e4428 All bugs fixed. Good to move into production ajmaley 2018-11-25 14:59:22 -0500
  • 1bde733cae Fixed a few more bugs ajmaley 2018-11-25 14:36:46 -0500
  • 848961dc25 Dealt with duplicate key error messages and galleries re-rendering when selecting teh quiz or galleries dropdowns ajmaley 2018-11-25 14:11:47 -0500
  • da80aeabfd Fixed styling. wildscotsmen 2018-11-25 13:42:59 -0500
  • 95143d8034 Fixed startup issue. wildscotsmen 2018-11-25 13:19:43 -0500
  • 73db7e5074 Added some styling got galleries ajmaley 2018-11-25 12:52:59 -0500
  • 477a8d264c Handles displaying titles of galleries ajmaley 2018-11-25 12:32:12 -0500
  • 00a3566dec Set up Galleries to use flamelink images. Set up to use collection schema type only. There is one bug I need to address. Gallery doesn't render when the webpage is loaded but works otherwise. ajmaley 2018-11-25 11:28:23 -0500
  • a61a881126 Galleries are pulling from FlameLink now. Just have to finish up a few more things before this can be moved to production ajmaley 2018-11-24 21:41:45 -0500
  • 212bca8d35 Progress so far converting a collection schema filled with single media entries into a gallery ajmaley 2018-11-24 21:26:40 -0500
  • 559e7debfe Merge branch 'develop' ajmaley 2018-11-23 13:42:01 -0500
  • 886db4a12d Merge branch 'feature/flamelinkCollections' into develop ajmaley 2018-11-23 13:40:35 -0500