clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,199 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

7667 Commits

Author SHA1 Message Date
Josh Soref f8b9b15b5f spelling: element 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:23 -04:00
Josh Soref 1fdd0f9152 spelling: dimensions 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:23 -04:00
Josh Soref a83db24724 spelling: different 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:23 -04:00
Josh Soref 17fa773233 spelling: determines 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:23 -04:00
Josh Soref f1a33174ac spelling: desktop 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:23 -04:00
Josh Soref f231e5b623 spelling: default 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:23 -04:00
Josh Soref 065c40e9cb spelling: customization 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref c272a93ee3 spelling: contrast 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 4e6a2b1761 spelling: content 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 61efc5955b spelling: containing 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 72cc354214 spelling: community 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 0e4048ef71 spelling: communication 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref acb1e71082 spelling: comment 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref c754ac9cc5 spelling: colors 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 25a352f66a spelling: close 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 0e2a275cc5 spelling: character 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref e02c475c9e spelling: calendar 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref d553aeabbe spelling: button 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 56fc1a9fcd spelling: bottom 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 448c0b5bc9 spelling: bootstrap 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref aee833b60f spelling: beginning 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref a913952035 spelling: attribute 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref c7b358f446 spelling: attachment 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 955f86d3c5 spelling: another 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref ad1616675e spelling: if 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 980b4ec273 spelling: already 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 6e105fbec1 spelling: advanced 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 01e1e9b676 spelling: additional 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Josh Soref 07862b8a88 spelling: activity 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-03-26 16:03:22 -04:00
Jakobus Schürz a3aa34c21d changes in case of code-review 2023-03-24 08:56:30 +01:00
Jakobus Schürz 20873323ba remove unneeded "false" 2023-03-23 23:27:13 +01:00
Jakobus Schürz 33a7cd107e improve attend-buttons for events 2023-03-23 23:23:23 +01:00
Jakobus Schürz 5277c483fe change or to and 2023-03-23 20:20:13 +01:00
Jakobus Schürz be84573d7c fix activate share-button on nonfollowers 
I don't know, if this really resolves the problem... but it looks like,
it does.

fixes #12923
 2023-03-23 20:20:13 +01:00
Jakobus Schürz 6edc91e7f3 spacing in texara is 10px in dropzone only 0px 2023-03-23 19:31:58 +01:00
Hypolite Petovan 421a6296c2
Merge pull request #12936 from loma-one/patch-6 
Modify dropzones css: Correct spacing Text input Comments
 2023-03-23 06:04:36 -04:00
loma-one efa6a44f7e
Modify dropzones min css: Correct spacing Text input Comments 
With the last change to the CSS, https://github.com/friendica/friendica/pull/12933 was overwritten.
 2023-03-23 07:04:42 +01:00
loma-one 72c1399922
Modify dropzones css: Correct spacing Text input Comments 
With the last change to the CSS, https://github.com/friendica/friendica/pull/12932 was overwritten.
 2023-03-23 07:01:53 +01:00
Jakobus Schürz fafa804cf0 fix indentation and remove comment 2023-03-22 21:42:52 +01:00
Jakobus Schürz 7e989a03b2 make dropzone css configureable with variables 
and set a border-radius for dropzone to reflect theme better
 2023-03-22 21:42:52 +01:00
