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 |
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 |
|
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 |
|
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 |
|
Alex Duncanson
|
a9bf3aa5e4
|
Merge pull request #41 from alDuncanson/refactor/code-cleanup
Code cleanup
|
2018-10-29 13:32:48 -04:00 |
|
Alex Duncanson
|
1d6d1b5d6b
|
Merge pull request #40 from alDuncanson/feature/als-sighting-list
Feature/als sighting list
|
2018-10-29 13:31:19 -04:00 |
|
wildscotsmen
|
4617f31be2
|
Fixed some issues with ordering in report form code.
|
2018-10-29 00:38:19 -04:00 |
|
wildscotsmen
|
c9f22b74d5
|
Cleaned code for consistency. Additionally added month function for report form.
|
2018-10-29 00:33:35 -04:00 |
|
Al Duncanson
|
94f5222c61
|
merging
|
2018-10-27 18:07:30 -04:00 |
|
Al Duncanson
|
71b6ce9ad7
|
fixed sighting detail and disqus size
|
2018-10-27 17:24:42 -04:00 |
|
Al Duncanson
|
5366b67a98
|
fixed map sizing
|
2018-10-27 17:14:16 -04:00 |
|
Al Duncanson
|
7736f3ff33
|
made list scrollable
|
2018-10-27 16:59:36 -04:00 |
|
Al Duncanson
|
7543839985
|
best I got right now
|
2018-10-27 16:08:53 -04:00 |
|
wildscotsmen
|
5182b92b82
|
Fixed issue from merge conflict.
|
2018-10-27 15:15:47 -04:00 |
|
wildscotsmen
|
229bc1fa51
|
Fixed merge conflict.
|
2018-10-27 15:15:03 -04:00 |
|
Al Duncanson
|
49eaa2a4f4
|
added sighting detail map
|
2018-10-26 17:43:09 -04:00 |
|
Al Duncanson
|
48273519cb
|
reworked GA
|
2018-10-26 16:34:08 -04:00 |
|
Al Duncanson
|
97bb9d03cf
|
added google analytics
|
2018-10-26 16:26:00 -04:00 |
|
Al Duncanson
|
d539a3b293
|
merge
|
2018-10-26 14:27:03 -04:00 |
|
Al Duncanson
|
8c08f37c1d
|
Merge branch 'master' of https://github.com/alDuncanson/marten-application
|
2018-10-26 14:22:20 -04:00 |
|
Al Duncanson
|
d026ae12e2
|
added hotjar
|
2018-10-26 14:18:14 -04:00 |
|
Al Duncanson
|
66fb1fc6f1
|
quick changes
|
2018-10-26 13:24:10 -04:00 |
|
Alex Duncanson
|
9aca4c949b
|
Merge pull request #36 from alDuncanson/feature/map-formatting
Formatted database data in InfoWindows on Sighting Map.
|
2018-10-26 12:06:11 -04:00 |
|
Alex Duncanson
|
d44eb373f9
|
Merge pull request #37 from alDuncanson/feature/report-form-toast
Added toast to report form.
|
2018-10-26 11:45:33 -04:00 |
|
Alex Duncanson
|
26ce296cb3
|
Merge pull request #35 from alDuncanson/feature/quiz-game-improvement
Added reset button to quiz and made text Material UI-esque.
|
2018-10-26 11:45:14 -04:00 |
|
Al Duncanson
|
4f064e546e
|
added styles and sighting details
|
2018-10-26 11:04:44 -04:00 |
|
wildscotsmen
|
f0d1821aea
|
Added toast to report form.
|
2018-10-25 22:46:36 -04:00 |
|
wildscotsmen
|
700515a66b
|
Formatted database data in InfoWindows on Sighting Map.
|
2018-10-25 22:15:48 -04:00 |
|
Al Duncanson
|
15e853640d
|
removed window state
|
2018-10-25 21:55:48 -04:00 |
|
Al Duncanson
|
4d0188d144
|
added sighting list, and custom comment thread
|
2018-10-25 21:26:18 -04:00 |
|
wildscotsmen
|
760c5b77de
|
Put button inside div and rearranged some code.
|
2018-10-25 20:53:17 -04:00 |
|
wildscotsmen
|
19e24a2747
|
Added reset button to quiz and made text Material UI-esque.
|
2018-10-25 20:32:55 -04:00 |
|
Alex Duncanson
|
16f6dde825
|
Merge pull request #34 from alDuncanson/feature/nav-bar
Feature/nav bar
|
2018-10-25 13:27:42 -04:00 |
|
Al Duncanson
|
147513571f
|
fixed mobile styles
|
2018-10-25 11:31:38 -04:00 |
|
Al Duncanson
|
fc452c5e35
|
changed quiz icons
|
2018-10-25 01:20:27 -04:00 |
|
Al Duncanson
|
1c959b7a32
|
rewrote structure for new nav
|
2018-10-25 01:09:49 -04:00 |
|
Al Duncanson
|
582b3f4a6a
|
package updates
|
2018-10-24 18:15:08 -04:00 |
|
Al Duncanson
|
970762faa3
|
fixed merge conflicts, added new nav
|
2018-10-24 18:09:23 -04:00 |
|
Alex Duncanson
|
b02e9d26a6
|
Merge pull request #32 from alDuncanson/feature/quiz-game
feature/quiz-game
|
2018-10-24 17:13:41 -04:00 |
|
Al Duncanson
|
60e252cb72
|
updated navigation structure
|
2018-10-24 13:09:53 -04:00 |
|
Al Duncanson
|
2839943cfe
|
added custom icons
|
2018-10-23 18:38:00 -04:00 |
|
wildscotsmen
|
1fefd8cf1c
|
Updated quiz component to include questions by sponsor and also have tabs for different difficulty settings. Will implement the harder quizzes next sprint, likely.
|
2018-10-22 19:25:49 -04:00 |
|
Jacob McCloughan
|
de484052f7
|
Merge pull request #33 from alDuncanson/refactor/report-form
Updated report form to sponsor's specifications.
|
2018-10-19 22:13:22 -04:00 |
|
wildscotsmen
|
204f3d2a7a
|
Updated confidence level labels to sponsor's suggestions.
|
2018-10-19 16:25:09 -04:00 |