friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
31,299 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

6530 Commits

Author SHA1 Message Date
very-ape 857e14636f Bug fix: Keep the introductions notification badge from claiming its own line! 2021-05-21 15:58:35 -07:00
Michael 9330fe1440 Updated messages.po 2021-05-21 18:18:39 +00:00
Hypolite Petovan 2cc4bd2490 Add RTL support to many input fields 
- Compose page
- Post jot
- Comment form
- Event form
 2021-05-20 08:39:37 -04:00
Hypolite Petovan 6d0f6d94cb Add RTL support for post titles and photo captions 2021-05-20 08:39:36 -04:00
Hypolite Petovan 8e005f7de2 Remove whitespace from opening HTML tag ending 2021-05-20 08:39:36 -04:00
Tobias Diekershoff c650285a94
Merge pull request #10270 from MrPetovan/bug/8262-add-rtl-support-in-search 
Add RTL support for item body in search and photo body
 2021-05-19 16:41:44 +02:00
Hypolite Petovan f3aaed7541 Add RTL support for item body in search and photo body 2021-05-19 10:36:25 -04:00
Hypolite Petovan b79b1a3e7b Remove whitespace before opening HTML tag closure 2021-05-19 10:35:58 -04:00
Tobias Diekershoff c49b6c68b5 updated JA translation THXdaingewuvzeevisiddfddd 2021-05-19 16:01:41 +02:00
Tobias Diekershoff 27a4d65bad IT translation update THX fabrixxm 2021-05-19 08:01:49 +02:00
Tobias Diekershoff 678715ed59 updated JA translation THX daingewuvzeevisiddfddd 2021-05-19 08:01:25 +02:00
Tobias Diekershoff e1c3b14b10 updated JA translation THX daingewuvzeevisiddfddd 2021-05-16 15:36:05 +02:00
Tobias Diekershoff 776c71498a DE translation update 2021-05-16 15:35:46 +02:00
Michael 3dcd91cddd Updated messages.po 2021-05-16 07:41:59 +00:00
Michael 6a5083d918 Fixed message, relationships endpoint added 2021-05-15 10:55:41 +00:00
Michael cd85990aea Updated messages.po 2021-05-15 10:18:05 +00:00
Tobias Diekershoff 1fd750a101 DE translation update 2021-05-14 07:46:43 +02:00
Michael a4dc6af3c9 Updated messages.po 2021-05-13 15:15:32 +00:00
Michael a90a2bd05a Merge remote-tracking branch 'upstream/develop' into oauth-flow 2021-05-13 15:14:08 +00:00
Michael b18073d5a8 Repurposed OAuth frontend handling, store the scope 2021-05-13 14:58:55 +00:00
Philipp Holzer c64c85529e
Update messages.po 2021-05-13 14:29:49 +02:00
Michael Vogel 4fb52385a8
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-12 17:32:55 +02:00
Michael b2fe039dab oauth template redesigned 2021-05-12 12:28:13 +00:00
Michael f6faed9fdc Merge remote-tracking branch 'upstream/develop' into api-again 2021-05-12 09:15:27 +00:00
Hypolite Petovan 2e9ff4d72e [frio] Remove obsolete capitalize directives after updating source translation strings 2021-05-11 17:34:27 -04:00
Michael e9fe92a5d7 Merge remote-tracking branch 'upstream/develop' into api-again 2021-05-11 21:21:32 +00:00
Michael 43244a3588 Fix top border on mobile login 2021-05-11 20:49:36 +00:00
Hypolite Petovan d1f20720ca Updated main translation string file after changes 2021-05-11 16:04:34 -04:00
Hypolite Petovan 7a17dfeb08 Updated main translation file after translation string update 2021-05-10 19:06:13 -04:00
Hypolite Petovan 43638fa29b Fix undefined variables in nav.tpl 
- Reworked the nav_info hook to include the rest of the array keys defined in Nav::getInfo
- Replaced the theme-specific template variable nav.userinfo with the regular userinfo in frio nav.tpl
- Initialized all the nav array keys
 2021-05-10 19:03:33 -04:00
Hypolite Petovan 2c6bf754d5 Fix undefined variables in wall_thread.tpl 
- Remove unused "num_comments_text" template variable
- Remove unused "item.postops" template variable mention
 2021-05-10 18:59:09 -04:00
