nupplaPhil
0f932ae723
Notify => Notification
...
Notifs => Notifications
2020-01-24 18:32:38 +01:00
Hypolite Petovan
64c05f2280
Add custom fields help text
2020-01-22 19:42:36 -05:00
Hypolite Petovan
cc007f715d
Add sortability to custom profile fields form
2020-01-22 19:42:36 -05:00
Hypolite Petovan
6657cf7bb1
Rework profile setting page with custom fields
2020-01-22 19:42:35 -05:00
Hypolite Petovan
d475cb5028
Replace advanced profile display with custom profile fields
...
- Merge all profile/advanced.tpl theme templates into profile/index.tpl
- Remove obsolete Model\Profile::getAdvanced method
2020-01-22 19:42:34 -05:00
Hypolite Petovan
f6f4cbab9d
Remove multi profiles feature
...
- Remove mod/profperm
- Remove additional feature
- Remove profile visibility on contact page
- Remove profile list templates
2020-01-22 19:42:33 -05:00
Hypolite Petovan
d1be68b754
Move Module\Profile to Module\Profile\Index
...
- Move /profiles to Module\Settings\Profile\Index
2020-01-22 19:42:32 -05:00
nupplaPhil
5c4eb2b2c9
Move templates into sub-dir "notifications"
2020-01-23 00:16:34 +01:00
Hypolite Petovan
3ebc0371b7
Add trace for admin in exceptionpages
...
- Fix exception message not showing on raw exception page
2020-01-20 07:47:53 -05:00
Hypolite Petovan
f0474c07ce
Add "Yourself" ACL choice and allow multiple ACL selectors on a single page
2020-01-20 07:32:48 -05:00
Hypolite Petovan
9803c96db4
Move profile-related templates to sub-folder
2020-01-20 07:27:14 -05:00
Hypolite Petovan
0d1befdf2d
Move /profile_photo to Module\Settings\Profile\Photo
2020-01-20 07:27:12 -05:00
Michael
035e0c5a61
Issue 8136: Optical enhancements for delegation page
2020-01-20 05:05:20 +00:00
Michael
a3ea98a79f
Fix: You can now register an account when you haven't done it before
2020-01-18 18:40:48 +00:00
Michael
f3b3c4e866
Link to registration added
2020-01-17 12:44:26 +00:00
Michael
7ee7bd72fd
Additional accounts now work for the general template as well
2020-01-17 07:08:32 +00:00
Hypolite Petovan
7db4c7ea02
Merge pull request #8118 from annando/spamcheck
...
Improved spam protection
2020-01-15 13:15:17 -05:00
Michael Vogel
8ebc385772
Improved spam protection
2020-01-15 18:55:32 +01:00
Michael
c7beffa5ca
Vier: The forumlist doesn't appear on the left in wide view
2020-01-13 22:14:14 +00:00
Michael
f801e55d15
"init" function for sidebar added
2020-01-11 09:10:22 +00:00
Michael
579fd2962e
Some more widgets added
2020-01-11 09:05:43 +00:00
Michael
cfeef7afed
We now store the state in a cookie
2020-01-11 08:41:14 +00:00
Michael
8f36a1554e
The widget are now inflated by default as well
2020-01-11 06:42:47 +00:00
Michael
4c2d1aff03
The widgets in the sidebar are now deflated by standard
2020-01-09 06:53:33 +00:00
Hypolite Petovan
2d3c0520c3
Add meaningful sorter to ACL autocomplete
2019-12-16 03:13:32 -05:00
Hypolite Petovan
74cc9d00fa
Allow contacts and groups with same ID in ACL selector
2019-12-07 05:50:15 -05:00
nupplaPhil
c28f1fec51
General usage of type in input fields
2019-12-05 21:42:33 +01:00
nupplaPhil
47505aceec
double quoted field & use number
2019-12-05 21:13:49 +01:00
nupplaPhil
e6da666885
Make Two Factor Field numeric
2019-12-05 20:19:25 +01:00
Hypolite Petovan
4403aeeda5
Merge pull request #7901 from annando/disable-smart-threading
...
Changed the option to enable the smart threading with the option to disable this
2019-12-04 15:25:53 -05:00
Michael Vogel
9cf1aea8c9
Changed the option to enable the smart threading with the option to disable this
2019-12-04 21:21:20 +01:00
Hypolite Petovan
77abf65b62
[frio] Make whole ACL panel heading clickable to change visibility panel
...
- Addresses https://libranet.de/display/0b6b25a8-155d-e27f-6cc4-2e4568491578
2019-11-30 10:47:25 -05:00
Michael Vogel
2f2480d88d
Merge pull request #7876 from MrPetovan/task/7308-backport-compose-acl
...
Generalize the Compose ACL to the whole site
2019-11-28 21:24:20 +01:00
Hypolite Petovan
8f4f6899dd
Update composer module to use the new ACL selector
...
- Remove ACL-specific code from compose-footer
- Move compose-footer template remaining content to compose.js
2019-11-28 12:54:56 -05:00
Hypolite Petovan
b64b18e6f7
Remove obsolete view/js/acl.js
...
- Remove references to the deleted file
2019-11-28 12:54:56 -05:00
Hypolite Petovan
ae3d4f63a3
Use visibility tags input for the default ACL selector
...
- Move friendica-tagsinput to default view folder
- Update all references to ACL::getFullSelectorHTML
- Fix theme-specific issues with the new ACL
2019-11-28 12:54:53 -05:00
Michael
7c1f8a0597
Renamed config name
2019-11-19 16:31:22 +00:00
Michael
fa876d770e
Make the automatic title appending optional
2019-11-19 12:59:21 +00:00
Michael
ed58af25a5
show pinned items
2019-11-07 06:53:18 +00:00
Michael
cf56992444
We can now pin our own posts
2019-11-07 05:39:15 +00:00
Philipp
4daa3d37c1
Merge pull request #7812 from tobiasd/20191103-tarpid
...
a hidden field for the registration form
2019-11-04 11:03:54 +01:00
Tobias Diekershoff
9f9dd18adc
move frio template
2019-11-04 07:21:45 +01:00
Philipp
d0068170db
Merge pull request #7806 from tobiasd/20191102-csvexport
...
added export and import of followed contacts to and from CSV files
2019-11-03 20:28:08 +01:00
Tobias Diekershoff
1377d13055
ypot
2019-11-03 17:37:53 +01:00
Tobias Diekershoff
9815d63352
use config var in settings form
2019-11-03 17:31:01 +01:00
Tobias Diekershoff
0215ceeecd
use placeholder
2019-11-03 17:11:24 +01:00
Tobias Diekershoff
7ca202baad
add a tar pid to the registration form
2019-11-03 17:05:06 +01:00
Tobias Diekershoff
ebfedbc449
add links to cat.url
2019-11-03 15:55:58 +01:00
Tobias Diekershoff
955a84a266
added export and import of followed contacts to and from CSV files
2019-11-03 00:12:16 +01:00
Hypolite Petovan
eb3cf5a764
Replace indenting spaces by tabs in templates/contact/hovercard.tpl
2019-11-02 12:48:04 -04:00
Hypolite Petovan
ff27f45cb9
Move mod/hovercard to src/Module/Contact/Hovercard
...
- Rework hovercard.js to remove JS template interpolation
- Remove template/json output from Module/Contact/Hovercard
2019-11-02 12:48:03 -04:00
Michael
aca701bef8
Changed OpenID registration
2019-10-24 20:23:26 +00:00
Philipp
fed486bfc5
Merge pull request #7727 from MrPetovan/task/4090-move-manage-to-src
...
Move mod/manage to src/Module/Delegation
2019-10-13 18:20:47 +02:00
Hypolite Petovan
74bf3a4dc8
Replace path parameter with query string parameter in Module\Search\Saved
2019-10-13 08:39:41 -04:00
Hypolite Petovan
02f02d44dc
Move mod/manage to src/Module/Delegation
...
- Move templates/manage to templates/delegation
- Update navigation links
- Update CSS classes
2019-10-11 19:59:06 -04:00
Philipp
cf4bae26c7
Merge pull request #7720 from MrPetovan/task/4090-move-delegate-to-src
...
Move mod/delegate to src/Module/Settings/Delegation
2019-10-10 10:24:15 +02:00
Hypolite Petovan
616edd0600
Move mod/delegate to src/Module/Settings/Delegation
...
- Move templates/delegate to templates/settings/delegation
2019-10-09 22:17:09 -04:00
Hypolite Petovan
22598fc7e8
Improve search box
...
- Use new saved search module
- Use dynamic search option loop
- Use "q" instead of "search" for search query string parameter
2019-10-07 14:27:46 -04:00
Hypolite Petovan
cdefa7f32a
Add new module and widget for managing saved searches
2019-10-07 14:27:46 -04:00
Hypolite Petovan
8f20e2054b
Move /acl module to src/
...
- Move Core\ACL::contactAutocomplete to Module\Search\Acl
- Rename module path to /search/acl
2019-10-03 22:40:42 -04:00
Tobias Diekershoff
8db7934a30
add option 'require' for textarea form elements
2019-10-02 07:33:30 +02:00
Hypolite Petovan
cba40dc9fd
Prevents Enter from submitting the jot form in the ACL search field
...
- Disable browser autocomplete in jot ACL search field
2019-08-25 21:03:29 -04:00
Hypolite Petovan
341046e3a0
[frio] Prevent Enter from sending the form in ACL tags input in /compose
2019-08-25 21:01:59 -04:00
Hypolite Petovan
0a9ed707b5
Add hashtag mark to trending tags display
2019-08-06 20:55:40 -04:00
Hypolite Petovan
a947bd0889
Add Trending Tags widget + template
2019-08-06 07:09:04 -04:00
Hypolite Petovan
c25527cbe8
Replace obsolete #comment-preview-inp field by query string append
2019-07-29 21:58:37 -04:00
Hypolite Petovan
9d20705700
Improve compose page template
...
- Update title and description of the limited/private panel
- Move CC email addresses outside of the visibility panels
2019-07-29 20:31:49 -04:00
Hypolite Petovan
496b02bdd2
[frio] Accessibility: enable keyboard action on visibility panels in compose page
2019-07-29 20:31:48 -04:00
Hypolite Petovan
4f4b538bcf
[frio] Add jotnet fields to compose page
...
- Move hardcoded descriptions to translation strings
2019-07-29 20:31:47 -04:00
Hypolite Petovan
c24ca57f21
Add frio-specific /compose module
2019-07-29 20:31:46 -04:00
Hypolite Petovan
816eba5164
Unescape stream event title
2019-07-28 21:46:43 -04:00
Hypolite Petovan
c32d635326
Revert heading changes in admin/blocklist/server.tpl
2019-07-26 21:16:15 -04:00
Hypolite Petovan
eaf217ef7d
Update server block admin page to reflect the addition of shell wildcard syntax
2019-07-25 22:37:30 -04:00
Hypolite Petovan
4821fe1b98
Use template-displayed errors in TwoFactor\Verify
...
- Remove the page dependency on jGrowl notices
2019-07-23 20:02:26 -04:00
Hypolite Petovan
1a164b0dc5
Add two-factor app-specific password settings page
...
- Add two-factor app-specific model
- Add link to new page from 2fa settings index page
2019-07-22 07:56:00 -04:00
Michael
a11206dbcd
Issue 6675: Improved check for follower, removed global setting
2019-07-21 05:56:57 +00:00
Michael
e247a14d2b
Added the option to only receive top level posts from people you follow
2019-07-17 21:37:13 +00:00
Philipp Holzer
92fb0a82ca
Dynamic config loading
...
- Move settings, defaults and dbstructure to directory 'static'
- Dynamic loading of config files (after the static loading)
- Filter out '-sample.config.php' and '-sample.ini.php' files
- Remove unnecessary ConfigFileManager
- Move ConfigFileLoader to Utils
- Add tests for multi-loading for INI, config and sample-filtering
2019-07-16 20:16:43 +02:00
Jeroen De Meerleer
aff60da1af
Nofilter
2019-07-13 22:45:54 +02:00
Michael
4ab772ed67
Issue 6477: Automatically repair self contact avatar
2019-06-19 17:05:29 +00:00
Hypolite Petovan
b00bcbb1c1
Normalize the contact sidebar with the profile sidebar
...
- Remove un/follow text links in contact status window
2019-06-10 21:56:06 -04:00
Hypolite Petovan
3aebb92cf3
Rework Profile::sidebar profile link conditions
...
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
2019-06-10 21:56:03 -04:00
Hypolite Petovan
9ac7d20df3
[frio] Add .add-to-modal delegated event on anchors
...
- Improve hovercard button accessibility
2019-06-03 08:31:43 -04:00
Hypolite Petovan
ed768c71ee
Remove "f=&" nonsense from network module
...
- Fixes wrong redirect when using the sidebar filters
2019-05-27 17:45:27 -04:00
Philipp Holzer
78a20e5acb
Fix hovercard vanish
2019-05-26 21:42:49 +02:00
Hypolite Petovan
d27d4d8927
Move posted date widget to Content\Widget
2019-05-25 19:08:15 -04:00
Hypolite Petovan
709eba6ce3
Move /viewcontacts to /profile/{nickname}/contacts[/{type}]
...
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
2019-05-20 14:50:09 -04:00
Hypolite Petovan
0c9b76a585
Merge pull request #7173 from nupplaphil/task/mod_newmember
...
Move mod/newmember to src/Module/Welcome
2019-05-20 14:14:58 -04:00
Philipp Holzer
f97b72eb9f
Move mod/newmember to src/Module/Welcome
2019-05-20 20:12:20 +02:00
Hypolite Petovan
6f0c6e8926
Merge pull request #7160 from nupplaphil/task/mod_probe
...
Move mod/probe to src/Module/Probe
2019-05-19 15:06:13 -04:00
Philipp
a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets
...
Refactor widgets
2019-05-19 20:52:00 +02:00
Philipp Holzer
48bba87abe
Move mod/probe to src/Module/Probe
2019-05-19 04:24:18 +02:00
Philipp Holzer
9f13ae6e73
Move mod/opensearch to src/Module/OpenSearch
2019-05-18 17:43:58 +02:00
Hypolite Petovan
71ae8d07a6
Refactor widgets
...
- Move widget templates to subfolder
- Add new generic filter widget templates to replace category, network and filer filters
- Update styles
2019-05-18 11:33:35 -04:00
Hypolite Petovan
0c63f8aa42
Add contact block reason form and display in admin page
2019-05-15 19:30:13 -04:00
Hypolite Petovan
8e885f5b97
Add two-factor authentication settings
...
- Add settings aside menu entry
- Add two-factor authentication documentation
2019-05-13 01:52:01 -04:00
Hypolite Petovan
d7e9b91181
Add two-factor authentication
...
- Add 2FA login interception in Session::setAuthenticatedForUser
- Add 2fa session variable holding the last auth code
2019-05-13 01:52:01 -04:00
Philipp
2a2b147758
Merge pull request #7127 from tobiasd/20190510-pwdresetescape
...
pwdreset templated fixed HTML escaping
2019-05-10 11:37:12 +02:00
Tobias Diekershoff
782037a611
HTML escaping
2019-05-10 10:52:53 +02:00
Tobias Diekershoff
3812cdf123
make the addon listing in the admin panel aside working again
2019-05-10 10:38:09 +02:00
Philipp
7c62a4e02b
Merge pull request #7104 from annando/separated-confirm
...
The follow confirmation process is now separated
2019-05-06 21:40:11 +02:00
Philipp Holzer
8ac1cf926c
remove superfluous tpl action
2019-05-06 20:40:53 +02:00
Hypolite Petovan
20c9d5fe1d
Merge pull request #7103 from nupplaphil/task/mod_smilies
...
Move mod/smilies to src/Module/Smilies
2019-05-06 12:53:45 -04:00
Michael
37f9af2f24
Merge remote-tracking branch 'upstream/develop' into separated-confirm
2019-05-06 05:54:51 +00:00
Michael
5da3e17a12
The follow confirmation process is now separated between DFRN and the rest
2019-05-06 05:46:13 +00:00
Philipp
14d8c12130
Merge pull request #7092 from MrPetovan/task/7047-theme-error-page
...
Add style to exception page
2019-05-06 07:33:42 +02:00
Hypolite Petovan
bb8d297ae4
Merge pull request #7097 from nupplaphil/task/mod_after_PR_fixing
...
Fixings for Mod-Refactorings
2019-05-05 20:28:57 -04:00
Hypolite Petovan
8af0ae171e
Merge pull request #7083 from nupplaphil/task/mod_friendica
...
Move mod/friendica to src/Module/Friendica
2019-05-05 14:19:57 -04:00
Philipp Holzer
e90876cd86
Move mod/smilies to src/Module/Smilies
2019-05-05 19:39:02 +02:00
Philipp Holzer
f6af90fa32
Create XML output for RSD with XML::fromArray()
2019-05-05 18:15:39 +02:00
Philipp Holzer
5d1a12d9b3
add feedback
2019-05-05 17:02:17 +02:00
Philipp Holzer
06ce74c7c9
add feedback
2019-05-05 17:01:51 +02:00
Philipp Holzer
9123361d61
added feedback
2019-05-05 10:00:28 +02:00
Hypolite Petovan
c969635bbc
Add style to exception page
2019-05-04 21:54:05 -04:00
Philipp Holzer
a1f332aaa5
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery
2019-05-04 21:37:32 +02:00
Philipp Holzer
708ffaff51
Move mod/home to src/Module/Home
2019-05-04 13:08:31 +02:00
Philipp Holzer
3fca00d1d5
forgot nofilter
2019-05-04 10:17:04 +02:00
Philipp Holzer
6f787f2422
Move mod/friendica to src/Module/Friendica
2019-05-04 10:14:29 +02:00
Hypolite Petovan
70bef12fd2
Fix Proxy module routes
...
- Fix EOL in view/templates/exception.tpl
2019-05-02 21:35:37 -04:00
Philipp
2628da422a
Merge pull request #7068 from MrPetovan/task/7047-theme-error-page
...
Themed error page redux
2019-05-02 21:15:29 +02:00
Philipp
774d04cd2f
Merge pull request #7044 from MrPetovan/task/router
...
Move mod/admin to src/Module/Admin
2019-05-02 18:26:30 +02:00
Hypolite Petovan
358baa9f62
Add themed error pages
...
- Module init, post and rawContent-triggered HTTPException generate the classic bare HTTP status page
- Module content-triggered HTTPException generate themed error pages
- Trim System::httpExit to the bare minimum
2019-05-02 11:26:56 -04:00
Philipp
07cb887885
Merge pull request #7067 from MrPetovan/task/remove-app-error
...
Remove App->error
2019-05-02 17:24:56 +02:00
Hypolite Petovan
9774c95b80
Remove duplicate $baseurl template variable
...
- Remove unused $overwriteURL parameter in Renderer::replaceMacros
2019-05-02 09:55:48 -04:00
Hypolite Petovan
d8125eb3db
Make the site admin theme setting link go to the currently selected theme
2019-05-02 09:52:55 -04:00
Hypolite Petovan
ad02fd140a
Move /itemsource to src/Module/Admin
2019-05-02 09:52:53 -04:00
Hypolite Petovan
bc5d1384e1
Move admin/deleteitem to src/Module/Admin
2019-05-02 09:52:52 -04:00
Hypolite Petovan
a201391d11
Move admin/dbsync to src/Module
2019-05-02 09:52:51 -04:00
Hypolite Petovan
df947ba9db
Move admin/logs to src/Module
2019-05-02 09:52:51 -04:00
Hypolite Petovan
740723534f
Move admin/site to src/Module
...
- Replace default theme settings modal with simple link to admin/themes
2019-05-02 09:52:50 -04:00
Hypolite Petovan
d0b40cda4c
Move admin/themes/{theme} to src/Module
...
- Remove now unused templates/admin/addon_detail.tpl
- Remove references to themes admin in mod/admin.php
2019-05-02 09:52:50 -04:00
Hypolite Petovan
a5da0fd98f
Add admin/themes/{theme}/embed module
...
- This module allows editing the site settings for a theme with a different user theme
2019-05-02 09:52:49 -04:00
Hypolite Petovan
5a01c53781
Move admin/queue to src/Module
...
- Add Module\Admin\Queue class
- Add route for admin/queue[/deferred]
- Add queue admin aside menu entry
- Remove obsolete templates/admin/queue.tpl from base and frio
- Move templates/admin/workerqueue.tpl to templates/admin/queue.tpl
- Remove admin_page_workerqueue and admin_page_workerqueue_post from mod/admin.php
- Update admin/summary.tpl with new queue admin paths
2019-05-02 09:52:48 -04:00
Hypolite Petovan
5750623b48
Move admin/blocklist/server to src/Module
...
- Add Module\Admin\Blocklist\Server class
- Add route for admin/blocklist/server
- Add server blocklist admin aside menu entry
- Move templates/admin/blocklist.tpl to templates/admin/blocklist/server.tpl
- Remove admin_page_blocklist and admin_page_blocklist_post from mod/admin.php
2019-05-02 09:52:47 -04:00
Hypolite Petovan
cf885841c8
Move admin/blocklist/contact to src/Module
...
- Add Module\Admin\ContactBlock\Contact class
- Add route for admin/blocklist/contact
- Add contact blocklist admin aside menu entry
- Move templates/admin/contactblock.tpl to templates/admin/blocklist/contact.tpl in base and frio
- Remove admin_page_contactblock and admin_page_contactblock_post from mod/admin.php
2019-05-02 09:52:46 -04:00
Hypolite Petovan
446cb905e4
Move admin/features to src/Module
...
- Add Module\Admin\Features class
- Add route for admin/features
- Add features admin aside menu entry
- Move templates/admin/settings_features.tpl to templates/admin/features.tpl
- Remove admin_page_features and admin_page_features_post from mod/admin.php
2019-05-02 09:52:46 -04:00
Hypolite Petovan
f3f055758c
Move admin/users to src/Module
...
- Add Module\Admin\Users class
- Add route for admin/users[/{action}/{uid}]
- Add users admin aside menu entry
- Remove admin_page_users and admin_page_users_post from mod/admin.php
2019-05-02 09:52:45 -04:00
Hypolite Petovan
87e51ddd67
Move admin/addons/{addon} to src/Module
...
- Add Module\Admin\Addons\Details class
- Add route for admin/addons/{addon}
- Remove addons pages from mod/admin
2019-05-02 09:52:44 -04:00
Hypolite Petovan
9bbb438534
Move admin/addons to src/Module
...
- Add Module\Admin\Addons\Index class
- Add route for admin/addons
- Add addons admin aside menu entry
- Remove unused template admin/addons.tpl from base and frio
- Remove addon list from mod/admin
2019-05-02 09:52:44 -04:00
Hypolite Petovan
a13bc14933
Move admin/themes to src/Module
...
- Add Module\Admin\Themes\Index class
- Add route for admin/themes
- Add themes admin aside menu entry
- Add admin/addons/index.tpl template
- Remove theme list from mod/admin
2019-05-02 09:52:43 -04:00
Hypolite Petovan
6387a77b52
Move admin summary to src/Module
...
- Add BaseAdminModule class
- Add Module\Admin\Summary class
- Add Route for Admin\Summary module
- Remove admin_page_summary() in mod/admin
- Remove $showwarning variable from admin/summary.tpl
2019-05-02 09:52:41 -04:00
Hypolite Petovan
5dd6e6b5fb
Reworked /photos module without App->error
...
- Moved confirm dialogs to photos_content()
- Removed comments/interactions from photo edit page
2019-05-01 19:36:14 -04:00
Philipp Holzer
2ae4b9f7e9
Last refactoring :-) / refactor due feedback
2019-05-01 19:17:52 +02:00
Philipp Holzer
8581fbb40f
refactor caused by feedback
2019-05-01 18:25:07 +02:00
Philipp Holzer
90a38a00d8
Adding basepath, urlpath, hostname and ssl_policy to installation
2019-04-14 14:23:06 +02:00
Hypolite Petovan
608c80819c
Remove obsolete hack in file browser template
2019-04-13 19:05:14 -04:00
Michael
46a99a05a1
Remove the queue from the core
2019-04-05 18:04:39 +00:00
Hypolite Petovan
898f7e7e38
Add connector collapsible panel in permission
...
- Replace HTML string by structured array in jot_networks hook
- Add collapsed panel when there are more than two connectors
2019-03-24 22:40:50 -04:00
Philipp Holzer
fa31bb6dde
remove basepath and hostname from admin panel and add update path
2019-03-24 13:47:31 +01:00
Philipp Holzer
69fa6161e5
Refactor installer
2019-03-22 23:31:45 -04:00