Tobias Diekershoff
76ed555d46
DE translation update
2021-07-28 07:18:38 +02:00
Michael
c89533a70b
Support for stacked profiler analysis
2021-07-27 04:57:29 +00:00
Hypolite Petovan
3cef3ab107
Merge pull request #10548 from annando/args
...
Replaced argv/argc with replacement functions
2021-07-26 18:43:47 -04:00
Michael
5a87ccf026
Getter/Setter for theme info
2021-07-25 19:39:10 +00:00
Michael
c52b8595e8
theme infos are now bundled in a single array
2021-07-25 19:07:03 +00:00
Hypolite Petovan
69c75daf4f
Merge pull request #10543 from annando/app-variables
...
App variables reduced and removed
2021-07-25 08:56:05 -04:00
Philipp
6347a238a1
Update messages.po
2021-07-24 19:02:15 +02:00
Philipp
4be4498b13
Update UX for Storage administration
2021-07-24 19:01:01 +02:00
Philipp
e19b9824cd
Allow setting & saving storages per type
2021-07-24 19:00:58 +02:00
Philipp
cbe522ee82
Fixings
2021-07-24 19:00:58 +02:00
Philipp
3647f6f031
Refactor storage admin setting
2021-07-24 19:00:58 +02:00
Philipp
97bafb3a59
Extract Storage admin section to own page
2021-07-24 19:00:58 +02:00
Michael
a115f10d62
Styling
2021-07-24 13:11:49 +00:00
Michael
b3b5599d27
Show the network icon for the contact
2021-07-24 12:21:33 +00:00
Michael
21e3d1c4e3
Updated messages.po
2021-07-23 13:31:07 +00:00
Michael
fae0f839bc
Merge remote-tracking branch 'origin/develop' into profile
2021-07-23 13:29:36 +00:00
Michael
7c0d900b99
Updated messages.po
2021-07-23 13:07:06 +00:00
Michael
373aca1046
Updated "messages.po"
2021-07-23 12:43:52 +00:00
Michael
afe3c8954c
Simplified functionality to load the profile in the sidebar
2021-07-23 12:39:37 +00:00
Michael Vogel
a1ee75eba7
Merge pull request #10498 from MrPetovan/bug/10477-frio-csp-error-event-edit
...
[frio] Move content of event_edit.js to mod_event.js to prevent an unsafe-eval
2021-07-22 14:39:25 +02:00
Michael
b5f59d5be0
API: Support for deprecated API endpoints and OAuth removal
2021-07-20 20:48:37 +00:00
Michael
6668066099
The legacy OAuth server is removed
2021-07-20 17:41:04 +00:00
Michael
3a5523820c
Legacy DFRN transport layer is removed
2021-07-15 13:28:32 +00:00
Hypolite Petovan
dde1d203f7
[frio] Move content of event_edit.js to mod_event.js to prevent an unsafe-eval
2021-07-14 08:13:24 -04:00
Michael
097eb9e83b
Updated messages.po
2021-07-14 02:56:15 +00:00
Michael
1466afe3b2
Automatically subscribe to the followings of a given AP account
2021-07-13 06:06:08 +00:00
Michael
b80cca61e6
Added messages.po
2021-07-12 14:20:10 +00:00
Michael
e5c312a066
Issue 10491: Possibility for simple shortening added
2021-07-12 14:11:51 +00:00
Hypolite Petovan
540dc90ce1
Merge frio-specific share block template into the base template
...
- Add BIDI support for share blocks
- Remove redundant share block styles
2021-07-09 19:23:01 -04:00
Michael
165c6ddc63
"convert" changed to "convertForItem"
2021-07-08 15:41:46 +00:00
Michael
59a77ceac8
Updated messages.po
2021-07-06 07:16:46 +00:00
Michael
dac27ead7a
Proxy settings removed
2021-07-06 06:44:18 +00:00
Michael
31bf8d3ea0
Updated messages.po
2021-07-05 05:15:35 +00:00
Michael
a06d699480
Item cache related functionality removed
2021-07-05 04:57:50 +00:00
Michael
dfc1b1e7a5
Allow search for only locally published contacts
2021-07-04 19:58:02 +00:00
Hypolite Petovan
1322999fc2
Updated messages.po after code changes
2021-06-27 23:19:08 -04:00
Hypolite Petovan
efff254a3a
Wrap each addon settings form in their own form tag
...
- The single form tag was preventing a given addon settings to be saved if another addon had an empty required field.
- Instead of concatenating the addon form HTML through Hook::callAll, we loop manually through the hooks, appending the HTML to an array.
2021-06-27 23:15:27 -04:00
Tobias Diekershoff
cb7b5089aa
DE translation update
2021-06-27 14:22:36 +02:00
Tobias Diekershoff
02e69e9c7c
updated JA translation THX daingewuvzeevisiddfddd
2021-06-27 14:18:34 +02:00
Tobias Diekershoff
c0aa138da6
HU translation updated THX Balázs Úr
2021-06-27 14:17:51 +02:00
Michael
09c77e3774
Updated messages.po
2021-06-15 17:23:08 +00:00
Michael
bc58cb9b94
Merge remote-tracking branch 'upstream/2021.06-rc' into issue-10386
2021-06-15 17:21:13 +00:00
Hypolite Petovan
c9ec2e21b3
Merge pull request #10403 from annando/doc-structure
...
Updated database structure documentation
2021-06-14 09:01:58 -04:00
Michael
c3cfc443ae
Handling of special characters
2021-06-14 12:38:42 +00:00
Michael
7106106f11
Formatted index list
2021-06-14 12:15:10 +00:00
Michael
a29c21224d
Dash removed
2021-06-14 08:54:31 +00:00
Michael
96f07c7288
Indexes and foreign keys added
2021-06-14 08:53:37 +00:00
Michael
2cd0c1d30d
Trailing whitespace removed
2021-06-14 06:10:11 +00:00
Michael
fd30df7300
Pad the header
2021-06-14 05:58:51 +00:00
Michael
a827f948c8
Reversed "null"
2021-06-14 05:14:09 +00:00
Michael
84ab5d6159
Updates database structure documentation
2021-06-13 20:33:50 +00:00
Michael
63d2bbcfa0
Updated messages.po
2021-06-13 17:56:06 +00:00
Michael
bf8cb39102
Diaspora relay functionality is removed
2021-06-13 11:15:04 +00:00
Michael
1b6212f8a8
Updated messages.po
2021-06-10 06:29:34 +00:00
Tobias Diekershoff
29443588f7
updated JA translation THX daingewuvzeevisiddfddd
2021-06-09 12:08:46 +02:00
Tobias Diekershoff
4b4a060547
HU translation updated THX Balázs Úr
2021-06-01 14:43:39 +02:00
Tobias Diekershoff
65442ac6ba
updated JA translation THX daingewuvzeevisiddfddd
2021-06-01 06:08:35 +02:00
Tobias Diekershoff
4045f42ac3
updated JA translation THXdaingewuvzeevisiddfddd
2021-05-30 19:33:56 +02:00
Tobias Diekershoff
54e3a19cb9
DE translation update
2021-05-30 19:33:46 +02:00
Michael
7064b43cb8
Updates messages.po
2021-05-29 20:31:57 +00:00
Tobias Diekershoff
ecb25a6fd9
DE translation update
2021-05-26 09:07:56 +02:00
Tobias Diekershoff
918f869aef
regen messages.po
2021-05-23 07:50:37 +02:00
Hypolite Petovan
93546ce93d
Merge pull request #10284 from very-ape/vier-notifications-fix
...
[vier] Keep the introductions notification badge from claiming its own line!
2021-05-22 06:47:20 -04:00
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
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
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
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
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