Hypolite Petovan da2ce5c4f4 Fix undefined tamplate variables in comment_item.tpl 
- Remove unused "type" hidden field in comment form
- Remove unused moderated_comment.tpl files
 2021-05-10 18:56:26 -04:00
Philipp f69dab6d1c
Merge pull request #10209 from MrPetovan/bug/10205-frio-link-preview-accents 
[frio] Harmonize link preview display with black/dark accented themes
 2021-05-10 16:01:38 +02:00
Tobias Diekershoff 76c7fa7b6f updated JA translation THX daingewuvzeevisiddfddd 2021-05-10 07:23:51 +02:00
Tobias Diekershoff 45c9632c5e DE translation update 2021-05-10 07:23:33 +02:00
Michael dcff688efb messages.po updated 2021-05-08 12:25:52 +00:00
Tobias Diekershoff e839808b64 IT translation update THX Sylke Vicious 2021-05-08 07:10:48 +02:00
Tobias Diekershoff cbcb205985 DE translation update 2021-05-05 10:05:17 +02:00
Hypolite Petovan d5276fdb60 [frio] Harmonize link preview display with black/dark accented themes 2021-05-04 10:04:07 -04:00
Hypolite Petovan 89b66fcd68 Updated main translation file after adding translation strings 2021-05-04 09:09:17 -04:00
Michael b3e511eb0c No link guessing for DFRN / Don't show redundant data 2021-05-04 05:18:03 +00:00
Tobias Diekershoff 716c6e098a DE translation update 2021-05-03 11:02:28 +02:00
Tobias Diekershoff dc3aaa1676 regen messages.po 2021-05-02 10:00:50 +02:00
Tobias Diekershoff f57ddee31c the command was missing from the worker queue overview 2021-05-02 09:55:19 +02:00
Hypolite Petovan c76af27533 Add initial RTL support for post bodies 2021-05-01 15:13:53 -04:00
Hypolite Petovan 531e5d7f3e Add RTL support to profile name and description in the VCard 2021-05-01 15:13:39 -04:00
Tobias Diekershoff 7a0b9212b8 DE translation update 2021-04-29 10:47:31 +02:00
Philipp Holzer dd71c93589
Update messages.po 2021-04-28 23:34:48 +02:00
Michael e42c9af25d Merge remote-tracking branch 'upstream/develop' into media-preview 2021-04-28 19:45:20 +00:00
Michael 3d64c3031b Preview for Videos and images / Video resolution selection 2021-04-28 19:05:46 +00:00
Tobias Diekershoff 25c434ae14 EN GB translation update THX AndyH3 2021-04-28 06:55:51 +02:00
Tobias Diekershoff 73069c8eec EN GB translation update THX AndyH3 2021-04-28 06:53:53 +02:00
Michael 8685e5ca32 Reworked media handling 2021-04-26 06:50:12 +00:00
Tobias Diekershoff 090a019390 IT translation update THX Sylke Vicious 2021-04-20 11:06:21 +02:00
Tobias Diekershoff 515b360569 EN US translation update THX Steffen K9 2021-04-18 07:42:49 +02:00
Hypolite Petovan af2cdac8d4 Frio: Adapt textcomplete display to dark/black schemes 2021-04-13 11:08:32 -04:00
Philipp Holzer 8f36da9daf
Update messages.po 2021-04-10 20:30:19 +02:00
Michael 99e93d2ba8 Remove empty lines arounf the horizontal ruler, no maximum height 2021-04-07 12:17:35 +00:00
Michael e8a539b68d Move template to content/ 2021-04-05 11:44:43 +00:00
Michael 7e0d21b5bb Audio attachments are now displayed as audio elements 2021-04-05 09:15:36 +00:00
Tobias Diekershoff b57240c05d update for ES THX Senex Petrovic 2021-04-02 08:20:14 +02:00
Tobias Diekershoff e36514e989 DE translation update 2021-04-02 08:16:24 +02:00
Tobias Diekershoff 99ab9cf219 HU translation updated THX Balázs Úr 2021-04-02 07:47:40 +02:00
Tobias Diekershoff 52b75b931f EN US translation refresh for ##9993 2021-04-02 07:41:06 +02:00
Balázs Úr befc2af504
Merge branch '2021.03-rc' into copyright-2021 2021-03-29 08:45:21 +02:00
Balázs Úr 054c301ef0 Update copyright 2021-03-29 08:40:20 +02:00
Tobias Diekershoff 8fc6a5858f RU translations THX SpcCw 2021-03-28 19:14:17 +02:00
Tobias Diekershoff eaf5647217 HU translation updated THX Balázs Úr 2021-03-28 19:14:09 +02:00
Tobias Diekershoff 6426519cf6 IT translation update THX Sylke Vicious 2021-03-28 19:11:59 +02:00
Philipp Holzer 95a7645cba
Update messages.po 2021-03-27 22:46:47 +01:00
Hypolite Petovan 95efb70902 Updated main translation file after adding a translation string 2021-03-14 19:35:41 -04:00
Hypolite Petovan 011e67d680 Add translation string for "Back to top" 2021-03-14 18:12:20 -04:00
Hypolite Petovan ef58effb53 Update main translation after translation string change 2021-03-14 14:19:35 -04:00
Hypolite Petovan d30055070e Updated source translation files after adding translation strings 2021-03-10 09:50:20 -05:00
Hypolite Petovan 064ff693fd Add custom message to the maintenance module display 2021-03-10 09:50:20 -05:00
Roland Häder 5691099a15
Added missing type-hints 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-09 13:37:48 +01:00
Michael 414b9558ec Updated messages.po 2021-03-08 21:25:03 +00:00
Michael 972c9f7bc0 Issue 9743: Added translatable texts 2021-03-08 21:17:27 +00:00
Michael 553ad2994b The template "maitnenance.tpl" isn't used anymore 2021-03-08 10:41:33 +00:00
Hypolite Petovan 2f590b2e07
Fix condition formatting in view/theme/frio/theme.php 2021-02-28 07:44:36 -05:00
Michael 530cfba71e Offer "follow thread" only when you don't already follow 2021-02-28 07:47:07 +00:00
Michael e8ab396d48 Perfgorm a reload after following a thread 2021-02-27 21:57:38 +00:00
Tobias Diekershoff 61ff7fc532 regen messages.po 2021-02-23 10:08:30 +01:00
Hypolite Petovan 3859b7ba10 Move /parse_url module to /parseurl 
- Update oexchange module to use BBCode::embedURL instead of a self-request
- Remove mod/parse_url.php file
- Restrict ParseUrl module to authenticated users
 2021-02-18 09:06:27 -05:00
