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 |
|
ajmaley
|
305f405468
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application
|
2018-12-12 11:25:38 -05:00 |
|
Alex Duncanson
|
f31d29f76c
|
Merge pull request #73 from alDuncanson/bugfix/list
The actual last PR
|
2018-12-12 00:34:35 -05:00 |
|
wildscotsmen
|
0e9a85e803
|
Fixed issue with sighting list, although I hate my solution.
|
2018-12-11 23:54:52 -05:00 |
|
Alex Duncanson
|
e9b5e1f9cd
|
Update readme.md
|
2018-12-11 17:22:47 -05:00 |
|
Alex Duncanson
|
49e019e770
|
Update readme.md
|
2018-12-11 17:17:35 -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 |
|
Alex Duncanson
|
72bc8d6552
|
Merge pull request #72 from alDuncanson/bugfix/router
The final PR
|
2018-12-11 17:02:22 -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 |
|
WildScotsmen
|
a486cc0e79
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application
|
2018-12-11 14:46:30 -05:00 |
|
Al Duncanson
|
c664b36d55
|
style fixes
|
2018-12-11 12:22:06 -05:00 |
|
Alex Duncanson
|
8548110ecd
|
Merge pull request #71 from alDuncanson/feature/routing
Feature/routing
|
2018-12-11 10:31:50 -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 |
|
Alex Duncanson
|
65967c3e68
|
Merge pull request #70 from alDuncanson/icons-and-fixes
Icons and fixes
|
2018-12-11 10:16:48 -05:00 |
|
Al Duncanson
|
b2ec6c9388
|
Merge branch 'master' into icons-and-fixes
|
2018-12-10 22:27:50 -05:00 |
|
Al Duncanson
|
acc7aa5d98
|
finished new icons
|
2018-12-10 22:01:42 -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 |
|
Alex Duncanson
|
0d6186a3ba
|
Merge pull request #69 from alDuncanson/feature/trail-cam-fixes
Fixed quiz answers.
|
2018-12-10 19:01:14 -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 |
|
WildScotsmen
|
80cd14091e
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application
|
2018-12-10 16:44:40 -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 |
|
ajmaley
|
4d989193dd
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application
|
2018-12-07 13:40:28 -05:00 |
|
Al Duncanson
|
b3a819800c
|
add hotjar
|
2018-12-07 13:32:49 -05:00 |
|
ajmaley
|
e14a8ef31e
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application
|
2018-12-07 12:56:49 -05:00 |
|
Alex Duncanson
|
d677a6f3a4
|
Merge pull request #66 from alDuncanson/galleryRedo2
Gallery redo2
|
2018-12-06 10:03:50 -05:00 |
|
Al Duncanson
|
5e29fc0312
|
Merge branch 'master' into galleryRedo2
|
2018-12-06 10:01:39 -05:00 |
|
ajmaley
|
3581d03a48
|
Merge branch 'galleryRedo2'
|
2018-12-06 09:59:58 -05:00 |
|
ajmaley
|
163121b22e
|
Gallery not recovering from slow network bug fix
|
2018-12-05 20:35:45 -05:00 |
|
Jacob McCloughan
|
50dda54b4e
|
Merge pull request #65 from alDuncanson/refactor/restructure-and-minor-bugfix
Project restructuring and list bugfix.
|
2018-12-05 17:42:31 -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 |
|
Jacob McCloughan
|
ecad9c69df
|
Merge pull request #64 from alDuncanson/feature/theme-cookies
Theme cookies
|
2018-12-03 02:27:57 -05:00 |
|
Jacob McCloughan
|
54b1378458
|
Merge pull request #63 from alDuncanson/refactor/index-and-manifest
Updating index and manifest
|
2018-12-03 02:27:48 -05:00 |
|
wildscotsmen
|
0ac722ed11
|
Fixed formatting in App.js.
|
2018-12-02 21:15:24 -05:00 |
|