Nicolas Werner
66e69d7f2b
Ignore return value of write() in signal handler
2021-06-30 15:48:54 +02:00
Nicolas Werner
9f7064676c
Get rid of boost dependency for stacktraces
2021-06-30 15:01:41 +02:00
Nicolas Werner
590395a08b
Fix too many newlines in reply fallback
2021-06-30 12:22:22 +02:00
Nicolas Werner
2c307a4dee
Fix error message for /sync
2021-06-30 12:21:57 +02:00
Nicolas Werner
00f251753e
Use coeurl for networking
...
Something is still wrong on shutdown, need to debug that.
And CI will fail.
2021-06-30 02:43:36 +02:00
Nicolas Werner
78c69a8f7b
Fix tags going missing if you join communities
2021-06-26 23:56:34 +02:00
Stuart Mumford
7fab2925b4
Apply suggestions from code review
2021-06-25 15:44:15 +01:00
Stuart Mumford
9194b87bdc
Update src/timeline/TimelineModel.cpp
2021-06-25 15:21:04 +01:00
Stuart Mumford
d60ea38cb8
Add another regex to match inline img tags using single quotes
...
Signed-off-by: Stuart Mumford <stuart@cadair.com>
2021-06-25 12:14:45 +01:00
Nicolas Werner
4a5414975d
fix sort by unread not getting persisted
2021-06-25 11:35:27 +02:00
Nicolas Werner
6a807894b4
Increase contrast of dark theme secondary colors slightly
2021-06-25 11:35:26 +02:00
Nicolas Werner
f8dfc72625
Fix spaces showing up with world filter
2021-06-25 11:35:26 +02:00
Nicolas Werner
d30446a8b3
Don't spam key requests directly after startup
2021-06-25 11:35:24 +02:00
Nicolas Werner
884fb74d2d
Add a basic 'Space page'
2021-06-25 11:34:19 +02:00
Nicolas Werner
c69d2ef648
Fix off by 1 in previousRoom condition
2021-06-25 11:34:19 +02:00
Nicolas Werner
f349b0cce0
Hide spaces by default, unless they are in the current space filter
2021-06-25 11:34:18 +02:00
Nicolas Werner
0ec7be3090
Fix hiding rooms from a space
2021-06-25 11:34:18 +02:00
Nicolas Werner
6bfa6c4c79
Allow filtering by space
2021-06-25 11:34:18 +02:00
Nicolas Werner
12ce7686ce
Show some spaces in the community sidebar
2021-06-25 11:34:17 +02:00
Alexander Bantyev
358a39e6d2
fixup! Allow editing unsent messages
2021-06-19 23:26:21 +03:00
Alexander Bantyev
42bf8799ee
fixup! Allow editing unsent messages
2021-06-19 23:11:34 +03:00
Alexander Bantyev
f8d2564e46
fixup! Allow editing unsent messages
2021-06-18 20:25:44 +03:00
Alexander Bantyev
9f798e76ed
Allow editing unsent messages
...
As of 0db4d71ec2
(Prevent edits of
unsent messages), messages that are edits of (or replies to) unsent
messages were not allowed. This change was made because otherwise
the edits were discarded due to use of txnid rather than mxid in the
"m.relates_to" object. Remove this restriction and fix the issue by
replacing txnid with mxid in all related events when the message is
sent (and we obtain mxid from the server).
2021-06-18 16:38:55 +03:00
Nicolas Werner
84434433f2
Fix wrong tags in context menu
2021-06-14 23:40:06 +02:00
Nicolas Werner
019bcf5f5c
Fix copy and paste fail for low prio avatar
2021-06-14 23:23:46 +02:00
Nicolas Werner
e6878ee298
Don't read avatarUrl from local profile, if no global avatar is set
2021-06-12 16:05:45 +02:00
Nicolas Werner
7d5e82c888
Merge branch 'master' into qml-roomlist
2021-06-12 15:05:07 +02:00
Nicolas Werner
4985e1f536
Persist sidebar sizes
2021-06-12 14:09:08 +02:00
Nicolas Werner
1d80f5d0b4
Remove useless capture
2021-06-11 21:25:21 +02:00
Nicolas Werner
a5291605a9
Reenable tag hiding
2021-06-11 17:54:05 +02:00
Nicolas Werner
8d2d8dc267
Enable toggling tags
2021-06-11 14:51:29 +02:00
Nicolas Werner
d8c0d4874b
Render community items
2021-06-11 13:12:43 +02:00
Nicolas Werner
2cd1a931c2
Basic community list model
2021-06-09 23:52:28 +02:00
Joseph Donofry
0a833b6e9b
Avoid unnecessary QColor -> QString conversions
2021-06-08 17:20:09 -04:00
Nicolas Werner
d364c29c43
Implement switching in narrow mode
2021-06-08 22:22:33 +02:00
DeepBlueV7.X
f08fb0264d
Merge pull request #600 from govynnus/registration-well-known
...
Registration well known
2021-06-03 18:12:33 +00:00
Callum Brown
78607a7e59
Do a .well-known lookup during registration
2021-06-03 14:52:41 +01:00
Callum Brown
b8b0b5c618
Give registration server input its own error label
2021-06-03 13:56:43 +01:00
Nicolas Werner
53fcf7f428
Port remaining sidebar actions to qml
2021-05-30 12:41:44 +02:00
Nicolas Werner
567078d39f
Try to get rid of an allocation
2021-05-30 01:09:16 +02:00
Nicolas Werner
dfe2495d9a
Optimize completion model by only splitting on normal spaces
2021-05-30 00:30:43 +02:00
Nicolas Werner
18ff58edb3
Fix use after free from Qml widget
2021-05-30 00:23:57 +02:00
pcworld
010debe3e4
Fix notifications in narrow view when content is hidden
...
In narrow view, a room can be selected even if the view currently only
shows the room list and the timeline is hidden.
This commit ensures that in this case, notifications are not suppressed.
2021-05-29 02:57:37 +02:00
Nicolas Werner
2174f6507f
Fix warning
2021-05-28 23:50:04 +02:00
Nicolas Werner
03d30a2abc
Delete old room list
2021-05-28 23:25:57 +02:00
Nicolas Werner
298822baea
Move currentRoom/timeline handling to roomlist
2021-05-28 22:14:59 +02:00
Nicolas Werner
e2765212fb
Reimplement room context menus
2021-05-28 17:25:46 +02:00
Nicolas Werner
c290b0747f
Reenable invites
2021-05-24 14:04:07 +02:00
Nicolas Werner
6112badb08
Reenable userInfo settings menu
2021-05-22 15:19:44 +02:00
Nicolas Werner
f2bc184550
Fix device list not showing up and UserProfile blocking the window
2021-05-22 14:31:38 +02:00
Nicolas Werner
d307f24adf
Fix leaving rooms
2021-05-22 11:23:16 +02:00
Nicolas Werner
f3d956aebc
Fix emoji in new RoomList
2021-05-22 10:16:42 +02:00
Nicolas Werner
beeb60e4a1
Sort the room list
2021-05-22 00:57:14 +02:00
Nicolas Werner
cd67046f60
Make roomlist look nice
2021-05-21 21:19:03 +02:00
Nicolas Werner
10fd2752f9
Some basic room list
2021-05-19 19:34:10 +02:00
Nicolas Werner
567fe81ad7
Basic header and footer of room list
2021-05-15 13:05:55 +02:00
Nicolas Werner
39a43ad4ab
Reorganize TimelineView to prepare porting the room list
2021-05-14 15:23:40 +02:00
Nicolas Werner
5658be5215
Move global avatarSize property
2021-05-13 11:32:28 +02:00
Nicolas Werner
22afa122c4
Move openLink to Nheko globals
2021-05-13 08:53:56 +02:00
Nicolas Werner
a7f8b23b52
Make palette global in Qml
2021-05-13 08:23:56 +02:00
Nicolas Werner
d52c2515bc
Fix stray 'a' in @room escaping
2021-05-11 15:10:28 +02:00
Nicolas Werner
b60d6f4d58
Mark unsent events as uneditable
...
fixes #574
2021-05-09 13:02:41 +02:00
Nicolas Werner
2df4c532ed
Add TOFU (Trust On First Use) mode to encryption
2021-05-07 17:01:57 +02:00
Nicolas Werner
0d0709ccd3
Show verification status next to messages
2021-05-07 17:01:57 +02:00
Nicolas Werner
ab0baf5d9e
Only show actions, when you have permissions to do them
2021-05-02 18:06:56 +02:00
Nicolas Werner
986b561c34
Fix crash when you have no rooms and open the profile as well as not rendering rooms without groups
2021-04-30 15:33:17 +02:00
Nicolas Werner
7431b51d27
Update mtxclient to use new login parameters
...
fixes #558
2021-04-30 14:46:40 +02:00
Nicolas Werner
6d464381e4
Fix missing license header
2021-04-29 22:52:55 +02:00
Nicolas Werner
f626de0447
Copy link to message
...
fixes #499
2021-04-29 21:46:49 +02:00
Nicolas Werner
82fa8ab292
Highlight navigated to message
2021-04-29 19:09:16 +02:00
Nicolas Werner
620b6e8838
Fix some encoding issues when translating matrix.to to matrix:
2021-04-29 13:12:09 +02:00
Nicolas Werner
dbf23fafbf
Make pagination logic slightly more robust
2021-04-29 10:23:50 +02:00
Nicolas Werner
76a9240076
Rewrite matrix.to links to matrix uris and handle them the same way
2021-04-28 20:03:52 +02:00
Nicolas Werner
2b253ead9e
Make forward messages a bit more readable
2021-04-27 11:33:46 +02:00
Nicolas Werner
8236f6ba72
Merge branch 'forward_message_feature' of https://github.com/Jedi18/nheko into Jedi18-forward_message_feature
2021-04-24 14:35:21 +02:00
Nicolas Werner
72d74ac59f
Fix rendering issues with ) in links
2021-04-24 14:32:24 +02:00
Nicolas Werner
6fd485a74a
Fix completions in plain text mode
2021-04-24 14:32:24 +02:00
targetakhil
ddb1983c63
fix macos build error
2021-04-22 11:06:19 +05:30
Nicolas Werner
1936749ff5
Fix keys not being reshared to the same devices, that already got them, if the message got lost
2021-04-20 19:52:23 +02:00
Nicolas Werner
20c1ca2aae
Fix a a session with a higher minimum index being able to overwrite an older one
2021-04-20 14:19:07 +02:00
Nicolas Werner
95a603fd62
Linkify matrix uris
2021-04-19 16:35:06 +02:00
Nicolas Werner
d6109b95fb
Escape html in topics and show line breaks in the settings
2021-04-19 11:20:52 +02:00
Nicolas Werner
c2e625756c
Use one CompletionProxy for everything including EmojiPicker
2021-04-18 21:53:39 +02:00
Nicolas Werner
1b0af04cc8
Prevent warning on empty user requests
2021-04-18 21:53:36 +02:00
Joseph Donofry
a402e85a0f
Fix display name referenced for incorrect event types
2021-04-18 15:32:28 -04:00
targetakhil
5a5aba662e
make util strip util functions non-static and move definition to cpp file
2021-04-18 12:03:25 +05:30
targetakhil
ab83c7c3a8
change display name wording
2021-04-18 11:43:02 +05:30
targetakhil
2dfa40e017
strip reply fallbacks from forwarded message
2021-04-18 11:22:44 +05:30
targetakhil
06e12a0a16
move detection code to nheko namespace and fix a few other bugs
2021-04-17 22:58:04 +05:30
targetakhil
eb13f7c169
directly upload old file object and reuse old message
2021-04-17 22:28:17 +05:30
targetakhil
9934004702
remove unused function and set position to center of timeline view
2021-04-15 22:37:47 +05:30
targetakhil
6893e3a8d5
show forward menu item only for relevant events, changes to ui
2021-04-15 22:37:47 +05:30
targetakhil
603ff33ea6
added basic forwarding
2021-04-15 22:37:41 +05:30
Nicolas Werner
99314c948e
Fix broken olm channels automatically
2021-04-13 23:43:09 +02:00
Nicolas Werner
8108d98fa7
Store state events with state keys
2021-04-13 14:36:37 +02:00
LordMZTE
2e597263a2
add notice and rainbownotice commands
2021-04-11 21:47:20 +02:00
Nicolas Werner
7d6bd67615
Improve sorting a bit and fix some bugs in edge cases
...
makes nheko appear at the top, if you search for it as well as TWIM match the twim room
2021-04-09 17:20:07 +02:00
Nicolas Werner
ff449c705c
Fix crash on exit
2021-04-09 01:47:13 +02:00
Nicolas Werner
c8a547630b
Fix a weird edge case with persisted empty event ids
...
No idea, how that happened and where it came from
2021-04-08 12:56:31 +02:00
Nicolas Werner
795b8fb7dd
Fix small leak in TrayIcon
2021-04-08 12:26:15 +02:00
Nicolas Werner
ec6f0f9296
Don't use direct image response objects anymore
2021-04-05 13:58:00 +02:00
Nicolas Werner
007ee38b04
Fix exif rotation in unencrypted rooms
2021-04-04 00:15:08 +02:00
Nicolas Werner
8719d59e22
Fix rainbow replies and add rainbowme
2021-04-01 17:51:30 +02:00
Nicolas Werner
fa68ae9fe9
Tweak rainbow slightly
2021-03-28 20:56:08 +02:00
Nicolas Werner
edaeb3ccde
Fix emojis being split by rainbows
2021-03-28 20:41:08 +02:00
DeepBlueV7.X
326f48d87f
Merge pull request #535 from LordMZTE/feature/rainbow
...
add /rainbow command
2021-03-28 18:23:50 +00:00
Anjani Kumar
a8f5672715
Lint Code
2021-03-28 22:09:57 +05:30
LordMZTE
4b45c61024
run formatter
2021-03-28 17:37:36 +02:00
DeepBlueV7.X
3317d4582d
Update src/timeline/InputBar.cpp
2021-03-28 14:00:13 +00:00
DeepBlueV7.X
463dd20682
Use QRegularExpression
2021-03-28 13:59:47 +00:00
LordMZTE
6c31bb6ddc
fix command parsing
2021-03-28 15:36:46 +02:00
LordMZTE
ff2e7bb989
commands now also work with newline after them
2021-03-28 14:49:34 +02:00
LordMZTE
e7f20eeae0
use QString as buf in rainbowifyer
2021-03-28 14:14:05 +02:00
LordMZTE
4e6150f28e
implement requested changes
2021-03-28 14:00:35 +02:00
Anjani Kumar
4201ade5ae
Fix build: refactor variables to avoid same names in a scope
2021-03-28 14:22:47 +05:30
LordMZTE
64e29b07e2
remove incorrect include
2021-03-27 17:04:00 +01:00
LordMZTE
39ff68c6e6
use QString to format in rainbow function
2021-03-27 16:06:42 +01:00
LordMZTE
939f00c90d
rainbow now works with unicode!
2021-03-27 14:35:06 +01:00
LordMZTE
a898abcecb
use qtextboundary finder to rainbowify. (not working for unicode chars yet)
2021-03-27 14:16:40 +01:00
LordMZTE
947b8c0291
fix size type
2021-03-27 12:47:18 +01:00
Loren Burkholder
ea2fb7f8df
Add part/leave command
2021-03-25 20:19:48 -04:00
LordMZTE
44bd3376ce
add /rainbow command
2021-03-26 00:42:46 +01:00
salahmak
2108d98c6d
Pressing escape hides PreviewUploadOverlay
2021-03-20 21:09:04 +01:00
salahmak
21a649492f
Pressing escape hides PreviewUploadOverlay
2021-03-20 11:18:16 +01:00
Nicolas Werner
b31e74d9f6
Reserve memory for rooms in completer
2021-03-19 04:59:28 +01:00
DeepBlueV7.X
f6de66576c
Merge pull request #475 from LorenDB/htmlFormattedNotifs
...
Better notifications
2021-03-18 15:46:04 +01:00
Nicolas Werner
1408b1a97d
Make CI happy
2021-03-17 22:13:12 +01:00
Anjani Kumar
9b9d784a82
Prevent EventType::Unsupported type events to be saved in db, avoiding exceptions
2021-03-18 02:09:23 +05:30
Nicolas Werner
21562eed75
Fix shadowing
2021-03-17 20:32:12 +01:00
Nicolas Werner
95bbc559fa
Add missing QPointer include
2021-03-17 19:45:02 +01:00
Nicolas Werner
f6d2fa5ec1
Fix licenses
2021-03-17 19:18:46 +01:00
Nicolas Werner
e5d75c814b
Clean up notification code a bit
2021-03-17 19:18:07 +01:00
Nicolas Werner
95026dcc62
Refactor image download code to be reusable
2021-03-17 19:18:07 +01:00
Loren Burkholder
41737ac22c
Simplify image loading
2021-03-17 19:18:07 +01:00
Loren Burkholder
95a26edad2
Don't create a QImage every time
2021-03-17 19:18:07 +01:00
Loren Burkholder
716c598f4a
Simplify macOS checks for a null image
2021-03-17 19:18:07 +01:00
Loren Burkholder
5da6ab0aec
make lint
2021-03-17 19:18:07 +01:00
Loren Burkholder
98b2fee71b
Block notifications until the image has been downloaded
2021-03-17 19:18:07 +01:00
Loren Burkholder
64dd10a6a0
Only try to display images if they exist
2021-03-17 19:18:06 +01:00
Loren Burkholder
82bbdfb929
Use better method of resizing images
2021-03-17 19:18:06 +01:00
Loren Burkholder
fda6d7629a
Switch readImage to take a reference instead of a pointer
...
There was nowhere that an actual pointer was passed, and I wanted to do references for something else.
2021-03-17 19:18:06 +01:00
Loren Burkholder
8b33b1f08b
Simplify regex
2021-03-17 19:18:06 +01:00
Loren Burkholder
3748d7853e
Simplify formatting on Windows
2021-03-17 19:18:06 +01:00
Loren Burkholder
2192e8bea8
Better handle encrypted notifications
2021-03-17 19:18:06 +01:00
Loren Burkholder
9168c2c785
Remove unnecessary header
2021-03-17 19:18:06 +01:00
Nicolas Werner
f578272a0d
Rewrite notification posting logic
...
This does away with the nice abstraction layers in order to easily get the best-looking notifications for each platform.
2021-03-17 19:17:57 +01:00
Loren Burkholder
37acdad928
Add regex to remove replies in notifications
2021-03-17 19:17:15 +01:00
Loren Burkholder
c693d54598
Fix when "replied" is displayed
...
I accidentally put it in backwards.
2021-03-17 19:17:15 +01:00
Loren Burkholder
df998ef671
Get event text in event parser function
2021-03-17 19:17:15 +01:00
Loren Burkholder
b57b76d948
Add "replied" marker to regular reply messages
2021-03-17 19:17:15 +01:00
Loren Burkholder
39576fea96
Create function for processing whether a message is a reply
2021-03-17 19:17:15 +01:00
Loren Burkholder
d8fb4d9292
Simplify message body construction
2021-03-17 19:17:14 +01:00
Loren Burkholder
4a86e14d04
Simplify determination of whether markup is supported
...
This should also result in a speed increase (however slight), since the capabilities are now sorted through only once.
2021-03-17 19:17:14 +01:00
Loren Burkholder
4150d75be7
Only HTML-format the body if it should be formatted
2021-03-17 19:17:14 +01:00
Loren Burkholder
c38c6fe49e
Format notifications according to the FreeDesktop specification
2021-03-17 19:17:14 +01:00
Loren Burkholder
dcd9b80dde
Fix Linux HTML notifications
2021-03-17 19:17:14 +01:00
Loren Burkholder
b05657d51a
Fix colon spacing
2021-03-17 19:17:14 +01:00
Loren Burkholder
01bbec88dd
Don't run markdownToHtml on messages
2021-03-17 19:17:14 +01:00
Loren Burkholder
e630504863
Disable HTML on macOS
2021-03-17 19:17:13 +01:00
Loren Burkholder
648844089c
Move data parsing into a dedicated function
...
Actually posting the notification is now the responsibility of a private function
2021-03-17 19:17:13 +01:00
Loren Burkholder
09303ca49f
make lint
2021-03-17 19:17:13 +01:00
Loren Burkholder
ae7468a716
Use the class D-Bus member
2021-03-17 19:17:13 +01:00
Loren Burkholder
8d3e463fa6
Use plaintext for Windows notifications
2021-03-17 19:17:13 +01:00
Loren Burkholder
3dcbac8875
Only pass formatted text if it is supported (Linux)
2021-03-17 19:17:13 +01:00
Loren Burkholder
c74e68c945
Parse markdown overrides during replies
...
I apparently missed this when I originally added the overrides.
2021-03-17 19:17:13 +01:00
Loren Burkholder
029ae18a07
Format markdown as HTML in notifications
2021-03-17 19:17:13 +01:00
Nicolas Werner
cc3d32c65e
Move check for duplicate /sync responses to the same thread
2021-03-16 21:01:14 +01:00
Nicolas Werner
8ca3a8b607
Don't send markdown links in body
...
fixes #422
2021-03-15 20:59:18 +01:00
Nicolas Werner
86766b739d
Store all state events
2021-03-15 17:11:02 +01:00
DeepBlueV7.X
6548b84e29
Merge pull request #523 from Jedi18/master
...
Fix windows video bug
2021-03-15 15:51:10 +00:00
Nicolas Werner
569ea5b5f4
Rotate session keys properly
2021-03-15 16:24:01 +01:00
DeepBlueV7.X
61c5dffffd
Merge pull request #525 from salahmak/image-upload-dialog
...
Pressing return on image upload dialog sends the message
2021-03-15 11:48:55 +00:00
salahmak
aa0223c041
Pressing return on image upload dialog sends the message
2021-03-15 12:42:17 +01:00
targetakhil
a4b7966d21
prepend file:// for linux and macos
2021-03-15 09:03:06 +05:30
Nicolas Werner
9b8e6c7f5c
Remove some more allocations
2021-03-14 15:34:18 +01:00
Nicolas Werner
98e0b95635
Reduce allocations when escaping emoji
2021-03-14 14:04:30 +01:00
Nicolas Werner
1961312b15
Improve sorting and sizing of completions a bit
2021-03-14 01:24:26 +01:00
Nicolas Werner
7a356f3832
Merge branch 'quickswitcher_qml' of git://github.com/Jedi18/nheko into Jedi18-quickswitcher_qml
2021-03-13 23:45:05 +01:00
Nicolas Werner
6ad4065de4
Fix a few db access crashes
2021-03-12 17:14:18 +01:00
Nicolas Werner
27fe0a45b6
Disable room pings in replies
2021-03-12 17:14:17 +01:00
Nicolas Werner
31cc727594
Fix disable certificate validation on login page
2021-03-08 13:44:38 +01:00
Nicolas Werner
47e97d490c
Add config option to disable tls validation
2021-03-06 20:52:08 +01:00
Jedi18
8870455f9d
change allowed mistakes, fix minor style issues, remove old completer function from inputbar
2021-03-07 00:18:24 +05:30
Nicolas Werner
973ec13ad8
Add linebreaks to fingerprint
2021-03-06 19:36:18 +01:00
trilene
3846adfecc
Bump mtxclient
2021-03-05 20:08:41 -05:00
Nicolas Werner
02e459b4e6
Fix unused variable
2021-03-05 15:27:46 +01:00
Nicolas Werner
1be42045ee
fix linting
2021-03-05 15:26:07 +01:00
Nicolas Werner
f4164cc799
Fix a few join confirmations too many
2021-03-05 14:59:59 +01:00
Nicolas Werner
626d8bf151
Remove tweeny
2021-03-05 14:04:30 +01:00
DeepBlueV7.X
56c44d0454
Merge pull request #505 from Nheko-Reborn/license-headers
...
License headers
2021-03-05 01:04:36 +00:00
Joseph Donofry
4b12b53133
Fix linting
2021-03-04 19:11:08 -05:00
Nicolas Werner
a6f0d2ea7d
Update license headers
2021-03-05 01:04:07 +01:00
Joseph Donofry
87bf761dc2
Properly format matrix errors in spdlog statements
2021-03-04 18:56:25 -05:00
Nicolas Werner
67ab204050
Fix reply relating to the wrong id of edited event
2021-03-03 17:42:41 +01:00
Nicolas Werner
d28a620f42
Add comment to mark db keys as such
2021-03-03 00:08:33 +01:00
Nicolas Werner
1b0abe97f9
Update to new lmdbxx version
2021-03-03 00:01:17 +01:00
Nicolas Werner
a0fad2513e
Don't ask to join joined rooms when clicking matrix uri
2021-03-01 01:46:22 +01:00
trilene
099207b88c
Restore voice/video calls
2021-02-25 13:44:08 -05:00
trilene
12e40a13cb
Add missing translation mark
2021-02-25 12:44:09 -05:00
trilene
55fb00c67b
Merge remote-tracking branch 'upstream/master' into screenshare-x11
2021-02-25 12:10:12 -05:00