Hypolite Petovan 07c938a950 Move vier-specific smileybutton styles to addon 2021-02-09 23:25:47 -05:00
Michael Vogel 04caf17772
Merge pull request #9887 from MrPetovan/task/9872-normalize-frontend-api-responses 
Replace references of mod/subthread with item/{id}/follow
 2021-02-01 20:30:31 +01:00
Tobias Diekershoff f0de969b21 DE translation update 2021-02-01 07:16:33 +01:00
Tobias Diekershoff 980fb03d94 IT translation update THX fabrixxm 2021-02-01 07:05:10 +01:00
Tobias Diekershoff cf8f69f84b BG translation update THX Rafael Kalachev 2021-02-01 07:04:13 +01:00
Hypolite Petovan 7f78d6e722 Replace references of GET mod/substhread with POST item/{id}/follow 2021-01-31 17:36:18 -05:00
Hypolite Petovan b31fc3bfa9 Move GET starred/{id} to POST item/{id}/star 2021-01-31 14:21:57 -05:00
Hypolite Petovan 5d270fbb54 Rename dostar() to doStar() 2021-01-31 14:21:09 -05:00
Hypolite Petovan 6d31c11e57 Move GET item/ignore/{id} to POST item/{id}/ignore 2021-01-31 12:56:44 -05:00
Hypolite Petovan 586d39420e Rename doignore to doIgnoreThread 2021-01-31 12:55:50 -05:00
Michael Vogel 71b85ef393
Merge pull request #9893 from MrPetovan/bug/9879-empty-plurals 
Skip empty message strings in Console\PoToPhp
 2021-01-31 18:32:44 +01:00
