Al Duncanson
|
55775e10b9
|
new api keys
|
2019-01-05 12:50:07 -05:00 |
WildScotsmen
|
119f89489b
|
Removed CSS I added that doesn't actually make a difference.
|
2018-12-17 01:38:56 -05:00 |
|
WildScotsmen
|
29933ccb71
|
Fixed issue with background image getting a server error.
|
2018-12-17 01:24:15 -05:00 |
|
WildScotsmen
|
2b664334a2
|
Fixed bug where paper would go off screen
|
2018-12-17 01:21:01 -05:00 |
ajmaley
|
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.
|
2018-12-16 14:04:02 -05:00 |
|
wildscotsmen
|
0e9a85e803
|
Fixed issue with sighting list, although I hate my solution.
|
2018-12-11 23:54:52 -05:00 |
|
WildScotsmen
|
e0138753b5
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application into bugfix/router
|
2018-12-11 17:09:43 -05:00 |
|
WildScotsmen
|
bf789b4c73
|
Fixed switch logic suddenly not being in code anymore.
|
2018-12-11 17:00:18 -05:00 |
|
Al Duncanson
|
93f86ea46a
|
icon size change
|
2018-12-11 16:53:49 -05:00 |
|
WildScotsmen
|
8b2fe49b31
|
Fixed router.
|
2018-12-11 16:52:23 -05:00 |
|
WildScotsmen
|
6d4d73afdd
|
Somewhat fixed router issue.
|
2018-12-11 16:04:36 -05:00 |
|
WildScotsmen
|
216f177fdb
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application into refactor/contact-text
|
2018-12-11 15:23:26 -05:00 |
|
Al Duncanson
|
e28ed603ed
|
sidebar fix
|
2018-12-11 15:10:50 -05:00 |
|
WildScotsmen
|
edfbabe08a
|
Shotgunned a fix for gallery page titles.
|
2018-12-11 15:06:27 -05:00 |
|
Al Duncanson
|
bf28f3e7b9
|
style fixes
|
2018-12-11 15:06:23 -05:00 |
|
WildScotsmen
|
1778f02d9e
|
Changed the text on the contact page to sponsor's wishes.
|
2018-12-11 15:01:38 -05:00 |
|
Al Duncanson
|
c664b36d55
|
style fixes
|
2018-12-11 12:22:06 -05:00 |
|
Al Duncanson
|
6fab7d94a2
|
minor fix
|
2018-12-11 10:26:47 -05:00 |
|
Al Duncanson
|
f676b1c1a8
|
resolved conflicts
|
2018-12-11 10:23:11 -05:00 |
|
Al Duncanson
|
19cba81fff
|
implemented react router
|
2018-12-11 10:20:18 -05:00 |
|
Al Duncanson
|
b2ec6c9388
|
Merge branch 'master' into icons-and-fixes
|
2018-12-10 22:27:50 -05:00 |
|
Al Duncanson
|
ce2a1e8727
|
small fixes and icons
|
2018-12-10 21:50:46 -05:00 |
Alex Duncanson
|
fa84b6ce71
|
Merge pull request #68 from alDuncanson/feature/developers-in-about
Feature/developers in about
|
2018-12-10 19:01:56 -05:00 |
|
WildScotsmen
|
d879236e67
|
Added paper to collections.
|
2018-12-10 17:25:42 -05:00 |
|
WildScotsmen
|
37eba8454a
|
Added summary.
|
2018-12-10 16:57:13 -05:00 |
|
ajmaley
|
df5052a917
|
Fixed collection bug issue. Bug was caused by ordering assumption I made.
|
2018-12-10 16:09:30 -05:00 |
|
wildscotsmen
|
bcb4115467
|
Fixed quiz answers.
|
2018-12-10 15:33:49 -05:00 |
|
wildscotsmen
|
3feec479f2
|
Initial feature commit.
|
2018-12-10 13:58:01 -05:00 |
|
Al Duncanson
|
5e29fc0312
|
Merge branch 'master' into galleryRedo2
|
2018-12-06 10:01:39 -05:00 |
|
ajmaley
|
163121b22e
|
Gallery not recovering from slow network bug fix
|
2018-12-05 20:35:45 -05:00 |
|
ajmaley
|
bebd42aa3a
|
All image
|
2018-12-05 17:32:07 -05:00 |
|
ajmaley
|
58a87bdda0
|
Fixing Gallery bug
|
2018-12-05 17:31:40 -05:00 |
|
wildscotsmen
|
cbac4ec5e6
|
Moved index.css into css folder for consistency's sake.
|
2018-12-03 03:04:42 -05:00 |
|
wildscotsmen
|
bb5b90330f
|
Fixed merge conflicts.
|
2018-12-03 02:31:21 -05:00 |
|
wildscotsmen
|
0ac722ed11
|
Fixed formatting in App.js.
|
2018-12-02 21:15:24 -05:00 |
|
wildscotsmen
|
caae81f87f
|
Theme changing now sets a cookie! This means that the chosen theme persists between sessions.
|
2018-12-02 21:13:16 -05:00 |
|
wildscotsmen
|
aeb880d8fa
|
Updated file and folder names. Made updates to Readme.
|
2018-12-01 21:06:28 -05:00 |
|
wildscotsmen
|
d8119c8773
|
Fixed minor bug with theme swap and restructured components folder.
|
2018-12-01 19:56:09 -05:00 |
|
WildScotsmen
|
be1f4585e7
|
Made link color more consistent with Material UI indigo.
|
2018-11-30 17:51:20 -05:00 |
|
WildScotsmen
|
0bca2064c6
|
Fixed Disqus link color lookin nasty.
|
2018-11-30 17:47:52 -05:00 |
|
WildScotsmen
|
e6d152e1b6
|
Prevented having both drawers in side bar open at the same time.
|
2018-11-30 17:13:58 -05:00 |
|
WildScotsmen
|
a06f991888
|
Added Typography to App Drawer to ensure all icons change with swap.
|
2018-11-30 16:00:49 -05:00 |
|
wildscotsmen
|
7815c18dee
|
Added Typography to SightingDetail
|
2018-11-29 23:58:09 -05:00 |
|
wildscotsmen
|
0dd7ce50d2
|
Added theme swapping.
|
2018-11-29 23:55:21 -05:00 |
|
ajmaley
|
c76d1fbeb6
|
Reordering the collection entries works now.
|
2018-11-27 17:46:12 -05:00 |
|
ajmaley
|
0f4f10f285
|
Added similar species gallery
|
2018-11-25 20:16:11 -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 |
|
WildScotsmen
|
073e039148
|
Pulled in Joey's code and made it work with mine.
|
2018-11-25 16:53:56 -05:00 |