Alex Duncanson
|
7722e2006f
|
Merge pull request #56 from alDuncanson/feature/contact-page
Contact page
|
2018-11-25 17:52:18 -05:00 |
WildScotsmen
|
8b9fd2303d
|
Fixed more merge conflicts.
|
2018-11-25 17:46:49 -05:00 |
|
WildScotsmen
|
260e08512f
|
Fixed merge conflict.
|
2018-11-25 17:44:25 -05:00 |
|
Alex Duncanson
|
ce9f5e9c51
|
Merge pull request #54 from alDuncanson/flamelinkGalleries
Flamelink collections & galleries
|
2018-11-25 17:43:15 -05:00 |
|
Alex Duncanson
|
cde8f9837d
|
Merge pull request #55 from alDuncanson/feature/map-edits
fixed map
|
2018-11-25 17:42:16 -05:00 |
|
Alex Duncanson
|
2ce84767dd
|
Merge pull request #57 from alDuncanson/WildScotsmen-readme-patch
Readme patch
|
2018-11-25 17:41:48 -05:00 |
|
Jacob McCloughan
|
6323458cb3
|
Update readme.md
|
2018-11-25 17:38:06 -05:00 |
|
Jacob McCloughan
|
0678f7d20b
|
Updated readme.md
|
2018-11-25 17:35:50 -05:00 |
|
WildScotsmen
|
073e039148
|
Pulled in Joey's code and made it work with mine.
|
2018-11-25 16:53:56 -05:00 |
Al Duncanson
|
7937ae1fb2
|
fixed map
|
2018-11-25 16:50:17 -05:00 |
|
WildScotsmen
|
43f80c7750
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/contact-page
|
2018-11-25 16:41:13 -05:00 |
|
WildScotsmen
|
21e8d594bf
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application
|
2018-11-25 16:40:58 -05:00 |
|
WildScotsmen
|
970449fc5f
|
Added titles to pages.
|
2018-11-25 16:37:26 -05:00 |
ajmaley
|
89762e4428
|
All bugs fixed. Good to move into production
|
2018-11-25 14:59:22 -05:00 |
|
ajmaley
|
1bde733cae
|
Fixed a few more bugs
|
2018-11-25 14:36:46 -05:00 |
|
ajmaley
|
848961dc25
|
Dealt with duplicate key error messages and galleries re-rendering when selecting teh quiz or galleries dropdowns
|
2018-11-25 14:11:47 -05:00 |
|
wildscotsmen
|
da80aeabfd
|
Fixed styling.
|
2018-11-25 13:42:59 -05:00 |
|
wildscotsmen
|
95143d8034
|
Fixed startup issue.
|
2018-11-25 13:19:43 -05:00 |
|
ajmaley
|
73db7e5074
|
Added some styling got galleries
|
2018-11-25 12:52:59 -05:00 |
|
ajmaley
|
477a8d264c
|
Handles displaying titles of galleries
|
2018-11-25 12:32:12 -05:00 |
|
ajmaley
|
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.
|
2018-11-25 11:28:23 -05:00 |
|
ajmaley
|
a61a881126
|
Galleries are pulling from FlameLink now. Just have to finish up a few more things before this can be moved to production
|
2018-11-24 21:41:45 -05:00 |
|
ajmaley
|
212bca8d35
|
Progress so far converting a collection schema filled with single media entries into a gallery
|
2018-11-24 21:26:40 -05:00 |
|
ajmaley
|
559e7debfe
|
Merge branch 'develop'
|
2018-11-23 13:42:01 -05:00 |
|
ajmaley
|
886db4a12d
|
Merge branch 'feature/flamelinkCollections' into develop
|
2018-11-23 13:40:35 -05:00 |
|
ajmaley
|
598f3bd0a0
|
Added ability to handle collection type schemas
|
2018-11-23 13:07:42 -05:00 |
|
Alex Duncanson
|
137b78359b
|
Merge pull request #53 from alDuncanson/feature/quiz-difficulties
Added multiple difficulty settings to the quiz game
|
2018-11-21 12:58:23 -05:00 |
|
wildscotsmen
|
9157c19aba
|
Added multiple difficulty settings to the quiz game and reorganized file structure.
|
2018-11-20 00:43:31 -05:00 |
|
Jacob McCloughan
|
23ff1525b0
|
Merge pull request #52 from alDuncanson/feature/report-map-location
Mirrored coordinates on sighting map in report map.
|
2018-11-19 16:48:01 -05:00 |
Joey Coscarelli
|
a24455dbff
|
created contact page and component
|
2018-11-18 21:40:21 -05:00 |
|
WildScotsmen
|
60e1e5e31f
|
Added contact form to application. Sends requests through EmailJS.
|
2018-11-18 01:10:04 -05:00 |
|
WildScotsmen
|
a971a065a4
|
Merge branch 'develop' of https://github.com/alDuncanson/marten-application
|
2018-11-17 23:03:03 -05:00 |
|
WildScotsmen
|
32513aac4d
|
Mirrored coordinates on sighting map in report map.
|
2018-11-17 22:54:17 -05:00 |
|
Alex Duncanson
|
17410d3eec
|
Merge pull request #50 from alDuncanson/feature/map-edits
Feature/map edits
|
2018-11-14 17:11:08 -05:00 |
|
Alex Duncanson
|
1739c89f4c
|
Merge pull request #49 from alDuncanson/feature/firebase-security
Added security to Firebase in application.
|
2018-11-14 17:08:03 -05:00 |
|
Al Duncanson
|
94869827da
|
refixed map
|
2018-11-14 17:06:27 -05:00 |
|
Al Duncanson
|
3d2ed8512c
|
fixed merge conflicts
|
2018-11-14 17:05:16 -05:00 |
|
Al Duncanson
|
80b0d4d52c
|
Merge branch 'master' into develop
|
2018-11-14 16:58:22 -05:00 |
|
Al Duncanson
|
b8ac327139
|
fixed china problem
|
2018-11-14 16:55:40 -05:00 |
|
Al Duncanson
|
545db78a66
|
fixed merge conflicts
|
2018-11-14 16:40:11 -05:00 |
|
wildscotsmen
|
413906db05
|
Merge branch 'develop' of https://github.com/alDuncanson/marten-application into develop
|
2018-11-14 11:54:04 -05:00 |
|
wildscotsmen
|
b0b449abb3
|
Added security to Firebase in application.
|
2018-11-14 11:51:59 -05:00 |
|
ajmaley
|
31a5887b7b
|
Removed Info.js and replaced with About.js for clarity. Also added some stylings for FlameLink images using css.
|
2018-11-12 19:03:00 -05:00 |
|
Alex Duncanson
|
80a73145f7
|
Merge pull request #48 from alDuncanson/feature/favicon-and-titles
Added page titles and modified Favicon.
|
2018-11-12 11:15:08 -05:00 |
|
wildscotsmen
|
4b56907006
|
Rearranged code.
|
2018-11-08 22:11:08 -05:00 |
|
wildscotsmen
|
86580d4a40
|
Made title in index.js more specific to first page.
|
2018-11-08 22:01:29 -05:00 |
|
wildscotsmen
|
2cb53178df
|
Fixed issue.
|
2018-11-08 21:59:38 -05:00 |
|
wildscotsmen
|
691f96506b
|
Added page title to App.js
|
2018-11-08 21:57:00 -05:00 |
|
wildscotsmen
|
a343458f8c
|
Added page titles and modified Favicon.
|
2018-11-08 21:53:19 -05:00 |
|
Al Duncanson
|
e0e1a7e9e4
|
new disqus
|
2018-11-07 17:24:43 -05:00 |