Hypolite Petovan 151db1104a Move GET /like/{id} to POST /item/{id}/activity/{verb} 2021-01-31 08:41:04 -05:00
Hypolite Petovan 3a18669730 Rename dolike to doActivityItem 2021-01-31 08:39:47 -05:00
Hypolite Petovan 3fae0cd650 Update translated strings files after update to Console\PoToPhp 2021-01-31 08:39:20 -05:00
Michael Vogel 56a77f5275
Merge pull request #9882 from MrPetovan/bug/po2php-plural-conversion 
Remove ternary operators from converted .po plural condition
 2021-01-31 11:43:25 +01:00
Hypolite Petovan 188f7b0eb0 Move GET pinned/{id} to POST item/{id}/pin 2021-01-30 18:42:23 -05:00
Hypolite Petovan b3b2bc96ba Rename dopin() to doPIn 2021-01-30 18:12:01 -05:00
Hypolite Petovan bcd3a274f1 Update plural condition in strings.php after converter update 2021-01-29 20:02:54 -05:00
Michael Vogel 199f72ee3c
Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device 
Add "Remember this device" feature to two factor authentication
 2021-01-27 22:32:08 +01:00
Extarys 00e4c012f9 frio: change manifest to webmanifest 2021-01-24 23:48:22 -05:00
Extarys aad6481824 formating head 2021-01-24 23:24:15 -05:00
Extarys e06e72f26b fix line width - i hate vscode 2021-01-24 17:28:58 -05:00
Extarys e09bc681ff frio: mobile: move navtab arrow closer 2021-01-24 16:19:52 -05:00
Extarys 7610533db0 initial formating 2021-01-24 16:07:24 -05:00
Hypolite Petovan a7fac5a76f
Merge pull request #9858 from annando/notify-ignored 
New setting that controls notifications for ignored contacts
 2021-01-24 08:59:18 -05:00
Michael 0cd02631ce New setting that controls notifications for ignored contacts 2021-01-24 11:40:09 +00:00
Hypolite Petovan 5a949911ba Add trusted browsers user setting module 
- Add trusted browsers help section
 2021-01-23 05:42:59 -05:00
Hypolite Petovan 50f97e977a Added support for trusted browser during authentication 2021-01-23 05:42:59 -05:00
Hypolite Petovan 830bcabce5 Updated main translation file after adding strings 2021-01-23 05:37:28 -05:00
Hypolite Petovan 590d44df5f [frio] Add block author button in More dropdown 2021-01-23 05:33:15 -05:00
Extarys e92456e247 update aria-controls 2021-01-22 12:00:40 -05:00
Extarys cf54ed6960 rename separator to divider 2021-01-22 11:50:46 -05:00
Extarys 61ef23dedc fix toggle button 2021-01-22 11:50:07 -05:00
Extarys 980aa6d404 frio: fix search icon color 2021-01-22 11:50:07 -05:00
Extarys 846506081c frio mobile: fix: right offcanvas 2021-01-22 11:48:58 -05:00
Extarys 82acad004a fix smarty spaces 2021-01-22 10:07:04 -05:00
Extarys 91d3e72be7 frio: formating, otherwise untouched 2021-01-22 08:38:44 -05:00
Hypolite Petovan 1193b73125
Merge pull request #9845 from Extarys/frio-eslint-prettier 
Add eslint, prettier config files to Frio folder
 2021-01-21 22:27:22 -05:00