Jakobus Schürz fa45da6fd1 make dropzone same color as rest (fixes #12924) 2023-03-22 21:42:52 +01:00
Jakobus Schürz 2a5e464b59 make dropzone same color as rest (fixes #12924) 2023-03-22 21:42:51 +01:00
loma-one 82da2ee802
Modify dropzones css: Correct spacing Text input Comments 
The spacing on the left is always specified with padding: 10px 10px; in the other editors. The text input does not look so nice at the moment.
 2023-03-22 17:08:26 +01:00
loma-one 6bb683e794
Correct spacing Text input Comments 
The spacing on the left is always specified with padding: 10px 10px; in the other editors. The text input does not look so nice at the moment.
 2023-03-22 14:25:30 +01:00
Michael 72952d2c92 Issue 11535: Automatically open and close the registration 2023-03-21 21:44:26 +00:00
Jakobus Schürz cf63cbde72 remove removelink (it is not useful at the moment) 2023-03-19 19:14:10 +01:00
Jakobus Schürz 5040bd9a1a change response-handling (code-review) 2023-03-19 18:52:46 +01:00
Jakobus Schürz 57a7a3d6d8 change responsehandling to be ready for PR #12892 2023-03-19 18:52:46 +01:00
Jakobus Schürz 8a3361dfbe remove upload-url parameter 2023-03-19 18:52:46 +01:00
Jakobus Schürz 6436d2cd8a changes in case of code-review 2023-03-19 18:52:46 +01:00
Jakobus Schürz fba33d3afc add options allowedFiles and more 2023-03-19 18:52:46 +01:00
Jakobus Schürz 920dcca263 render max_imagesize in header.tpl 
so it is reachable general from the whole website, and the dropzone-factory can use
it also to create dropzones from modal.js
 2023-03-19 18:52:46 +01:00
Jakobus Schürz 16f065e260 changes in case of codereview 2023-03-19 18:52:45 +01:00
Jakobus Schürz 0cc2e1c22a apply changes from review 2023-03-19 18:52:45 +01:00
Jakobus Schürz e62265b234 make errormessages visible 2023-03-19 18:52:45 +01:00
Jakobus Schürz f876a053df add dropzone also onclick on comment-fake-form 2023-03-19 18:52:45 +01:00
Jakobus Schürz 1a1a1246b6 attach dropzone only when opening comment 2023-03-19 18:52:45 +01:00
Jakobus Schürz d39781023e create factory 2023-03-19 18:52:45 +01:00
Jakobus Schürz ada11a2c67 create factory for dropzones 2023-03-19 18:52:45 +01:00
Jakobus Schürz 39f7660a1d fix getting bytes from shorthand in php 2023-03-19 18:52:45 +01:00
Jakobus Schürz 721c065a44 fix editing in modal-jot 
and add also timeout before removing images from dropzone
 2023-03-19 18:52:45 +01:00
Jakobus Schürz 64066349aa add timeout before remove images from dropzone 2023-03-19 18:52:45 +01:00
Jakobus Schürz 2403932a83 improve image-upload 
* create dropzone for editing in jot-modal
* customize css for dropzone to make it more beautiful (smaller
  margin/paddings...)
* change position of dropzone-element dircetly to textarea, so button
  for upload is small and under textarea (it's more clear)
* remove previews after upload. this shows the upload-progress, but
  preview is not needed after upload. you can't do anything with the
  preview, and dialog gets too big. You see successful upload, when
  bb-code link to image is inserted on cursor-position in textarea
 2023-03-19 18:52:45 +01:00
Jakobus Schürz 1e030d594c remove unneeded chars ("css") from first html-tag 2023-03-19 18:52:45 +01:00
Jakobus Schürz 3688196859 create workaround for not working php 
Strings:getBytesFromShorthand

i created a js-function which converts integer, k, m and g to MB
Just remove this code, when we found out, why Strings is in some files
not working.
 2023-03-19 18:52:45 +01:00
Jakobus Schürz 00ae7d0f59 make dropzone work on editing postings/Comments 2023-03-19 18:52:45 +01:00
Jakobus Schürz 8242d1c72b remove console.log 2023-03-19 18:52:45 +01:00
Jakobus Schürz a6a0507a89 small modifications to equalize the scripts 2023-03-19 18:52:45 +01:00
Jakobus Schürz be2afac60d take maxFilesize from systemsettings 
* does not work everywhere...
 2023-03-19 18:52:45 +01:00
Jakobus Schürz 359ad6ff5a fix a warning and suggestions for pullrequest 
* fix indentation to tabs
* remove unneeded calls for dropzone.min.js and dropzone.min.css
* removed debug output
 2023-03-19 18:52:45 +01:00
Jakobus Schürz 6a7f17559e fix composer dropzone 2023-03-19 18:52:45 +01:00
Jakobus Schürz 00c7e989b2 add missing css 2023-03-19 18:52:45 +01:00
Jakobus Schürz 3bb801c2c1 fix dropzone class in template 2023-03-19 18:52:45 +01:00
Jakobus Schürz 29d7b4ef24 fix path for js and css loading 2023-03-19 18:52:45 +01:00
Hank Grabowski 6db244f476 Fix over-aggressive lowercasing of url, title, image, and preview fields 2023-03-18 21:52:53 -04:00
Jakobus Schürz e651769134 change/remove comments in code 2023-03-15 14:37:54 +01:00
Jakobus Schürz f5f2076a2d remove unused selector 
was there for historical reasons... :/
 2023-03-14 17:33:51 +01:00
Jakobus Schürz e2625592b7 update translation-files 2023-03-14 17:33:49 +01:00
Jakobus Schürz 0dffe65d64 fix indetation and removed some calls. 2023-03-14 17:32:11 +01:00
xundeenergie d6fc00c743 Update view/theme/frio/js/theme.js 
removed it.

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-03-14 17:32:11 +01:00
Jakobus Schürz c94b586543 reduce literal html in javascript-code 2023-03-14 17:32:11 +01:00
Jakobus Schürz f8018f8dfe make errormessages modular and better 2023-03-14 17:32:11 +01:00
Jakobus Schürz 88f21c5892 move forgotten rotator from template 2023-03-14 17:32:11 +01:00
Jakobus Schürz 9140914a24 make erromessages translateable 2023-03-14 17:32:11 +01:00
Jakobus Schürz 7daecf6741 remove rotator from templates 2023-03-14 17:32:11 +01:00
Jakobus Schürz bd2cd8dd4c remove reminder for deleting rotators in tpl 2023-03-14 17:32:11 +01:00
xundeenergie 225e2124cc Update view/theme/frio/js/theme.js 
in this case, the img[id^=waitfor... .show() shows existing image-containers. All of them which exist.

Because there can be more than one. And this filter just shows them.
adding another rotator with your suggestion can lead to 2 or more rotators on a button.

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-03-14 17:32:11 +01:00
Jakobus Schürz 2219978788 reduce indentation 2023-03-14 17:32:11 +01:00
Jakobus Schürz 96c3321bb8 improve optical feedback with rotator on buttons 
* functional rotator with feedback from ajax-request for activity
    on like, dislike, share and shareMenu button in wide-screen and media-screen
 2023-03-14 17:32:11 +01:00
Jakobus Schürz 660a9cf285 show rotator on button 2023-03-14 17:32:11 +01:00
Jakobus Schürz a1b9f27545 make indentation as tabs 2023-03-14 17:32:11 +01:00
Jakobus Schürz 4244670f1c simplify code, remove debug output 2023-03-14 17:32:11 +01:00
Jakobus Schürz f8fc9c1e8b improve like/share buttons 
change the button only if it could send its request successfully to the server.

fixes:
* disrupting a video on liking or sharing
* timeline jumps around somewhere else, when you like or share a
  posting/comment, and you can not find back.
 2023-03-14 17:32:11 +01:00
Tobias Diekershoff bb835848d4
Merge pull request #12886 from annando/auto-attach 
Option to automatically add links as attachment via API
 2023-03-14 08:18:21 +01:00
Michael 4e070f65c7 Option to automatically add links as attachment via API 2023-03-13 21:30:20 +00:00
Tobias Diekershoff c389b48a9f bump version to 2023.03-rc 2023-03-13 21:22:33 +01:00
Jakobus Schürz 95cb66b6bf move upload-button in filebrowser above previews 
its annoying, when you open filebrowser to upload an image or file, and
the button moves away under your finger/cursor, in case of loading
preview images slower than the form itself.

just change position of button (class="upload") and browser itself
(class="media") disannoys the behaviour.
 2023-03-13 10:48:16 +01:00
www-data 51083e9fcf fix typo (btn-defaul -> btn-default) 2023-03-08 05:48:34 +01:00
Damian Wajer cf3dc9a94f Fix calendar attendance icons 2023-03-07 17:57:54 +01:00
Damian Wajer 45571fe6a7 [frio] Move "Share via" to the share dropdown 2023-03-01 18:09:18 +01:00
Damian Wajer bc65ea9693 Use available space for post interaction buttons 
Related: https://github.com/friendica/friendica/issues/12835
 2023-02-22 18:11:18 +01:00
Philipp b593165949
adapt theme comment 2023-02-19 11:30:33 +01:00
Philipp a1fedaf514
adapt install path 2023-02-19 11:29:29 +01:00
Philipp 92850d4482
Update messages.po 2023-02-18 21:50:14 +01:00
Philipp 5552aac327
check themplates 2023-02-18 21:50:07 +01:00
Philipp f0c29edcde
Adapt BaseURL calls to new UriInterface 2023-02-18 21:12:21 +01:00
Philipp dbb7022ca5
Refactor Installer due new BaseURL logic 2023-02-18 21:12:20 +01:00
Michael 608b5a37a4 Activities are now displayed as Emojis 2023-02-18 06:56:03 +00:00
Philipp 0d41752cfe
Update messages.po 2023-02-12 13:38:10 +01:00
Hypolite Petovan d059c36ca6 [frio] Fix XSS vulneralibity in Justified-Gallery Javascript dependency 2023-02-08 08:31:43 -05:00
Hypolite Petovan 9e4adabb58 Update main translation files after updating strings 2023-02-04 20:36:33 -05:00
Hypolite Petovan 447709377c Ensure arbitrary HTTPException messages are HTML escaped 
- These messages can include user-supplied strings
 2023-02-04 20:36:33 -05:00
Hypolite Petovan 4e355c0f5e Create specific module to display HTML message when a conversation isn't found in Module\Item\Display 2023-02-04 20:28:04 -05:00
Damian Wajer ec21c19be7 Fix labels in contact request modal 
Fixes https://github.com/friendica/friendica/issues/12709
 2023-01-25 19:05:42 +01:00
Michael 87e9dafc56 Removed duplicated "be" 2023-01-23 06:48:42 +00:00
Michael 492ba45aa8 Merge remote-tracking branch 'upstream/develop' into issue-12702 2023-01-23 06:44:50 +00:00
Michael 75cac38fe3 Updated messages.po 2023-01-23 06:43:13 +00:00
Michael 557553a856 Updated messages.po 2023-01-23 06:37:45 +00:00
Michael 8e4e2eecb7 Issue 12702: Let the user decide how to handle spoiler texts 2023-01-22 17:10:31 +00:00
Hypolite Petovan c3381c8b05 Updated main translation file after removing strings 2023-01-21 09:29:08 -05:00
Hypolite Petovan dcfb8bb73e Fix connection acknowledgement not appearing on contact page 
- Remove obsolete template variables
- Move contact_edit vier template to base template
 2023-01-21 09:18:17 -05:00
Damian Wajer 15a60d3b20 [frio] Regular size profile extra links 2023-01-19 19:49:22 +01:00
Damian Wajer 4b1328afa6 Regular-size primary buttons on compose page 2023-01-19 19:49:22 +01:00
Damian Wajer 6ec49afa10 [frio] Ensure access to all user menu items on low screens 2023-01-19 19:49:14 +01:00
Damian Wajer b86663dd1f [frio] Adjust font-size 2023-01-19 19:49:10 +01:00
Damian Wajer b735c40b27 [frio] Contact actions size 2023-01-19 19:49:06 +01:00
Damian Wajer 0344a84543 [frio] Larger clickable area for batch actions 2023-01-19 19:49:01 +01:00
Damian Wajer 4d0684d3d5 [frio] Improve responses markup and alignment 
Reduce additional spacing between button groups and use the correct markup according to the docs:
https://getbootstrap.com/docs/3.4/components/#btn-groups
 2023-01-19 19:48:55 +01:00
Damian Wajer 33d0505ce3 [frio] New design for mobile responses 2023-01-19 19:48:46 +01:00
Damian Wajer fc25a3ce5f [frio] Improve spacing for responses items 2023-01-19 19:48:41 +01:00
Damian Wajer 5b01c7c977 [frio] Regular size thread action buttons on mobile 2023-01-19 19:48:33 +01:00
Damian Wajer ec2bfbdf10 [frio] Regular size comment button 2023-01-19 19:48:27 +01:00
Damian Wajer 53ba26b991 [frio] Larger clickable area for off-canvas user menu 2023-01-19 19:48:19 +01:00
Damian Wajer f6e63a641d [frio] Larger clickable area for dropdown menus 2023-01-19 19:48:16 +01:00
Damian Wajer aa3e3307d7 [frio] Use regular font-size for comments 2023-01-19 19:48:11 +01:00
Damian Wajer 3d929e1f52 [frio] Make the whole accordion area clickable 2023-01-19 19:48:02 +01:00
Damian Wajer 9dcc0f6f20 [frio] Larger clickable area for aside links 2023-01-19 19:47:57 +01:00
Damian Wajer 1e21945658 [frio] Larger clickable area for tabs 2023-01-19 19:47:49 +01:00
Philipp 15938c5b87
Merge pull request #12695 from MrPetovan/bug/fatal-errors 
Address a few fatal errors
 2023-01-19 08:09:03 +01:00
Hypolite Petovan 594f738c6d Create base sub/direction.tpl template from vier 
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1383249754
 2023-01-18 20:49:08 -05:00
Hypolite Petovan da4441875d Updated main translation file after editing strings 2023-01-18 20:42:10 -05:00
Michael e06f699dd9 Added Documentation, updated messages.po 2023-01-14 21:20:04 +00:00
Hypolite Petovan e73adde5fb Remove App dependency from Hook::callSingle 
- This was causing a circular dependency with the logger_instance hook
 2023-01-14 10:38:37 -05:00
Hypolite Petovan 91ff24b0e4
Merge pull request #12663 from nupplaphil/sec/xss_404 
Security: Use htmlspecialchars() for user input in Arguments class
 2023-01-13 13:57:41 -05:00
Philipp 0530755332
Security: Use htmlspecialchars() for user input in Arguments class 2023-01-12 20:24:39 +01:00
Michael 8a902afde5 Updated messages.po - again 2023-01-12 07:06:24 +00:00
Michael 5b8752edd9 Updated messages.po 2023-01-12 06:35:49 +00:00
Hypolite Petovan 9f902571b7 Update main translation file after changing strings 2023-01-11 09:01:30 -05:00
Michael 194b84141d Updated messages.po 2023-01-09 17:29:42 +00:00
Michael 4e0da578fa Merge remote-tracking branch 'upstream/develop' into improve-ignore 2023-01-09 17:23:10 +00:00
Michael ee8ae5796a Updated messages.po again 2023-01-09 16:25:02 +00:00
Michael 840f25cc5c Improve ignoring of messages 2023-01-09 16:23:39 +00:00
Michael 214838ea3b Updated messages.po 2023-01-09 16:18:35 +00:00
Michael 83dd49a43c Updated "messages.po" again 2023-01-08 23:26:26 +00:00
Michael 82b28e173b Updated mesages.po 2023-01-08 23:15:15 +00:00
Michael 5738d480da Changed messages.po 2023-01-08 18:28:34 +00:00
Michael 50746bad55 Merge remote-tracking branch 'upstream/develop' into collapse 2023-01-08 17:47:21 +00:00
Michael 50e43c530e Posts from contacts can now be collapsed 2023-01-08 17:40:05 +00:00
Hypolite Petovan 6c379610dc Update main translation file after removing a string 2023-01-07 22:48:31 -05:00
Michael d22712956b Updated messages.po 2023-01-07 17:16:44 +00:00
Michael 4e4eab7548 Merge remote-tracking branch 'upstream/develop' into mod-item 2023-01-07 17:14:40 +00:00
Philipp 7b30c44b60
Update messages.po 2023-01-07 15:50:03 +01:00
Philipp f2253991e7
Update messages.po 2023-01-07 15:18:23 +01:00
Hypolite Petovan 204a478f65 Update main translation file after removing a string 2023-01-05 10:44:03 -05:00
Hypolite Petovan 3b9bf4d70d Remove system.no_auto_update personal config key and assume default value of true 
- By popular request, the behavior with false was too perturbating
 2023-01-05 10:27:03 -05:00
Michael 09f46b20f1 Functionality is split 2023-01-04 10:59:28 +00:00
Hannes Heute bf28f4f751 small typo 2023-01-04 09:18:24 +01:00
Philipp b439df892a
Apply suggestions 2023-01-03 17:24:05 +01:00
Philipp 1e574d5383
Refactor IManageConfigValues interface 2023-01-03 14:22:04 +01:00
Hypolite Petovan 1874a32728 Happy New Year 2023! 2023-01-01 09:36:24 -05:00
Michael 4eceb2d26f Merge remote-tracking branch 'upstream/develop' into move-delivery 2022-12-30 21:40:09 +00:00
Michael dd4aeba5a1 Updated messages.po 2022-12-30 21:31:00 +00:00
Hypolite Petovan 5af956b92f
Merge pull request #12570 from haheute/issue-11986-dm-link 
Add link to heading in direct messages list
 2022-12-30 01:52:13 -05:00
Philipp c517ab386a
Fix messages.po and adapt README 2022-12-29 21:30:01 +01:00
Matthew Exon c0a874b8d4 Update translation file with new error message 2022-12-29 20:07:18 +01:00
haheute e29c934ae4
Merge branch 'friendica:develop' into issue-11986-dm-link 2022-12-29 18:32:17 +01:00
Hannes Heute 6793e04365 add link to direct message heading 2022-12-29 18:28:01 +01:00
Tobias Diekershoff 272951d39b
Merge pull request #12564 from nnsrymni/develop 
JA translation update
 2022-12-29 18:24:20 +01:00
nnsrymni 7122d72871 JA translation update 2022-12-29 09:15:05 +09:00
Hypolite Petovan dbc4e52fc4 Turn show comments element into a full-fledged button 2022-12-28 17:46:55 -05:00
Hypolite Petovan e0241c36ef Replace base wall_thread template by vier version 2022-12-28 17:46:55 -05:00
Hypolite Petovan 76edf4d285 Update main translation file after updating strings 2022-12-28 00:46:16 -05:00
Hypolite Petovan a1070f4818 Turn fake link spans into full-fledged buttons 2022-12-27 21:47:35 -05:00
Hypolite Petovan 48e960cc84 [frio] Restore access to plink icon in thread view 2022-12-27 21:12:48 -05:00
Hypolite Petovan fbb068e415 [frio] Normalize display of plink/network icons between thread/search 2022-12-27 21:12:23 -05:00
Hypolite Petovan c19dd39fe3 Remove counter-productive role="heading" and aria-level attributes 2022-12-27 13:24:19 -05:00
Hypolite Petovan 5c332af844
Merge pull request #12527 from nupplaphil/feat/request_id 
Introduce Request::getRequestId()
 2022-12-26 16:07:35 -05:00
Philipp 4f1bb0d274
Use X-REQUEST-ID for Error pages 2022-12-26 21:18:05 +01:00
Hypolite Petovan 1be9d6b2cb Fix wrong variable reference in view wall_thread template 
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1364715116
 2022-12-26 09:26:57 -05:00
Tobias Diekershoff 509715068a use correct field for ALT test 2022-12-24 14:57:03 +01:00
Tobias Diekershoff 8dcfafcfb0 issue 12515 2022-12-24 14:52:26 +01:00
Marek Bachmann b876a9efcd Distinguish between comment likes and post likes. 2022-12-23 02:38:00 +01:00
Marek Bachmann ef4f508f9b messages.po and and corrected typo in comment 2022-12-23 01:06:21 +01:00
Marek Bachmann 90d99bc3e8 Changed registration text input to text area since BBcode is allowed there (was single line input) 2022-12-21 20:05:35 +01:00
Tobias Diekershoff c84f18ef66 bump VERSION to 2023.03-dev 2022-12-20 06:52:15 +01:00
Tobias Diekershoff eeadc00e83 bump VERSION to 2022.12 2022-12-20 06:48:39 +01:00
Tobias Diekershoff 43fd9eb77c DE translation updates 2022-12-18 16:12:50 +01:00
Hypolite Petovan f7a8c109e9 Updated main translation file after adding a string 2022-12-18 01:04:04 -05:00
Hypolite Petovan 3756f933a6 Update main translation file after adding strings 2022-12-17 12:20:49 -05:00
Hypolite Petovan cdf180c58d Add new calendar.default_view pconfig key 2022-12-17 12:20:43 -05:00
Matthias Moritz 5817709562 Move vier version of calendat/calendar_head template to base 
- With the support for the remaining themes dropped, the base template wasn't used anymore
 2022-12-17 12:20:13 -05:00
Tobias Diekershoff 847396ac38 RU translation update THX SpcCw 2022-12-17 15:24:59 +01:00
Tobias Diekershoff bde1d5b02e DE translation updates 2022-12-17 08:51:23 +01:00
Tobias Diekershoff ce14c81e1f HU translation updates THX Balázs Úr 2022-12-17 08:49:27 +01:00
Tobias Diekershoff 301fd13ced DE translation updates 2022-12-17 08:48:10 +01:00
Tobias Diekershoff d77fa441db FR translation updates THX kalon33 2022-12-17 08:41:38 +01:00
Tobias Diekershoff 912493f673 PL translation updates THX strebski 2022-12-17 08:40:27 +01:00
Hypolite Petovan 30973647a6 [frio] Allow space for the upload button in the fbrowser modal 2022-12-16 19:16:25 -05:00
Hypolite Petovan d096dbe276 [frio] Re-hide the forum contact row in network page 2022-12-15 11:10:28 -05:00
Tobias Diekershoff f84e76d893
Merge pull request #12422 from MrPetovan/bug/5095-group-tooltip 
[frio] Reduce group member add/remove button virtual height
 2022-12-15 06:32:08 +01:00
Tobias Diekershoff d33dc131ff
Merge pull request #12425 from MrPetovan/task/11774-frio-remove-banner-setting 
[frio] Remove header banner setting form field
 2022-12-15 06:25:55 +01:00
Tobias Diekershoff 0128bbdb08
Merge pull request #12426 from MrPetovan/task/12237-ACL-meta-groups-doc 
Add documentation about the ACL autocomplete fields
 2022-12-15 06:22:14 +01:00
Tobias Diekershoff 9e61720875
Merge pull request #12428 from MrPetovan/bug/12406-frio-contact-list-frame 
[frio] Add wrapper to generic contact list
 2022-12-15 06:16:13 +01:00
Tobias Diekershoff f114ad1883
Merge pull request #12429 from MrPetovan/bug/contactblock-icon 
Make contact block list style more specific
 2022-12-15 06:14:55 +01:00
Hypolite Petovan 3546f5b189 [frio] Update description, version, maintainer and screenshot 2022-12-14 22:25:53 -05:00
Hypolite Petovan 38f5e28e33 Make contact block list style more specific 
- The wide selector had side effects across the site
 2022-12-14 22:11:19 -05:00
Hypolite Petovan 0d2c302beb [frio] Add wrapper to generic contact list 2022-12-14 22:05:58 -05:00
Hypolite Petovan 07520719f7 Add documentation about the ACL autocomplete fields 2022-12-14 21:57:14 -05:00
Hypolite Petovan 244b65e5fc [frio] Remove header banner setting form field 
- This setting isn't used in the frio theme at all
 2022-12-14 21:45:27 -05:00
Hypolite Petovan 710a805623 [frio] Reduce group member add/remove button virtual height 
- This bring down the tooltip closer to the icon
 2022-12-14 21:17:01 -05:00
Marek Bachmann 3576855e71 Small fix to show PHP.ini upload_max_filesize value also with binary prefix for consistency 2022-12-14 23:19:08 +01:00
Hypolite Petovan 2fa9d49632 Normalize padding in image grid 
- Remove outside padding, vertical and horizontal
- Remove artificial padding with <br> in content/image.tpl
 2022-12-12 21:56:23 -05:00
Marek Bachmann 8690b311a8 Moved image_grid.css content to global.css and use unique class names for imagegrid style classes, removed id for div 2022-12-12 22:58:50 +01:00
MarekBenjamin 86b9cef273
Update image_grid.css 
Removed fall back to one column
 2022-12-12 21:56:42 +01:00
MarekBenjamin bc70bc23a4
Update image_grid.css 2022-12-12 21:45:57 +01:00
Marek Bachmann 236a4c819b Removed not needed image_grid_column.tpl 2022-12-10 23:44:23 +01:00
Marek Bachmann d786f225ee Added image grid generation to addVisualAttachments 2022-12-10 22:54:50 +01:00
MarekBenjamin c7811576cc
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-10 22:17:26 +01:00
Hypolite Petovan 85db716894 Fix wrong condition when redirecting to filtered log view in admin/logs 
- Address https://friendica.xyz/display/adf174d5-1563-937d-3cd7-2df680918252
 2022-12-09 16:24:55 -05:00
MarekBenjamin e86a2e047d
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-08 23:16:28 +01:00
Hypolite Petovan 74be29e822
Merge pull request #12372 from loma-one/patch-3 
Change icon size button comments
 2022-12-08 16:57:58 -05:00
Hypolite Petovan 3e431bda1e
Merge pull request #12371 from loma-one/patch-1 
Change oversized buttons
 2022-12-08 16:57:31 -05:00
loma-one 69e2b45f39
Titel H2 2022-12-08 22:14:47 +01:00
loma-one 5d1aeea41e
Änderung Icon-Größe Schaltfläche Kommentare 
Using the glocal css "template-icon" to show the correct size of the buttons
 2022-12-08 21:47:52 +01:00
loma-one c285e4160b
css specification for oversized button in composer 
In order to specify the buttons in the composer in the correct size again, an additional specification has been added. This can also be used for other oversized buttons.
 2022-12-08 20:42:28 +01:00
MarekBenjamin 75d857c595
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-08 20:40:58 +01:00
loma-one c95882125d
Change oversized buttons 
Additional css specification in global.css to resize the button in the composer. ".template-icon"
Use ".template-icon" in additional buttons that are currently displayed oversized.
 2022-12-08 20:38:44 +01:00
Tobias Diekershoff 9cd72cfec6 DE translation update 2022-12-08 18:11:16 +01:00
Tobias Diekershoff 350f542220 FR translation update THX kalon33 2022-12-08 17:52:34 +01:00
Tobias Diekershoff 5954af2e81 DE translation update 2022-12-08 06:55:55 +01:00
MarekBenjamin 74ff7bae59
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-07 18:52:20 +01:00
Michael b9cb94c432 Updated messages.po 2022-12-07 07:12:56 +00:00
Michael 498a957009 The appearanxe of the link preview is now configurable 2022-12-07 07:02:04 +00:00
Tobias Diekershoff 59088161e8 bump version to 2022.12-rc 2022-12-06 14:34:03 +01:00
MarekBenjamin de83be11ac
Merge branch 'friendica:develop' into new_image_presentation 2022-12-06 11:35:09 +01:00
Marek Bachmann 458f22d303 Support more than 2 images 2022-12-06 00:59:48 +01:00
Marek Bachmann 7fb0f018df First draft for using a image grid to display attached images. 2022-12-06 00:59:47 +01:00
Philipp c6e627d45c
Fix preview function when creating posts 2022-12-05 21:10:14 +01:00
Hypolite Petovan 82c2e686d7 Updating main translation file after updating a few strings 2022-12-04 06:42:12 -05:00
Michael 16b76919c0 Rules added 2022-12-03 21:15:08 +00:00
Hypolite Petovan e389fe945f Ward against empty template variable in frio:contact/entry.tpl 2022-12-03 04:19:33 -05:00
Hypolite Petovan 60f18f6f56 Updated main translation file after moving strings 2022-12-01 18:01:33 -05:00
Hypolite Petovan 8d37828c70 Update main translation file after changing strings 2022-12-01 08:06:09 -05:00
Hypolite Petovan 0d53c69610 Remove unused theme info value "events_in_profile" 
All public events (event if they are ownded by other users) are visible
 2022-12-01 08:03:34 -05:00
Hypolite Petovan 2baa56d478
Merge pull request #12298 from annando/api-suggestions 
Contact suggestions are now cached
 2022-12-01 05:25:44 -05:00
Michael f31e617f5d Contact suggestions are now cached 2022-11-30 05:59:27 +00:00
Marek Bachmann 00808326c2 message.po 2022-11-30 04:39:00 +01:00
Marek Bachmann 99e1c64b1a Added info that shorthands can be used for maxfilesize Admin Site 2022-11-30 02:16:48 +01:00
Marek Bachmann 0ea219f728 Use previously already available field.5 for short hand pattern ad admin page for maximagesize 2022-11-30 01:58:22 +01:00
Marek Bachmann 978fe26f4c Added Strings::getBytesFromShorthand() for file size check at upload and new message.po 2022-11-30 01:26:08 +01:00
Marek Bachmann 9c383e2004 allow shorthands in the system.maximagesize 2022-11-30 01:26:08 +01:00
MarekBenjamin 3cf0b9b9fd
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-29 21:58:46 +01:00
Hypolite Petovan c0c414ab95 [frio] Add page wrapper to contact follow page 2022-11-29 06:37:41 -05:00
MarekBenjamin bfe220c344
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-28 10:53:50 +01:00
Tobias Diekershoff 3092975523 DE translation update THX MarekBenjamin 2022-11-28 07:00:11 +01:00
Marek Bachmann 361908ce3b and the messages.po 2022-11-28 01:23:00 +01:00
Marek Bachmann 6ebf0f860b messages.po 2022-11-27 23:53:34 +01:00
Marek Bachmann a01872a117 Merge branch 'develop' into show_image_upload_limit 
# Conflicts:
#	src/Util/Strings.php
#	view/lang/C/messages.po
 2022-11-27 23:52:58 +01:00
Hypolite Petovan 9fbdcb5459
Merge pull request #12277 from nupplaphil/mod/fbrowser 
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser
 2022-11-27 07:55:55 -05:00
Philipp 272911527c
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:52:14 +01:00
Philipp 29190fae73
Update messages.po 2022-11-27 01:36:31 +01:00
Philipp 012f486eb6
Adhere feedback 2022-11-27 01:34:59 +01:00
Philipp 50316bbb80
Move Browser & Upload to own namespace 2022-11-27 01:34:59 +01:00
Philipp 051253a745
Move FileBrowser to own namespace & Bugfix album usage 2022-11-27 01:34:58 +01:00
Philipp 3607aa32ca
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:34:58 +01:00
Marek Bachmann 719c294fb5 Added info about upload_max_filesize to admin page 2022-11-26 23:45:58 +01:00
Philipp d0b16b2fc1
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser 2022-11-26 22:26:30 +01:00
Hypolite Petovan 34418d790d Check for existence of $contact.photo_menu.edit in frio:contact/entry.tpl 
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1327030221
 2022-11-26 15:38:21 -05:00
Marek Bachmann 74bab60989 message.po once more 2022-11-25 23:01:25 +01:00
Marek Bachmann c11e2b0795 updated messages.po 2022-11-25 19:55:43 +01:00
Marek Bachmann 32aa8bd198 Added information that max image upload size on admin page does not affect server-side upload limits 2022-11-23 18:17:33 +01:00
Michael c4aaa08693 Updated messages.po 2022-11-23 14:16:13 +00:00
Hypolite Petovan 187a28abda Update main translation file after moving strings 2022-11-20 17:26:08 -05:00
Hypolite Petovan 77e87da441 Create /profile/{nickname}/photos route 
- Create new Profile\Photos\Index module class
- Update most references of the legacy /photos/{nickname} route
 2022-11-20 17:15:07 -05:00
Tobias Diekershoff eec48057dc
Merge pull request #12221 from MrPetovan/bug/warnings 
Fix various PHP 8 deprecations
 2022-11-20 08:21:06 +01:00
Hypolite Petovan 6f93ee7e49 Fix various PHP 8 deprecations 2022-11-19 19:15:47 -05:00
Hypolite Petovan a4eb6f971f [frio] Improve search list display for web and mobile 
- Reduced margins
- Repositioned the network icon and external link
 2022-11-19 17:16:51 -05:00
Hypolite Petovan 0c8242af64 Update main translation file after adding a string 2022-11-19 12:29:08 -05:00
Hypolite Petovan 525eab395c Improve error message when conversation isn't available in Module\Item\Display 
- Retrieve the parent post no matter what. Previously it was depending on the user's settings, which gave unpredictable behavior if the parent post wasn't retrieved for whatever reason.
- List possible reasons the conversation isn't showing up based on the condition in Model\Post::selectViewForUser
- Allow HTML in exception messages
 2022-11-19 12:29:08 -05:00
Tobias Diekershoff 8609fe2f5e
Merge pull request #12207 from MrPetovan/bug/12187-register-uid-0 
Ensure register records aren't created with uid = 0
 2022-11-19 15:52:53 +01:00
Thorsten d77fece367 Fix route for user import. 2022-11-19 15:17:42 +01:00
Hypolite Petovan 805fa6024f Update main translation file after adding strings 2022-11-19 07:53:55 -05:00
Schnoop 565ade02a4
Update main.js 
Revert trailing slash changes as this will lead to wrong urls.
 2022-11-18 20:07:46 +01:00
Tobias Diekershoff d7946dd985 DE translation update 2022-11-18 16:11:07 +01:00
Hypolite Petovan 47ad922f9a Add global styles for .icon 
- Normalize user/contact profile pictures size
 2022-11-16 20:12:36 -05:00
Hypolite Petovan a6d96bf1b7 Replace remaining references to contact_template.tpl by contact/entry.tpl 2022-11-16 16:23:47 -05:00
Philipp 81b21c4131
Revert "Remove geotag" 
This reverts commit 5dc9319b
 2022-11-16 21:20:24 +01:00
Philipp 5dc9319bb2
Remove geotag 2022-11-16 08:50:57 +01:00
Philipp db7af4c45b
Remove jotnets 2022-11-16 08:49:48 +01:00
Philipp 01c2a775e4
Update messages.po 2022-11-15 22:34:31 +01:00
Philipp 584e7a7e6d
Remove trailing slash in update_ calls 2022-11-15 20:11:38 +01:00
Philipp 9d455a5d0b
Update messages.po 2022-11-15 01:00:29 +01:00
Hypolite Petovan 1ec70f9640 Update main translation file after moving strings 2022-11-14 17:13:27 -05:00
Hypolite Petovan 89338684b5 Update main translation file after moving strings 2022-11-14 13:48:47 -05:00
KulikAlex 03cfb69a64
Update message_recipient.tpl 2022-11-12 19:04:02 +03:00
Philipp a36a4b6192
fix link 2022-11-09 22:28:29 +01:00
Philipp 4998d15e85
Update messages.po 2022-11-09 22:27:47 +01:00
Philipp 75360f3b8c
Move mod/mod/msearch & mod/match to src/Module 2022-11-09 22:17:50 +01:00
Philipp 3f6ec3dd31
Merge pull request #12106 from MrPetovan/task/4090-move-mod-settings 
Move mod/settings.php to src/Module
 2022-11-09 20:34:31 +01:00
Hypolite Petovan cb5e18838c Replace remaining "admin" instances in moderation templates 2022-11-09 08:13:12 -05:00
Hypolite Petovan 60dec7f164 Update main translation file after changing strings 2022-11-09 06:29:53 -05:00
Hypolite Petovan 45c4439119 Move settings/connectors to src/Module 2022-11-09 06:26:05 -05:00
Hypolite Petovan 33d1df3c6d Move settings/addons to src/Module 2022-11-09 06:25:41 -05:00
Hypolite Petovan 3226b00995 Move settings/oauth to src/Module 
- Add settings_content() permission checks to Module\BaseSettings
- Transform application token deletion GET links to POST forms to keep a single OAuth module class
 2022-11-09 06:25:22 -05:00
Hypolite Petovan 143d8a6d6d Update main translation file after moving strings 2022-11-08 20:25:21 -05:00
Hypolite Petovan 4a626ef101 Create new Contact\Redir module class 
- Move /redir route to /contact/redir
 2022-11-08 20:12:23 -05:00
Hypolite Petovan 6313780094 Updated main translation file after changing strings 2022-11-08 18:33:54 -05:00
Hypolite Petovan 48da6f2f51 Deleted fils related to mod/removeme.php 2022-11-08 18:33:54 -05:00
Hypolite Petovan a68c790c64 Create new Settings\RemoveMe module class 
- Moved route from /removeme to /settings/removeme
- Combined templates into one
 2022-11-08 18:33:54 -05:00
Hypolite Petovan 64fad2913d Updated main translation file after adding strings 2022-11-08 11:53:10 -05:00
Hypolite Petovan 99d54dc711 Restore Item\Source module functionality 2022-11-08 11:53:09 -05:00
Hypolite Petovan 8161a32b77 Add missing links to moderation section 2022-11-08 09:16:36 -05:00
Tobias Diekershoff 48090d1b70
Merge pull request #12142 from MrPetovan/task/homepage-verified 
Add title to homepage verified check mark
 2022-11-08 11:12:17 +01:00
Hypolite Petovan 327cf17b07 Updated main translation file after adding a string 2022-11-08 04:32:58 -05:00
Hypolite Petovan 0a20566199 Replace remaining occurrences of admin/users route by moderation/users 2022-11-08 04:26:11 -05:00
Hypolite Petovan 561f22cdc4 Add title to homepage verified check mark 
- Decrease log level for not found Memcached keys
 2022-11-08 04:20:19 -05:00
Hypolite Petovan 4ecf6d9d63 Updated main translation file after moving strings 2022-11-08 02:32:57 -05:00
Hypolite Petovan 18f54f4425 New area "moderation" 
- Moved several admin pages to the moderation area
- ACL still is checking for administrator credentials
 2022-11-08 02:28:42 -05:00
Hypolite Petovan 5ab1cf44f9 Update main translation file after changin strings 2022-11-07 21:56:29 -05:00
Hypolite Petovan c7dbe0b610 Create new OStatus\Repair module class 
- Create corresponding template file
 2022-11-07 21:44:18 -05:00
Philipp a6b09529fd
Update messages.po 2022-11-07 20:32:45 +01:00
Philipp 78a8ed6fe7
adhere feedback 2022-11-07 20:21:11 +01:00
Philipp f13c91b320
Move mod/cal.php and mod/events.php to Module 2022-11-07 19:52:24 +01:00
Tobias Diekershoff d82e8284f0 regen messages.po 2022-11-07 11:25:11 +01:00
Tobias Diekershoff 39908f9083 regen messages.po 2022-11-07 11:19:33 +01:00
Tobias Diekershoff be6809ecdd updated the messages.po file 2022-11-07 11:19:11 +01:00
Tobias Diekershoff 457c34dd13 add a checkmark to the vcards if the homepage has a rel-me back to the profile 2022-11-07 11:15:55 +01:00
Tobias Diekershoff 0104930fb3 add homepage help text to the templates 2022-11-07 11:15:55 +01:00
Hypolite Petovan db3404e8a3 Update main translation file after adding a couple strings 2022-11-06 19:03:21 -05:00
Hypolite Petovan d5b29b1c61 Add follow/unfollow link to the contact actions menu 2022-11-06 19:03:21 -05:00
Hypolite Petovan ae5dde9f5e Fix <a> tags with an onclick action navigating to the URL 2022-11-06 19:03:21 -05:00
Philipp 5d2a25a86e
Merge pull request #12128 from tobiasd/20221106-viercontacts 
[vier] Fix contacts display
 2022-11-06 20:23:51 +01:00
Tobias Diekershoff fb07ba2e3b the filebrowser.tpl file was missing an " 2022-11-06 19:21:37 +01:00
Tobias Diekershoff 1f4ca51cc8 [vier] Fix contacts display 2022-11-06 17:41:10 +01:00
Michael Vogel ea49ab6e04
Merge pull request #12114 from MrPetovan/bug/12112-unFollow 
Fix capitalization of unfollow links in Model\Contact
 2022-11-06 00:21:27 +01:00
Hypolite Petovan c7638e0d0c Updated main translation file after updating a couple of strings 2022-11-05 18:01:53 -04:00
Hypolite Petovan 9aa05eb911 Deprecate themes duepuntozero, quattro and smoothly 2022-11-05 00:06:10 -04:00
Philipp 8cec89195b
Merge pull request #12102 from MrPetovan/task/11011-frio-contact-template-link 
[frio] Make the main contact row template link to the contact page
 2022-11-04 19:49:34 +01:00
Hypolite Petovan a09558e8a8 [frio] Make the main contact row template link to the contact page 
- This was preventing mobile users to access the contact page that was hidden behind a onmouseover behavior
- The now unused template for contact filtering is also removed
 2022-11-04 13:03:35 -04:00
Hypolite Petovan 8124dedbf6 Create new Post/Share module class 2022-11-04 13:02:01 -04:00