waclaw66 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0c482960ce 
							
						 
					 
					
						
						
							
							fix(web): better year labels ( #5009 )  
						
						... 
						
						
						
						* better year labels
* fixes
* lint fixes 
						
						
					 
					
						2023-11-13 09:37:50 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Dietzler 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d7d464570f 
							
						 
					 
					
						
						
							
							fix maplibre latlng import ( #4977 )  
						
						
						
						
					 
					
						2023-11-12 14:46:17 +01:00 
						 
				 
			
				
					
						
							
							
								Sergey Kondrikov 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							55e3605ca4 
							
						 
					 
					
						
						
							
							feat(web): uniform random asset selection in slideshow mode ( #4953 )  
						
						... 
						
						
						
						* Implement weighted asset selection
* Rename totalAssets -> bucketCount
* Remove redundant check 
						
						
					 
					
						2023-11-12 01:23:15 +00:00 
						 
				 
			
				
					
						
							
							
								Mert 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							328a58ac0d 
							
						 
					 
					
						
						
							
							feat(ml): add face models ( #4952 )  
						
						... 
						
						
						
						added models to config dropdown
fixed downloading
updated tests
use hf for face models
formatting 
						
						
					 
					
						2023-11-11 19:04:49 -06:00 
						 
				 
			
				
					
						
							
							
								Brian Austin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7fca0d8da5 
							
						 
					 
					
						
						
							
							fix: replace first and last name with single field ( #4915 )  
						
						
						
						
					 
					
						2023-11-11 19:03:32 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Dietzler 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ad4cbf20de 
							
						 
					 
					
						
						
							
							refactor: map ( #4957 )  
						
						... 
						
						
						
						* fix mixed up lng lat for asset map
* minor cleanup
* update packages 
						
						
					 
					
						2023-11-11 16:32:39 -06:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							35767591d2 
							
						 
					 
					
						
						
							
							feat(web): show partners assets on the main timeline ( #4933 )  
						
						
						
						
					 
					
						2023-11-11 21:06:19 +00:00 
						 
				 
			
				
					
						
							
							
								martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							92ec1ce77f 
							
						 
					 
					
						
						
							
							fix(server,web): correctly show album level like ( #4916 )  
						
						... 
						
						
						
						* fix: like in global activity
* refactor: rename isGlobal to ReactionLevel.Album
* chore: open api
* chore: e2e test for album vs comment duplicate like checking
---------
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com> 
						
						
					 
					
						2023-11-09 21:32:31 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Dietzler 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a147dee4b6 
							
						 
					 
					
						
						
							
							feat: Maplibre ( #4294 )  
						
						... 
						
						
						
						* maplibre on web, custom styles from server
Actually use new vector tile server, custom style.json
support multiple style files, light/dark mode
cleanup, use new map everywhere
send file directly instead of loading first
better light/dark mode switching
remove leaflet
fix mapstyles dto, first draft of map settings
delete and add styles
fix delete default styles
fix tests
only allow one light and one dark style url
revert config core changes
fix server config store
fix tests
move axios fetches to repo
fix package-lock
fix tests
* open api
* add assets to docker container
* web: use mapSettings color for style
* style: add unique ids to map styles
* mobile: use style json for vector / raster
* do not use svelte-material-icons
* add click events to markers, simplify asset detail map
* improve map performance by using asset thumbnails for markers instead of original file
* Remove custom attribution
(by request)
* mobile: update map attribution
* style: map dark mode
* style: map light mode
* zoom level for state
* styling
* overflow gradient
* Limit maxZoom to 14
* mobile: listen for mapStyle changes in MapThumbnail
* mobile: update concurrency
---------
Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: bo0tzz <git@bo0tzz.me>
Co-authored-by: Alex <alex.tran1502@gmail.com> 
						
						
					 
					
						2023-11-09 10:10:56 -06:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5423f1c25b 
							
						 
					 
					
						
						
							
							refactor(server): auth dtos ( #4881 )  
						
						... 
						
						
						
						* refactor: auth dtos
* chore: open api 
						
						
					 
					
						2023-11-09 10:14:15 -05:00 
						 
				 
			
				
					
						
							
							
								Alex The Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							37ab37bffc 
							
						 
					 
					
						
						
							
							Version v1.85.0  
						
						
						
						
					 
					
						2023-11-08 03:20:59 +00:00 
						 
				 
			
				
					
						
							
							
								martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9d01885b58 
							
						 
					 
					
						
						
							
							feat(server, web): Album's options ( #4870 )  
						
						... 
						
						
						
						* feat: disable activity
* fix: disable reactions
* fix: tests
* fix: tests
* fix: tests
* pr feedback
* pr feedback
* chore: styling & wording
* refactor component
---------
Co-authored-by: Alex Tran <alex.tran1502@gmail.com> 
						
						
					 
					
						2023-11-07 04:37:21 +00:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ace0a5911c 
							
						 
					 
					
						
						
							
							fix(web): optimize deps ( #4877 )  
						
						
						
						
					 
					
						2023-11-06 22:02:46 -06:00 
						 
				 
			
				
					
						
							
							
								Fynn Petersen-Frey 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							21f2d3058a 
							
						 
					 
					
						
						
							
							feat(mobile)!: batched full/initial sync ( #4840 )  
						
						... 
						
						
						
						* feat(mobile): batched full/initial sync
* use OptionalBetween
* skip/take as integer
---------
Co-authored-by: Fynn Petersen-Frey <zoodyy@users.noreply.github.com>
Co-authored-by: Alex Tran <alex.tran1502@gmail.com> 
						
						
					 
					
						2023-11-06 11:40:43 -06:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							279481ad54 
							
						 
					 
					
						
						
							
							feat(server): make is favorite optional on asset upload ( #4865 )  
						
						... 
						
						
						
						* feat(server): make isFavorite optional
* chore: open api
* chore: e2e 
						
						
					 
					
						2023-11-06 09:04:39 -05:00 
						 
				 
			
				
					
						
							
							
								martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a0743d8b7d 
							
						 
					 
					
						
						
							
							feat(web): global activity ( #4796 )  
						
						... 
						
						
						
						* feat: global activity
* fix: tests
* pr feedback
* use flexbox
* fix: deleted control actions
* fix: flex box
* fix: do not show activity tab by default
* feat: better grouping
* fix: set isShared default value to false
* fix: prevent re-rendering the asset grid
* fix: activity status above the scrollbar
* fix: prevent re-rendering the asset grid
* fix: prevent re-rendering the asset grid
* pr feedback
* pr feedback
* pr feedback
* styling and better thumbnail
---------
Co-authored-by: Alex Tran <alex.tran1502@gmail.com> 
						
						
					 
					
						2023-11-05 11:24:43 -06:00 
						 
				 
			
				
					
						
							
							
								Sergey Kondrikov 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cf1dfdc776 
							
						 
					 
					
						
						
							
							fix(web): unstack after stack child selection ( #4834 )  
						
						
						
						
					 
					
						2023-11-04 07:59:21 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2e424fe249 
							
						 
					 
					
						
						
							
							feat(server): better api error messages (for unhandled exceptions) ( #4817 )  
						
						... 
						
						
						
						* feat(server): better error messages
* chore: open api
* chore: remove debug log
* fix: syntax error
* fix: e2e test 
						
						
					 
					
						2023-11-03 20:33:15 -05:00 
						 
				 
			
				
					
						
							
							
								Sergey Kondrikov 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							38443a6068 
							
						 
					 
					
						
						
							
							fix(web): unstacking issues ( #4792 )  
						
						... 
						
						
						
						* Fix typo
* Restore asset store consistency after unstacking
* Fix aspect ratio after unstacking 
						
						
					 
					
						2023-11-03 09:01:48 -05:00 
						 
				 
			
				
					
						
							
							
								waclaw66 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							92bb42950e 
							
						 
					 
					
						
						
							
							fix(web): scrollbar year label visibility ( #4820 )  
						
						... 
						
						
						
						* fixes year label visibility
* format fix 
						
						
					 
					
						2023-11-03 08:54:02 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b58edae134 
							
						 
					 
					
						
						
							
							fix(web): timeline alignment ( #4808 )  
						
						
						
						
					 
					
						2023-11-02 15:11:59 -05:00 
						 
				 
			
				
					
						
							
							
								martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2b9f20a1b5 
							
						 
					 
					
						
						
							
							fix: update like status ( #4803 )  
						
						
						
						
					 
					
						2023-11-02 14:43:27 -04:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d5f8199655 
							
						 
					 
					
						
						
							
							fix(web): scrollbar not showing year ( #4782 )  
						
						... 
						
						
						
						* fix(web): scrollbar not showing year
* grammar
* fix test 
						
						
					 
					
						2023-11-01 20:50:24 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1d35965d03 
							
						 
					 
					
						
						
							
							feat(web): shuffle slideshow order ( #4277 )  
						
						... 
						
						
						
						* feat(web): shuffle slideshow order
* Fix play/stop issues
* Enter/exit fullscreen mode
* Prevent navigation to the next asset after exiting slideshow mode
* Fix entering the slideshow mode from an album page
* Simplify markup of the AssetViewer
Group viewer area and navigation (prev/next/slideshow bar) controls together
* Select a random asset from a random bucket
* Preserve assets order in random mode
* Exit fullscreen mode only if it is active
* Extract SlideshowHistory class
* Use traditional functions instead of arrow functions
* Refactor SlideshowHistory class
* Extract SlideshowBar component
* Fix comments
* Hide Say something in slideshow mode
---------
Co-authored-by: brighteyed <sergey.kondrikov@gmail.com> 
						
						
					 
					
						2023-11-01 21:34:30 -04:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0130591a0f 
							
						 
					 
					
						
						
							
							fix: show/set activity like per user ( #4775 )  
						
						... 
						
						
						
						* fix: like per user
* chore: open api
* chore: e2e test for userId filtering 
						
						
					 
					
						2023-11-01 11:49:12 -04:00 
						 
				 
			
				
					
						
							
							
								Alex The Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							cf4ec06750 
							
						 
					 
					
						
						
							
							Version v1.84.0  
						
						
						
						
					 
					
						2023-11-01 14:46:59 +00:00 
						 
				 
			
				
					
						
							
							
								martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ce5966c23d 
							
						 
					 
					
						
						
							
							feat(web,server): activity ( #4682 )  
						
						... 
						
						
						
						* feat: activity
* regenerate api
* fix: make asset owner unable to delete comment
* fix: merge
* fix: tests
* feat: use textarea instead of input
* fix: do actions only if the album is shared
* fix: placeholder opacity
* fix(web): improve messages UI
* fix(web): improve input message UI
* pr feedback
* fix: tests
* pr feedback
* pr feedback
* pr feedback
* fix permissions
* regenerate api
* pr feedback
* pr feedback
* multiple improvements on web
* fix: ui colors
* WIP
* chore: open api
* pr feedback
* fix: add comment
* chore: clean up
* pr feedback
* refactor: endpoints
* chore: open api
* fix: filter by type
* fix: e2e
* feat: e2e remove own comment
* fix: web tests
* remove console.log
* chore: cleanup
* fix: ui tweaks
* pr feedback
* fix web test
* fix: unit tests
* chore: remove unused code
* revert useless changes
* fix: grouping messages
* fix: remove nullable on updatedAt
* fix: text overflow
* styling
---------
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
Co-authored-by: Alex Tran <alex.tran1502@gmail.com> 
						
						
					 
					
						2023-10-31 22:13:34 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							197f336b5f 
							
						 
					 
					
						
						
							
							fix(web): no preload repair report ( #4749 )  
						
						
						
						
					 
					
						2023-10-31 20:37:32 +00:00 
						 
				 
			
				
					
						
							
							
								Daniel Dietzler 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cd375a976e 
							
						 
					 
					
						
						
							
							feat(server): custom library scanning interval ( #4390 )  
						
						... 
						
						
						
						* add automatic library scan config options
* add validation
* open api
* use CronJob instead of cron-validator
* fix tests
* catch potential error of the library scan initialization
* better description for input field
* move library scan job initialization to server app service
* fix tests
* add comments to all parameters of cronjob contructor
* make scan a child of a more general library object
* open api
* chore: cleanup
* move cronjob handling to job repoistory
* web: select for common cron expressions
* fix open api
* fix tests
* put scanning settings in nested accordion
* fix system config validation
* refactor, tests
---------
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com> 
						
						
					 
					
						2023-10-31 15:19:12 -05:00 
						 
				 
			
				
					
						
							
							
								Mert 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							87a0ba3db3 
							
						 
					 
					
						
						
							
							feat(ml): export clip models to ONNX and host models on Hugging Face ( #4700 )  
						
						... 
						
						
						
						* export clip models
* export to hf
refactored export code
* export mclip, general refactoring
cleanup
* updated conda deps
* do transforms with pillow and numpy, add tokenization config to export, general refactoring
* moved conda dockerfile, re-added poetry
* minor fixes
* updated link
* updated tests
* removed `requirements.txt` from workflow
* fixed mimalloc path
* removed torchvision
* cleaner np typing
* review suggestions
* update default model name
* update test 
						
						
					 
					
						2023-10-31 05:02:04 -05:00 
						 
				 
			
				
					
						
							
							
								martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9a60578088 
							
						 
					 
					
						
						
							
							fix(web): multiple improvements for people page (1) ( #4717 )  
						
						... 
						
						
						
						* fix(web): multiple improvements for people page
* feat: better responsive icons 
						
						
					 
					
						2023-10-30 14:40:28 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8dcd159bd6 
							
						 
					 
					
						
						
							
							chore(server): remove user count endpoint ( #4724 )  
						
						... 
						
						
						
						* chore: remove unused endpoint
* chore: open api 
						
						
					 
					
						2023-10-30 19:29:18 +00:00 
						 
				 
			
				
					
						
							
							
								Fynn Petersen-Frey 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ce04e9e07a 
							
						 
					 
					
						
						
							
							feat(server): hardware video acceleration for Rockchip SOCs via RKMPP ( #4645 )  
						
						... 
						
						
						
						* feat(server): hardware video acceleration for Rockchip SOCs via RKMPP
* add tests
* use LD_LIBRARY_PATH for custom ffmpeg
* incorporate review feedback
* code re-use for ffmpeg call
* review feedback 
						
						
					 
					
						2023-10-30 09:39:37 -05:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c54a188154 
							
						 
					 
					
						
						
							
							fix(web): sidebar setting not updating when there is a new property added to the data payload ( #4708 )  
						
						
						
						
					 
					
						2023-10-30 09:17:37 -05:00 
						 
				 
			
				
					
						
							
							
								Mayuresh Dharwadkar 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c77ba46d60 
							
						 
					 
					
						
						
							
							docs: fix typos ( #4713 )  
						
						
						
						
					 
					
						2023-10-30 09:17:10 -05:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a6f39bc74f 
							
						 
					 
					
						
						
							
							fix(web): Improve UI/UX for shared link form ( #4685 )  
						
						... 
						
						
						
						* chore(web): Improve shared link form
* add verification for password
* improve ux 
						
						
					 
					
						2023-10-29 13:50:43 -05:00 
						 
				 
			
				
					
						
							
							
								doggo 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							daad02504f 
							
						 
					 
					
						
						
							
							feat(web): added toggle for Sharing button in the sidebar ( #4674 )  
						
						... 
						
						
						
						* Added toggle for Sharing button in the sidebar
* fix: format
---------
Co-authored-by: Alex Tran <alex.tran1502@gmail.com> 
						
						
					 
					
						2023-10-29 01:42:51 +00:00 
						 
				 
			
				
					
						
							
							
								jarvis2f 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8a6889529c 
							
						 
					 
					
						
						
							
							feat(server,web,mobile): Add optional password option for share links. ( #4655 )  
						
						... 
						
						
						
						* feat(server,web,mobile): Add optional password option for share links.
Signed-off-by: jarvis2f <137974272+jarvis2f@users.noreply.github.com>
* feat(server,web): Update shared-link.controller and page.svelte for improved cookie handling and metadata updates.
Signed-off-by: jarvis2f <137974272+jarvis2f@users.noreply.github.com>
---------
Signed-off-by: jarvis2f <137974272+jarvis2f@users.noreply.github.com> 
						
						
					 
					
						2023-10-28 20:35:38 -05:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b34cbd881a 
							
						 
					 
					
						
						
							
							fix(web): scrollbar does not show all years ( #4684 )  
						
						
						
						
					 
					
						2023-10-29 01:31:33 +00:00 
						 
				 
			
				
					
						
							
							
								martin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f0dd1d715a 
							
						 
					 
					
						
						
							
							fix(web): table headers when there's no album ( #4673 )  
						
						
						
						
					 
					
						2023-10-28 14:34:45 -05:00 
						 
				 
			
				
					
						
							
							
								Alex The Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							d98a2a5f79 
							
						 
					 
					
						
						
							
							Version v1.83.0  
						
						
						
						
					 
					
						2023-10-28 13:32:48 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Tran 
							
						 
					 
					
						
						
						
						
							
						
						
							275717b8e3 
							
						 
					 
					
						
						
							
							chore(web): motion photo icon  
						
						
						
						
					 
					
						2023-10-27 23:59:44 -05:00 
						 
				 
			
				
					
						
							
							
								Alex Tran 
							
						 
					 
					
						
						
						
						
							
						
						
							51dc197b33 
							
						 
					 
					
						
						
							
							fix(web): stacked vs normal asset rendering  
						
						
						
						
					 
					
						2023-10-27 20:57:37 -05:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8b5b6d0821 
							
						 
					 
					
						
						
							
							feat(web): manual stacking asset ( #4650 )  
						
						... 
						
						
						
						Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> 
						
						
					 
					
						2023-10-27 20:34:01 +00:00 
						 
				 
			
				
					
						
							
							
								Wingy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a08a687951 
							
						 
					 
					
						
						
							
							refactor(server, web): standardize theme api response ( #4664 )  
						
						... 
						
						
						
						* web: standardize theme api response
* revert makefile change that i didn't mean to commit 
						
						
					 
					
						2023-10-27 02:32:33 +00:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c76c1d6bf8 
							
						 
					 
					
						
						
							
							refactor: always use the same bucket size ( #4662 )  
						
						
						
						
					 
					
						2023-10-26 13:55:10 -05:00 
						 
				 
			
				
					
						
							
							
								shenlong 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b49b10141e 
							
						 
					 
					
						
						
							
							fix(mobile): stack count reset when navigating to library ( #4647 )  
						
						... 
						
						
						
						Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> 
						
						
					 
					
						2023-10-26 09:19:06 -05:00 
						 
				 
			
				
					
						
							
							
								Wingy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cb0e37e76e 
							
						 
					 
					
						
						
							
							fix(web): fix Theme Custom CSS endpoint requiring the user to be logged in as the server admin ( #4633 )  
						
						... 
						
						
						
						* fix custom css requiring the user to be the admin and logged in
* move theme api to custom endpoint
* add e2e test 
						
						
					 
					
						2023-10-25 22:13:05 +00:00 
						 
				 
			
				
					
						
							
							
								Alex 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cf71a41bae 
							
						 
					 
					
						
						
							
							fix(web): asset ownership does not update when navigating ( #4643 )  
						
						
						
						
					 
					
						2023-10-25 12:14:15 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Rasmussen 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2ad389f64e 
							
						 
					 
					
						
						
							
							refactor(web): material icons ( #4636 )  
						
						
						
						
					 
					
						2023-10-25 13:48:25 +00:00