Extarys 5167c2dc14 add frio formatting file 2021-01-21 18:16:22 -05:00
Hypolite Petovan 57d2ffde30 Updated main translation file after typo fix 2021-01-21 10:47:35 -05:00
Extarys d5879045fa remove comment 2021-01-20 10:44:59 -05:00
Extarys fcd2367089 fix: frio mobile: right sidebar colors 2021-01-20 09:26:22 -05:00
Extarys 61af10b6ce fix: undefined search tag #9789 2021-01-20 09:21:57 -05:00
Extarys 5d42ab9c29 remove comment 2021-01-19 12:47:31 -05:00
Extarys 89cdfa53da remove empty lines 2021-01-16 17:50:11 -05:00
Extarys 390a51f2b7 frio: remove space under submit button in panel 2021-01-16 17:05:24 -05:00
Extarys fd15162299 remove leftover comments 2021-01-16 16:57:09 -05:00
Extarys fb904ad5de frio: readability improvement, first pass 2021-01-16 16:54:23 -05:00
Extarys 545de9f9aa frio: nav css and improve color contrast 2021-01-16 16:53:47 -05:00
Extarys d969e7b549 frio: make nav icons and search bar better 2021-01-16 16:53:06 -05:00
Extarys 48a1fea955 space to tabs 2021-01-15 17:06:14 -05:00
Extarys 2a12dc0e67 fix 7557: dim tags and mentions in posts 2021-01-15 17:01:31 -05:00
Extarys a6b1974f44 frio mobile: larger padding on each side 2021-01-14 19:07:04 -05:00
Extarys 077352af16 Fix: mobile: Frio dark , +change side bar padding 2021-01-14 18:47:02 -05:00
Michael Vogel 31f0f4821f
Merge pull request #9756 from MrPetovan/task/9698-frio-mobile-reshare-dropdown 
[frio] Add share dropdown to mobile post view
 2021-01-07 22:28:38 +01:00
Hypolite Petovan 77e9143d3a [non-Frio] Add edited date to post display 2021-01-07 10:25:34 -05:00
Hypolite Petovan 30af19c0b3 Update main translation file after translation string changes 2021-01-07 10:16:17 -05:00
Hypolite Petovan c8604895c4 [frio] Add share dropdown to mobile post view 
- This should prevent accidental taps from resharing content unwittingly
 2021-01-07 10:13:40 -05:00
Michael df135c31fe Merge remote-tracking branch 'upstream/develop' into no-frontend-worker 2021-01-07 10:44:12 +00:00
ImgBotApp 8a7b70e5ac
[ImgBot] Optimize images 
*Total -- 3,606.88kb -> 3,454.97kb (4.21%)

