Commit graph

2296 commits

Author SHA1 Message Date
Eugene Burmakin
9953c2fb88 Merge branch 'dev' into fix/family-stuff 2025-10-14 13:49:46 +02:00
Evgenii Burmakin
b8ad1a8a5c
Merge pull request #1661 from Freika/feature/full-screen-map
Feature/full screen map
2025-10-14 13:49:34 +02:00
Eugene Burmakin
b1dd654463 Merge branch 'dev', remote-tracking branch 'origin' into feature/full-screen-map 2025-10-14 13:47:58 +02:00
Eugene Burmakin
732839d586 Update icons on the map 2025-10-14 13:47:41 +02:00
Eugene Burmakin
b4fbe6dbda Add a button to copy invitation link for pending invitations 2025-10-14 13:28:56 +02:00
Eugene Burmakin
ce33cf3fb6 Update app version 2025-10-13 15:08:32 +02:00
Evgenii Burmakin
ea340df343
Merge pull request #1803 from Freika/feature/family
Family
2025-10-13 15:08:06 +02:00
Eugene Burmakin
ff70773ea8 Update changelog 2025-10-13 15:07:49 +02:00
Eugene Burmakin
39c3c157c8 Implement real-time family member location updates via ActionCable 2025-10-13 14:10:36 +02:00
Eugene Burmakin
0ee3deedd8 Fix family members tooltip and popup styles 2025-10-13 13:15:54 +02:00
Eugene Burmakin
aff44d6669 Fix stats layout 2025-10-13 12:45:42 +02:00
Evgenii Burmakin
99281317d7
Merge branch 'dev' into feature/family 2025-10-13 12:30:27 +02:00
Eugene Burmakin
a93cb8ff41 Remove comments 2025-10-13 12:25:30 +02:00
Eugene Burmakin
29ae5c04f1 Refactor family membership and invitation policies for clarity and security 2025-10-13 12:23:01 +02:00
Eugene Burmakin
923ea113c8 Fix some minor stuff 2025-10-11 14:17:48 +02:00
Evgenii Burmakin
493db274f5
Merge pull request #1830 from Freika/dev
0.33.1
2025-10-07 22:26:01 +02:00
Eugene Burmakin
d3aa3bd067 Fix missing default map layer when user settings are not set 2025-10-07 22:25:41 +02:00
Eugene Burmakin
cde5af7c24 Rename method call to not shadow variable name 2025-10-07 22:10:48 +02:00
Eugene Burmakin
20d0ed8ec6 Fix dockerfiles 2025-10-07 22:06:42 +02:00
Eugene Burmakin
c2e2a01d2a Update version to 0.33.1 2025-10-07 22:03:46 +02:00
Evgenii Burmakin
e14abb715d
Merge pull request #1837 from Freika/fix/minor-bugs-2025-10
Small fixes
2025-10-07 22:03:26 +02:00
Eugene Burmakin
a7b92c10f5 Fix time shift when creating visits manually 2025-10-07 22:00:11 +02:00
Eugene Burmakin
194f8c3c45 Show visited countries in a modal window on the Trip page 2025-10-07 21:49:58 +02:00
Evgenii Burmakin
8ad5afe216
Merge pull request #1794 from shaman007/issue-1793
Add apt-get upgrade to Dockerfiles
2025-10-07 21:30:50 +02:00
Eugene Burmakin
ab4786d7b9 Fix minor bugs in Stat model related to sharing settings 2025-10-07 21:24:38 +02:00
Eugene Burmakin
87d7b8be7c Fix minor bugs in map visit interactivity and popup styling 2025-10-07 21:16:42 +02:00
Eugene Burmakin
56a20d4db6 Fix popup styling for manual visit creation 2025-10-07 21:02:20 +02:00
Eugene Burmakin
e711ff25fe Refactor family invitations and memberships into separate models and controllers 2025-10-07 18:38:06 +02:00
Eugene Burmakin
c9861663c9 Remove a file related to import optimization plan. 2025-10-05 22:19:48 +02:00
Evgenii Burmakin
8f128bafff
Merge pull request #1829 from Freika/fix/user-data-import
Stream points during user data import
2025-10-05 22:18:41 +02:00
Eugene Burmakin
99110f023b Update changelog 2025-10-05 22:18:25 +02:00
Eugene Burmakin
e31265fdad Compile assets in staging environment 2025-10-05 21:24:47 +02:00
Eugene Burmakin
87c5c34fb4 Update batch size for streaming imports to 5000 2025-10-05 21:18:16 +02:00
Eugene Burmakin
fa995a7f84 Update json_stream_handler_spec.rb path and remove tmp.json 2025-10-05 21:01:34 +02:00
Eugene Burmakin
6591a629ad Stream points during user data import 2025-10-05 20:59:03 +02:00
Eugene Burmakin
6fb5d98b19 Extract update location sharing logic to a service object 2025-10-05 19:40:42 +02:00
Eugene Burmakin
018760812a Extract family functionality to a concern 2025-10-05 14:24:45 +02:00
Eugene Burmakin
c1cff10de3 Update migrations 2025-10-05 14:02:18 +02:00
Eugene Burmakin
0b9a1005e5 Fix tests 2025-10-05 01:09:46 +02:00
Eugene Burmakin
6057240888 Fix some tests 2025-10-05 00:42:21 +02:00
Eugene Burmakin
cd303bce01 Clean up some code 2025-10-04 23:19:00 +02:00
Eugene Burmakin
e7df54d738 Fix routes to use singular resource for family 2025-10-04 23:08:02 +02:00
Eugene Burmakin
54661a1d52 Update some tests and svg icons 2025-10-04 22:52:08 +02:00
Eugene Burmakin
9bc0e2accc Use family path instead of families/id 2025-10-04 22:39:47 +02:00
Eugene Burmakin
cfe319df9b Move family controllers to their own namespace 2025-10-04 20:48:44 +02:00
Eugene Burmakin
f898f3aab0 Fix tests 2025-10-04 20:31:36 +02:00
Eugene Burmakin
8389cd85a3 Fix devise views styling 2025-10-04 18:26:41 +02:00
Eugene Burmakin
0a61f9bf68 Use DaisyUI for styling the Family feature 2025-10-04 16:41:35 +02:00
Andrey Bondarenko
d35f94c33d
Merge branch 'master' into issue-1793 2025-10-04 16:38:24 +02:00
Andrey Bondarenko
d90413bfe1
Resolve conflict
Resolve conflict, add curl
2025-10-04 16:36:49 +02:00