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 |
|
Al Duncanson
|
f015e11864
|
removed home placeholder from home page
|
2018-11-05 09:45:47 -05:00 |
|
Alex Duncanson
|
a753bcfb0f
|
Merge pull request #46 from alDuncanson/feature/custom-icons
Feature/custom icons
|
2018-11-05 09:27:41 -05:00 |
|
wildscotsmen
|
05817e7e9e
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/custom-icons
|
2018-11-05 00:32:31 -05:00 |
|
Jacob McCloughan
|
37991a9984
|
Merge pull request #45 from alDuncanson/flamelink
Flamelink
|
2018-11-04 22:10:09 -05:00 |
|
wildscotsmen
|
a98025f8bb
|
Added semicolons I forgot.
|
2018-11-04 22:06:58 -05:00 |
|
wildscotsmen
|
bcf5c30718
|
Added comment I forgot.
|
2018-11-04 22:05:41 -05:00 |
|
wildscotsmen
|
83982d8f88
|
App now loads map icons from public folder. Also added icons for the sighting types photo and other.
|
2018-11-04 22:04:31 -05:00 |
|
wildscotsmen
|
0a8120e826
|
Fixed merge conflict.
|
2018-11-04 21:50:16 -05:00 |
|
Al Duncanson
|
d926c107c0
|
fix merge conflicts
|
2018-11-04 18:34:46 -05:00 |
|
WildScotsmen
|
7dd2fbfeaf
|
Fixed merge after effect.
|
2018-11-03 15:47:13 -04:00 |
|
ajmaley
|
f9186c3155
|
Changed Info to About
|
2018-11-03 15:34:11 -04:00 |
|
ajmaley
|
8b7021684c
|
Merge branch 'master' into flamelink
|
2018-11-03 15:32:18 -04:00 |
|
ajmaley
|
65f2b4ecb9
|
Merge branch 'develop' into flamelink
|
2018-11-03 14:38:33 -04:00 |
|
ajmaley
|
2962afb84e
|
Merge branch 'flamelink' of https://github.com/alDuncanson/marten-application into flamelink
|
2018-11-03 14:33:39 -04:00 |
|
ajmaley
|
58a892bfa8
|
Added ability to center images, resizing images (which I may need to revisit later), removed memory leak in FlamelinkImage.js
|
2018-11-03 14:28:36 -04:00 |
|
Alex Duncanson
|
c7cbe42d51
|
Merge pull request #42 from alDuncanson/feature/massive-refactor
Big refactor
|
2018-11-02 14:50:07 -04:00 |
|
Al Duncanson
|
b4f7c0a4cb
|
fixed merge conflicts
|
2018-11-02 14:49:00 -04:00 |
|
Al Duncanson
|
39f06f844b
|
changed maps default zoom
|
2018-11-02 14:46:06 -04:00 |
|
Alex Duncanson
|
9baa3f942f
|
Merge pull request #43 from alDuncanson/refactor/default-key
Set default key of the application to Home.
|
2018-11-02 14:41:42 -04:00 |
|
Alex Duncanson
|
07c8d0ecf7
|
Merge pull request #44 from alDuncanson/feature/map-addtion
added report map tooltip
|
2018-11-02 14:41:19 -04:00 |
|
wildscotsmen
|
dea74f5059
|
Removed to-do Typography in Info page.
|
2018-11-02 00:07:48 -04:00 |
|
wildscotsmen
|
3c3a737822
|
Fixed merge conflict.
|
2018-11-01 23:00:15 -04:00 |
|
ajmaley
|
7df07ff7c4
|
Worked on Flamelink stylings for images but didn't really get anywhere
|
2018-11-01 22:51:05 -04:00 |
|
ajmaley
|
4fba3db3db
|
Added FlameLink to Homepage.
|
2018-11-01 21:19:34 -04:00 |
|
ajmaley
|
035608a19b
|
Added padding for fieldset data
|
2018-11-01 21:08:50 -04:00 |
|
ajmaley
|
6ecf626659
|
Added ability to parse fieldset data. Added some basic stylings for content. Cleaned up code.
|
2018-11-01 20:59:47 -04:00 |
|
Al Duncanson
|
4301a3d6cd
|
added report map tooltip
|
2018-10-31 22:18:45 -04:00 |
|
WildScotsmen
|
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.
|
2018-10-31 19:14:24 -04:00 |
|
WildScotsmen
|
bfbb27842a
|
Cleaned up code according to what we decided on. Also formatted raw database data in SightingDetail component. Finally, ordered list in reverse order.
|
2018-10-31 18:57:25 -04:00 |
|
ajmaley
|
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.
|
2018-10-30 23:56:24 -04:00 |
|
ajmaley
|
d975fbfe2a
|
Initializing firebaseApp using firebase-admin sdk
|
2018-10-30 20:20:05 -04:00 |
|
ajmaley
|
1d722693c4
|
Merge branch 'develop' of https://github.com/alDuncanson/marten-application into develop
|
2018-10-30 19:51:49 -04:00 |