/images/pause.gif -- 0.85kb -> 0.12kb (85.8%)
/images/rarrw.gif -- 0.98kb -> 0.20kb (79.28%)
/images/larrw.gif -- 0.98kb -> 0.21kb (78.98%)
/images/youtube_icon.gif -- 0.90kb -> 0.22kb (76.08%)
/images/lock_icon.gif -- 0.91kb -> 0.22kb (75.43%)
/images/unlock_icon.gif -- 0.92kb -> 0.23kb (74.95%)
/images/beer_mug.gif -- 1.00kb -> 0.30kb (69.83%)
/images/play.gif -- 0.89kb -> 0.31kb (65.46%)
/view/theme/smoothly/images/larrow.gif -- 0.97kb -> 0.38kb (60.9%)
/view/theme/smoothly/images/rarrow.gif -- 0.97kb -> 0.38kb (60.9%)
/images/camera-icon.gif -- 0.99kb -> 0.40kb (59.9%)
/doc/img/vier_icons.png -- 2.37kb -> 1.12kb (52.82%)
/images/friendica.svg -- 7.21kb -> 3.63kb (49.61%)
/images/spencil.gif -- 0.49kb -> 0.29kb (40.24%)
/images/globe.gif -- 1.00kb -> 0.61kb (39.02%)
/images/smiley-heart.gif -- 0.56kb -> 0.36kb (35.36%)
/images/smiley-brokenheart.gif -- 0.58kb -> 0.38kb (34.45%)
/view/theme/vier/icons.svg -- 82.44kb -> 54.11kb (34.36%)
/view/theme/smoothly/images/icons.svg -- 82.44kb -> 54.11kb (34.36%)
/images/friendica-404_svg_flexy-o-hare.png -- 14.21kb -> 10.90kb (23.31%)
/images/friendica-404_svg_hare-bottom-light-inside.png -- 5.89kb -> 4.54kb (22.98%)
/doc/img/editor_frio.png -- 9.44kb -> 7.55kb (19.98%)
/images/b_drop.gif -- 0.13kb -> 0.11kb (19.57%)
/images/b_dropshow.gif -- 0.13kb -> 0.11kb (19.57%)
/doc/img/editor_vier.png -- 7.91kb -> 6.48kb (18.06%)
/images/link-icon.gif -- 0.14kb -> 0.12kb (16.55%)
/images/discourse.png -- 11.89kb -> 10.20kb (14.24%)
/images/smiley-Oo.gif -- 0.98kb -> 0.89kb (8.67%)
/view/theme/frio/img/friendica-logo.svg -- 3.66kb -> 3.45kb (5.71%)
/images/humane-tech-badge.svg -- 49.17kb -> 46.72kb (5%)
/view/theme/duepuntozero/login-bg.gif -- 0.23kb -> 0.22kb (3.38%)
/view/theme/smoothly/images/login-bg.gif -- 0.23kb -> 0.22kb (3.38%)
/spec/dfrn2_contact_confirmation.svg -- 24.14kb -> 23.44kb (2.9%)
/spec/dfrn2_contact_request.svg -- 32.92kb -> 32.11kb (2.49%)
/view/theme/frio/font/open_sans/fonts/Light/OpenSans-Light.svg -- 258.16kb -> 252.11kb (2.35%)
/view/theme/frio/font/open_sans/fonts/Bold/OpenSans-Bold.svg -- 264.11kb -> 258.04kb (2.3%)
/view/theme/frio/font/open_sans/fonts/Semibold/OpenSans-Semibold.svg -- 264.13kb -> 258.07kb (2.29%)
/view/theme/frio/font/open_sans/fonts/ExtraBold/OpenSans-ExtraBold.svg -- 265.14kb -> 259.07kb (2.29%)
/view/theme/frio/font/open_sans/fonts/Regular/OpenSans-Regular.svg -- 266.09kb -> 260.03kb (2.28%)
/view/theme/frio/frameworks/bootstrap/fonts/glyphicons-halflings-regular.svg -- 106.19kb -> 103.92kb (2.14%)
/view/theme/frio/font/open_sans/fonts/ExtraBoldItalic/OpenSans-ExtraBoldItalic.svg -- 283.40kb -> 277.34kb (2.14%)
/view/theme/frio/font/open_sans/fonts/BoldItalic/OpenSans-BoldItalic.svg -- 284.26kb -> 278.21kb (2.13%)
/view/theme/frio/font/open_sans/fonts/SemiboldItalic/OpenSans-SemiboldItalic.svg -- 289.45kb -> 283.39kb (2.09%)
/view/theme/frio/font/open_sans/fonts/Italic/OpenSans-Italic.svg -- 290.77kb -> 284.70kb (2.09%)
/view/theme/frio/font/open_sans/fonts/LightItalic/OpenSans-LightItalic.svg -- 291.13kb -> 285.07kb (2.08%)
/images/person-300.jpg -- 11.05kb -> 10.83kb (2.05%)
/images/smiley-bangheaddesk.gif -- 0.86kb -> 0.85kb (1.92%)
/images/smiley-shaka.gif -- 2.37kb -> 2.33kb (1.9%)
/view/theme/vier/font/fontawesome-webfont.svg -- 357.05kb -> 352.24kb (1.35%)
/images/article.gif -- 1.04kb -> 1.03kb (0.75%)
/images/rotator.gif -- 0.81kb -> 0.80kb (0.48%)
/view/theme/frio/scheme/plusminus.jpg -- 22.34kb -> 22.32kb (0.09%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2021-01-05 11:37:29 +00:00
Michael a81ac835a1 The frontend worker is removed 2021-01-01 23:05:26 +00:00
Michael Vogel 1b841d8379
Merge pull request #9731 from MrPetovan/task/various-theme-changes 
Various theme changes
 2020-12-31 19:41:06 +01:00
Michael Vogel 54db693e16
Merge pull request #9724 from MrPetovan/bug/notices 
Various improvements
 2020-12-31 17:30:50 +01:00
Hypolite Petovan 51b08769e2 [vier] Convert wall-item-body span to div 
- This element contains the post body that can also contains block elements
 2020-12-31 09:07:33 -05:00
Hypolite Petovan 15d6227aa2 [quattro] Convert wall-item-body span to div 
- This element contains the post body that can also contains block elements
 2020-12-31 09:07:24 -05:00
Hypolite Petovan f1e96d5bc9 [frio] Restore previous back to top arrow character 2020-12-31 09:06:10 -05:00