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 |
|
WildScotsmen
|
1778f02d9e
|
Changed the text on the contact page to sponsor's wishes.
|
2018-12-11 15:01:38 -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 |
|
WildScotsmen
|
d879236e67
|
Added paper to collections.
|
2018-12-10 17:25:42 -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
|
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
|
58a87bdda0
|
Fixing Gallery bug
|
2018-12-05 17:31:40 -05:00 |
|
wildscotsmen
|
bb5b90330f
|
Fixed merge conflicts.
|
2018-12-03 02:31:21 -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
|
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 |
|
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
|
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 |
|