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

Commit Graph

  • 598f3bd0a0 Added ability to handle collection type schemas ajmaley 2018-11-23 13:07:42 -0500
  • 137b78359b
         Merge pull request #53 from alDuncanson/feature/quiz-difficulties Alex Duncanson 2018-11-21 12:58:23 -0500
  • 9157c19aba Added multiple difficulty settings to the quiz game and reorganized file structure. wildscotsmen 2018-11-20 00:43:31 -0500
  • 23ff1525b0
         Merge pull request #52 from alDuncanson/feature/report-map-location Jacob McCloughan 2018-11-19 16:48:01 -0500
  • a24455dbff created contact page and component Joey Coscarelli 2018-11-18 21:40:21 -0500
  • 60e1e5e31f Added contact form to application. Sends requests through EmailJS. WildScotsmen 2018-11-18 01:10:04 -0500
  • a971a065a4 Merge branch 'develop' of https://github.com/alDuncanson/marten-application WildScotsmen 2018-11-17 23:03:03 -0500
  • 32513aac4d Mirrored coordinates on sighting map in report map. WildScotsmen 2018-11-17 22:54:17 -0500
  • 17410d3eec
         Merge pull request #50 from alDuncanson/feature/map-edits Alex Duncanson 2018-11-14 17:11:08 -0500
  • 1739c89f4c
         Merge pull request #49 from alDuncanson/feature/firebase-security Alex Duncanson 2018-11-14 17:08:03 -0500
  • 94869827da refixed map Al Duncanson 2018-11-14 17:06:27 -0500
  • 3d2ed8512c fixed merge conflicts Al Duncanson 2018-11-14 17:05:16 -0500
  • 80b0d4d52c Merge branch 'master' into develop Al Duncanson 2018-11-14 16:58:22 -0500
  • b8ac327139 fixed china problem Al Duncanson 2018-11-14 16:55:40 -0500
  • 545db78a66 fixed merge conflicts Al Duncanson 2018-11-14 16:40:11 -0500
  • 413906db05 Merge branch 'develop' of https://github.com/alDuncanson/marten-application into develop wildscotsmen 2018-11-14 11:54:04 -0500
  • b0b449abb3 Added security to Firebase in application. wildscotsmen 2018-11-14 11:51:59 -0500
  • 31a5887b7b Removed Info.js and replaced with About.js for clarity. Also added some stylings for FlameLink images using css. ajmaley 2018-11-12 19:03:00 -0500
  • 80a73145f7
         Merge pull request #48 from alDuncanson/feature/favicon-and-titles Alex Duncanson 2018-11-12 11:15:08 -0500
  • 4b56907006 Rearranged code. wildscotsmen 2018-11-08 22:11:08 -0500
  • 86580d4a40 Made title in index.js more specific to first page. wildscotsmen 2018-11-08 22:01:29 -0500
  • 2cb53178df Fixed issue. wildscotsmen 2018-11-08 21:59:38 -0500
  • 691f96506b Added page title to App.js wildscotsmen 2018-11-08 21:57:00 -0500
  • a343458f8c Added page titles and modified Favicon. wildscotsmen 2018-11-08 21:53:19 -0500
  • e0e1a7e9e4 new disqus Al Duncanson 2018-11-07 17:24:43 -0500
  • f015e11864 removed home placeholder from home page Al Duncanson 2018-11-05 09:45:47 -0500
  • a753bcfb0f
         Merge pull request #46 from alDuncanson/feature/custom-icons Alex Duncanson 2018-11-05 09:27:41 -0500
  • 05817e7e9e Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/custom-icons wildscotsmen 2018-11-05 00:32:31 -0500
  • 37991a9984
         Merge pull request #45 from alDuncanson/flamelink Jacob McCloughan 2018-11-04 22:10:09 -0500
  • a98025f8bb Added semicolons I forgot. wildscotsmen 2018-11-04 22:06:58 -0500
  • bcf5c30718 Added comment I forgot. wildscotsmen 2018-11-04 22:05:41 -0500
  • 83982d8f88 App now loads map icons from public folder. Also added icons for the sighting types photo and other. wildscotsmen 2018-11-04 22:04:31 -0500
  • 0a8120e826 Fixed merge conflict. wildscotsmen 2018-11-04 21:50:16 -0500
  • d926c107c0 fix merge conflicts Al Duncanson 2018-11-04 18:34:46 -0500
  • 7dd2fbfeaf Fixed merge after effect. WildScotsmen 2018-11-03 15:47:13 -0400
  • f9186c3155 Changed Info to About ajmaley 2018-11-03 15:34:11 -0400
  • 8b7021684c Merge branch 'master' into flamelink ajmaley 2018-11-03 15:32:18 -0400
  • 65f2b4ecb9 Merge branch 'develop' into flamelink ajmaley 2018-11-03 14:38:33 -0400
  • 2962afb84e Merge branch 'flamelink' of https://github.com/alDuncanson/marten-application into flamelink ajmaley 2018-11-03 14:33:39 -0400
  • 58a892bfa8 Added ability to center images, resizing images (which I may need to revisit later), removed memory leak in FlamelinkImage.js ajmaley 2018-11-03 14:28:36 -0400
  • c7cbe42d51
         Merge pull request #42 from alDuncanson/feature/massive-refactor Alex Duncanson 2018-11-02 14:50:07 -0400
  • b4f7c0a4cb fixed merge conflicts Al Duncanson 2018-11-02 14:49:00 -0400
  • 39f06f844b changed maps default zoom Al Duncanson 2018-11-02 14:46:06 -0400
  • 9baa3f942f
         Merge pull request #43 from alDuncanson/refactor/default-key Alex Duncanson 2018-11-02 14:41:42 -0400
  • 07c8d0ecf7
         Merge pull request #44 from alDuncanson/feature/map-addtion Alex Duncanson 2018-11-02 14:41:19 -0400
  • dea74f5059 Removed to-do Typography in Info page. wildscotsmen 2018-11-02 00:07:48 -0400
  • 3c3a737822 Fixed merge conflict. wildscotsmen 2018-11-01 23:00:15 -0400
  • 7df07ff7c4 Worked on Flamelink stylings for images but didn't really get anywhere ajmaley 2018-11-01 22:51:05 -0400
  • 4fba3db3db Added FlameLink to Homepage. ajmaley 2018-11-01 21:19:34 -0400
  • 035608a19b Added padding for fieldset data ajmaley 2018-11-01 21:08:50 -0400
  • 6ecf626659 Added ability to parse fieldset data. Added some basic stylings for content. Cleaned up code. ajmaley 2018-11-01 20:59:47 -0400
  • 4301a3d6cd added report map tooltip Al Duncanson 2018-10-31 22:18:45 -0400
  • 3f36ee55a1 Set default key of the application to Home. It was set to blank, which meant that the application wasn't on any page when the user first visits the application. WildScotsmen 2018-10-31 19:14:24 -0400
  • bfbb27842a Cleaned up code according to what we decided on. Also formatted raw database data in SightingDetail component. Finally, ordered list in reverse order. WildScotsmen 2018-10-31 18:52:37 -0400
  • ce0d5d2e1e Can now grab text and images from firebase using Flamelink's API. I've also included a solution for adding different header styles. Next on the agenda is styling the Info page and filling it with sponsor's data. ajmaley 2018-10-30 23:56:24 -0400
  • d975fbfe2a Initializing firebaseApp using firebase-admin sdk ajmaley 2018-10-30 20:20:05 -0400
  • 1d722693c4 Merge branch 'develop' of https://github.com/alDuncanson/marten-application into develop ajmaley 2018-10-30 19:51:49 -0400
  • 88490b4f2d Add Firebase admin SDK ajmaley 2018-10-30 19:50:38 -0400
  • a9bf3aa5e4
         Merge pull request #41 from alDuncanson/refactor/code-cleanup Alex Duncanson 2018-10-29 13:32:48 -0400
  • 1d6d1b5d6b
         Merge pull request #40 from alDuncanson/feature/als-sighting-list Alex Duncanson 2018-10-29 13:31:19 -0400
  • 4617f31be2 Fixed some issues with ordering in report form code. wildscotsmen 2018-10-29 00:38:19 -0400
  • c9f22b74d5 Cleaned code for consistency. Additionally added month function for report form. wildscotsmen 2018-10-29 00:33:35 -0400
  • 94f5222c61 merging Al Duncanson 2018-10-27 18:07:30 -0400
  • 71b6ce9ad7 fixed sighting detail and disqus size Al Duncanson 2018-10-27 17:24:42 -0400
  • 5366b67a98 fixed map sizing Al Duncanson 2018-10-27 17:14:16 -0400
  • 7736f3ff33 made list scrollable Al Duncanson 2018-10-27 16:59:36 -0400
  • 7543839985 best I got right now Al Duncanson 2018-10-27 16:08:53 -0400
  • 5182b92b82 Fixed issue from merge conflict. wildscotsmen 2018-10-27 15:15:47 -0400
  • 229bc1fa51 Fixed merge conflict. wildscotsmen 2018-10-27 15:15:03 -0400
  • 054c67db51 Merged flamelink branch with develop and added info page to menu. The content on the info page may populate the home page in the future. ajmaley 2018-10-27 13:24:25 -0400
  • 2ab2b5842e Merge branch 'develop' into flamelink ajmaley 2018-10-27 13:06:05 -0400
  • 3566fc5252 Added material UI icons package ajmaley 2018-10-27 13:00:23 -0400
  • 0070b333e8 Forgot to add this file in my last commit ajmaley 2018-10-27 12:50:01 -0400
  • 7a8e840e1b Added code to handle flamelink data. It handles schema field order, grid sizes and displays text. Getting storage bucket errors when attempting to grab media info. Need to use the firebase-admin package instead of the firebase package. This is a known issue with flamelink. I'll fix this shortly. ajmaley 2018-10-27 12:46:00 -0400
  • 49eaa2a4f4 added sighting detail map Al Duncanson 2018-10-26 17:43:09 -0400
  • 48273519cb reworked GA Al Duncanson 2018-10-26 16:34:08 -0400
  • 97bb9d03cf added google analytics Al Duncanson 2018-10-26 16:26:00 -0400
  • d539a3b293 merge Al Duncanson 2018-10-26 14:27:03 -0400
  • 8c08f37c1d Merge branch 'master' of https://github.com/alDuncanson/marten-application Al Duncanson 2018-10-26 14:22:20 -0400
  • d026ae12e2 added hotjar Al Duncanson 2018-10-26 14:18:14 -0400
  • 66fb1fc6f1 quick changes Al Duncanson 2018-10-26 13:24:10 -0400
  • 9aca4c949b
         Merge pull request #36 from alDuncanson/feature/map-formatting Alex Duncanson 2018-10-26 12:06:11 -0400
  • d44eb373f9
         Merge pull request #37 from alDuncanson/feature/report-form-toast Alex Duncanson 2018-10-26 11:45:33 -0400
  • 26ce296cb3
         Merge pull request #35 from alDuncanson/feature/quiz-game-improvement Alex Duncanson 2018-10-26 11:45:14 -0400
  • 4f064e546e added styles and sighting details Al Duncanson 2018-10-26 11:04:44 -0400
  • f0d1821aea Added toast to report form. wildscotsmen 2018-10-25 22:46:36 -0400
  • 700515a66b Formatted database data in InfoWindows on Sighting Map. wildscotsmen 2018-10-25 22:15:48 -0400
  • 15e853640d removed window state Al Duncanson 2018-10-25 21:55:48 -0400
  • 4d0188d144 added sighting list, and custom comment thread Al Duncanson 2018-10-25 21:26:18 -0400
  • 760c5b77de Put button inside div and rearranged some code. wildscotsmen 2018-10-25 20:53:17 -0400
  • 19e24a2747 Added reset button to quiz and made text Material UI-esque. wildscotsmen 2018-10-25 20:32:55 -0400
  • 16f6dde825
         Merge pull request #34 from alDuncanson/feature/nav-bar Alex Duncanson 2018-10-25 13:27:42 -0400
  • 147513571f fixed mobile styles Al Duncanson 2018-10-25 11:31:38 -0400
  • fc452c5e35 changed quiz icons Al Duncanson 2018-10-25 01:20:27 -0400
  • 1c959b7a32 rewrote structure for new nav Al Duncanson 2018-10-25 01:09:49 -0400
  • 582b3f4a6a package updates Al Duncanson 2018-10-24 18:15:08 -0400
  • 970762faa3 fixed merge conflicts, added new nav Al Duncanson 2018-10-24 18:09:23 -0400
  • b02e9d26a6
         Merge pull request #32 from alDuncanson/feature/quiz-game Alex Duncanson 2018-10-24 17:13:41 -0400
  • 60e252cb72 updated navigation structure Al Duncanson 2018-10-24 13:09:53 -0400
  • 2839943cfe added custom icons Al Duncanson 2018-10-23 18:38:00 -0400