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 |
|
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
|
800c21fc39
|
Removed commented out code and auto structured index.
|
2018-12-02 17:53:13 -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
|
c9a771d1bc
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application into refactor/index-and-manifest
|
2018-11-30 19:44:41 -05:00 |
|
wildscotsmen
|
61631af341
|
Finalized index.html and manifest.json
|
2018-11-30 19:44:27 -05:00 |
|
Jacob McCloughan
|
85bc95cd54
|
Merge pull request #62 from alDuncanson/feature/theme-swapping
Theme swapping
|
2018-11-30 18:45:10 -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 |
|
Jacob McCloughan
|
c3974fe5ea
|
Merge pull request #61 from alDuncanson/flamelinkCollectionOrder
Reordering the collection entries works now.
|
2018-11-29 22:05:40 -05:00 |
|
ajmaley
|
c76d1fbeb6
|
Reordering the collection entries works now.
|
2018-11-27 17:46:12 -05:00 |
|
Alex Duncanson
|
68c1c9bdac
|
Merge pull request #60 from alDuncanson/similarSpeciesGallery
Added similar species gallery
|
2018-11-26 08:39:07 -05:00 |
|
ajmaley
|
0f4f10f285
|
Added similar species gallery
|
2018-11-25 20:16:11 -05:00 |
|
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
|
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 |
|