eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
5,656 Commits 8 Branches 3 Tags 310 MiB
479a5e74a3
Commit Graph

356 Commits

Author SHA1 Message Date
Evan Prodromou
875e122a24 xmppdaemon.php uses commandline.inc 2009-06-22 17:07:14 -07:00
Evan Prodromou
ef3251634c xmppconfirmhandler.php uses commandline.inc 2009-06-22 17:04:49 -07:00
Evan Prodromou
0b638a233c maildaemon.php uses commandline.inc 2009-06-22 17:02:40 -07:00
Evan Prodromou
66316c0ce6 fixup_utf8.php uses commandline.inc 2009-06-22 17:00:53 -07:00
Evan Prodromou
15e86eb482 inbox_users.php uses commandline.inc 2009-06-22 16:57:28 -07:00
Evan Prodromou
06f976f1ac getvaliddaemons.php uses commandline.inc 2009-06-22 16:55:55 -07:00
Evan Prodromou
eced917d79 getpiddir.php uses commandline.inc 2009-06-22 16:54:21 -07:00
Evan Prodromou
5b5da5154d decache.php uses commandline.inc 2009-06-22 16:52:59 -07:00
Evan Prodromou
3fc2cfb7f8 fix have_options arguments 2009-06-22 16:48:04 -07:00
Evan Prodromou
010d168aaa correctly detect default short options 2009-06-22 16:44:29 -07:00
Evan Prodromou
de033bce88 uncache_users.php uses commandline.inc 2009-06-22 16:44:20 -07:00
Evan Prodromou
fa5e4f88c9 twitterstatusfetcher.php uses commandline.inc 2009-06-22 16:39:21 -07:00
Evan Prodromou
ac5f2e5444 twitterqueuehandler.php uses commandline.inc 2009-06-22 16:37:15 -07:00
Evan Prodromou
1691998de8 make id optional for enjitqueuehandler 2009-06-22 16:35:10 -07:00
Evan Prodromou
0582381c66 triminboxes.php uses commandline.inc 2009-06-22 16:34:56 -07:00
Evan Prodromou
1951246d67 synctwitterfriends.php uses commandline.inc 2009-06-22 16:31:13 -07:00
Evan Prodromou
8525165dc9 change smsqueuehandler to use commandline 2009-06-22 16:29:01 -07:00
Evan Prodromou
118ab60ced change sitemap.php to use commandline.inc 2009-06-22 16:26:18 -07:00
Evan Prodromou
7721839efd setpassword.php uses commandline.inc 2009-06-22 16:00:19 -07:00
Evan Prodromou
d6bd6bb441 add a function to show help 2009-06-22 16:00:05 -07:00
Evan Prodromou
f0e6e4b0ff reportsnapshot.php supports commandline 2009-06-22 15:55:05 -07:00
Evan Prodromou
07cb587cda publicqueuehandler uses commandline 2009-06-22 15:53:11 -07:00
Evan Prodromou
d14a5a3ec2 pingqueuehandler uses commandline 2009-06-22 15:51:14 -07:00
Evan Prodromou
3cbdc68454 better help for ombqueuehandler 2009-06-22 15:51:03 -07:00
Evan Prodromou
ef88758a37 ombqueuehandler uses commandline 2009-06-22 15:49:08 -07:00
Evan Prodromou
273d9e2def jabberqueuehandler uses commandline stuff 2009-06-22 15:47:29 -07:00
Evan Prodromou
032b65b83a make facebookqueuehandler use command-line functions and args 2009-06-22 15:43:39 -07:00
Evan Prodromou
6a40ba7764 make enjitqueuehandler use functions and args 2009-06-22 15:43:26 -07:00
Evan Prodromou
0b6f3870ad enjitqueuehandler uses functions to check options 2009-06-22 15:42:16 -07:00
Evan Prodromou
a81350f655 functions to check options 2009-06-22 15:41:52 -07:00
Evan Prodromou
c9ca46f7c1 make enjit queue handler take command-line arguments 2009-06-22 15:35:27 -07:00
Evan Prodromou
00bf031f0b change fixup_conversations to use commandline.inc 2009-06-22 15:29:43 -07:00
Evan Prodromou
9171f16b73 add commandline.inc for parsing 2009-06-22 15:29:24 -07:00
Evan Prodromou
0461aafeef Merge branch '0.8.x' into cmdline 2009-06-22 14:51:17 -07:00
Zach Copley
b021cb7288 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 
* '0.8.x' of git@gitorious.org:laconica/dev:
  fixing up conversations
 2009-06-22 14:14:33 -07:00
Evan Prodromou
15e4cbebab fixing up conversations 2009-06-22 13:14:15 -07:00
Zach Copley
9014a0a90d Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 
* '0.8.x' of git@gitorious.org:laconica/dev:
  Add like for search
  got rid of 'skin' concept a while ago
  add collecta.com link
  Update copyright dates in files modified in 2009
  change Controlez-Vous to Control Yourself
  ignore config.php.*
  Position of max_file_size position helps IE
 2009-06-21 22:30:39 -07:00
Evan Prodromou
aec6456c91 Update copyright dates in files modified in 2009 2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155 change Controlez-Vous to Control Yourself 2009-06-20 16:00:04 -07:00
Evan Prodromou
198afa0a1d change scripts to take server and path from commandline 2009-06-20 14:58:47 -07:00
Zach Copley
f5b24133cb Add twitterstatusfetcher to the list of daemons to stop 2009-06-19 14:40:32 -07:00
Evan Prodromou
45430d2b3b Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 23:25:27 -07:00
Zach Copley
cb0047b144 This time, twitterstatusfetcher really DOES update changed and missing avatars! 2009-06-18 19:21:17 -07:00
Zach Copley
e506f82cdf Better avatar handling - pull in any missing Twitter avatars 2009-06-18 16:51:06 -07:00
Evan Prodromou
79e732bd03 Merge branch '0.8.x' into twitterpriv 2009-06-17 23:56:42 -07:00
Evan Prodromou
85b4c24188 add dbhost argument for status network setup 2009-06-17 16:30:16 -07:00
Evan Prodromou
19d39b2029 Store better data about twitter statuses 
We mark Twitter statuses with flags so they don't get shown in the
wrong places.
 2009-06-17 12:31:35 -07:00
Evan Prodromou
177e4adf40 change mods for setup script 2009-06-15 15:13:49 -07:00
Evan Prodromou
01c03223c2 Script to set up new status networks 2009-06-15 15:13:24 -07:00
Evan Prodromou
e0bdaa787d Merge branch '0.7.x' into 0.8.x 2009-06-14 11:27:22 -07:00
Evan Prodromou
1c41afbd36 check results of add in maildaemon.php 2009-06-12 09:48:12 -07:00
Evan Prodromou
361a52a9c8 some changes based on code review with zach 2009-06-10 13:52:15 -07:00
Evan Prodromou
adfb79a9bb Merge branch '0.7.x' into 0.8.x 
Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
 2009-06-08 11:55:32 -07:00
Evan Prodromou
265e2bd58d remember to convert messages 2009-06-08 10:57:35 -07:00
Evan Prodromou
d15fdac3d3 add fixup messages for utf8 2009-06-06 09:54:40 -07:00
Evan Prodromou
f134ba68ab free memory for each iteration DB_DataObject in fixup_utf8 2009-05-30 21:04:35 -04:00
Evan Prodromou
da0d2a9745 make fixup_utf8.php handle profiles and groups too 2009-05-30 20:58:29 -04:00
Evan Prodromou
a262f83210 use mysqli_set_charset instead of set names 2009-05-30 12:20:42 -04:00
Evan Prodromou
7b1a72da30 take a max and min argument for fixup_utf8 2009-05-30 11:52:35 -04:00
Evan Prodromou
76ee1fd5da Removing inbox and memcached daemon handling 2009-05-30 04:40:47 -04:00
Sarven Capadisli
a456ceb47c Merge branch '0.7.x' into 0.8.x 2009-05-29 00:10:23 +00:00
Evan Prodromou
3532cd0490 Only enqueue inbox-dependent transports after inboxes have been filled 2009-05-28 18:19:22 -04:00
Evan Prodromou
daf845dbe6 take an argument for fixup_utf8 2009-05-28 16:36:07 -04:00
Evan Prodromou
497d1bfe02 Add fixup_utf8 to fixup problems with UTF-8 in a database 
Fixes up an old database to store strings in UTF-8. Hopefully works!
 2009-05-27 19:12:37 -04:00
Evan Prodromou
40d4668c7c move statsreport.php to reportsnapshot.php 2009-05-26 17:28:03 -04:00
Evan Prodromou
8591031c01 stats reporting from cron 2009-05-26 15:05:43 -04:00
Evan Prodromou
76aa85fe5e Merge branch '0.8.x' into stats 
Conflicts:
	README
 2009-05-25 22:47:23 -04:00
Zach Copley
1a5ef90ea0 Preserve order of imported Tweets 2009-05-20 22:08:08 +00:00
Sarven Capadisli
9a566c51cd Merge branch '0.7.x' into 0.8.x 2009-05-10 23:13:22 +00:00
Zach Copley
11e0db8c2c Twitter friends sync now does 25 users at a time and uses last_friendsync field to prioritize 2009-05-07 18:22:14 -07:00
Zach Copley
bc190595d1 Added TwitterStatusFetcher into daemon startup and shutdown subsystem 2009-05-07 02:07:31 -07:00
Zach Copley
856e05a08f Less pychotic debugging statements 2009-05-07 01:10:31 -07:00
Zach Copley
2621a5471f Better name 2009-05-07 00:26:42 -07:00
Zach Copley
48226e0c48 Properly daemonized 2-way Twitter bridge code 2009-05-07 00:25:15 -07:00
Zach Copley
b291cb8a1b Fix for previous bad patch I pushed (had conflict markers) 
Sorry about that.
 2009-05-06 01:26:06 +00:00
Zach Copley
99e8f3235f This finally works (provided the newer version of DB_DataObject that 
auto-reconnects to the DB).
 2009-05-06 01:12:26 +00:00
Zach Copley
7f417cfee0 More work on 2-way Twitter sync. Works better now with lastest version 
of DB_DataObject that automatically reconnects to the DB, but forked
processes still lose connections occassionally.
 2009-05-05 19:28:57 +00:00
Sarven Capadisli
d30df07908 Merge branch '0.7.x' into 0.8.x 
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
 2009-05-01 00:16:25 +00:00
CiaranG
5b78f95e97 Only start daemons that are required, according to the site config. There is the potential to not start some more - see the checks in getvaliddaemons.php 2009-04-28 13:30:54 +01:00
CiaranG
6a20ef71d3 Fixed typo in stopdaemons.sh - was not stopping the new memcached queue handler 2009-04-28 13:05:48 +01:00
Zach Copley
54795f2c41 Merge branch 'twitter-import' into 0.8.x 2009-04-24 14:29:56 -07:00
Zach Copley
6eb5a2566f Some clean up -- this still doesn't work, yet. The processes all lose 
their database connections, including the parent process.
 2009-04-24 14:27:31 -07:00
Evan Prodromou
1c0d82de3b 8-char limit on transports 2009-04-23 10:09:08 +00:00
Evan Prodromou
290ae7888c blow subs cache after updating inboxes 2009-04-23 10:08:51 +00:00
Evan Prodromou
a3e727823d some basic fixes for inbox and memcached queue handlers 2009-04-23 09:52:21 +00:00
Evan Prodromou
2053bdabef fix parse error in memcachedqueuehandler 2009-04-23 05:23:59 -04:00
Evan Prodromou
aee45ea91d Add an inbox queue handler 
Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.
 2009-04-23 05:08:48 -04:00
Evan Prodromou
640628de2d A queuehandler for blowing caches offline 
We add a queuehandler for blowing the memcached caches off-line. This
should speed up the processing of new notices.
 2009-04-23 05:03:19 -04:00
Zach Copley
5f82ce18f0 Script to import friends timelines from Twitter 2009-04-21 19:09:27 -07:00
Adrian Lang
558fa2743e Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion. 2009-04-20 12:15:12 +02:00
Tobias Diekershoff
7196410bb0 shortening links in notices from XMPP 
This patch enables shortening of links, that where send from XMPP.
The problem was, that in util.php common_current_user() is not
finding the user account from which is posted, so the service to
shorten is not known, so no shortening at all...

This patch cleans up the xmppdaemon a little bit and hard codes ur1.ca
as shortening service _if_ the user is not set. Ugly but working.
 2009-04-18 19:00:20 +02:00
CiaranG
bac3ee95c9 Abort the xmpp-related daemons immediately if xmpp is disabled in the config, otherwise they chew up *lots* of CPU doing nothing 2009-04-16 21:07:59 +01:00
Evan Prodromou
2772b0f7ce script to report stats from a cron job 2009-04-16 10:17:58 -07:00
Evan Prodromou
7ba3f8aeb3 script to trim very old notices from inboxes 2009-04-15 11:30:33 -04:00
Zach Copley
44006a35dd Better debugging output flag 2009-04-08 04:46:00 +00:00
Zach Copley
47d61ad211 Major improvements to Twitter bridge friend syncing 2009-04-07 18:29:10 -07:00
Zach Copley
61a08c91d5 Bumped version number for upcoming 0.7.3 release 2009-04-03 15:59:08 -07:00
Zach Copley
92f9ec1580 Merge branch '0.7.x' of git://gitorious.org/laconica/ksedgwic-clone into review/0.7.x 2009-04-03 15:53:50 -07:00
Evan Prodromou
e7c57b4307 ping handler returns proper boolean response 
The ping queue handler wasn't returning a true value -- filling up the
queue with ping requests. It now returns a true value.
 2009-03-19 09:21:50 -04:00
ken.sedgwick
00d3d70a7d Fixed version issues in laconica RPM spec file. 
Fixed missing avatar directory in RPM packaging.
 2009-03-13 16:50:58 -07:00
CiaranG
e6a3e6d451 Updated update_pot.sh to point to renamed file and generated new laconica.po with all the latest translatable text included 2009-03-11 16:37:03 +00:00
Sarven Capadisli
8d3d16f2f8 Updated URL patterns for identica Profiles for YahooSearchMonkey app. 
Added app to show custom identica notices.

Note that these files can be used as templates for other laconica
instances.
 2009-03-09 19:43:46 +00:00
CiaranG
1df3eeba86 Added the new pinghandler to the stopdaemons script and improved the behaviour and output of the script 2009-03-08 17:40:45 +00:00
CiaranG
a89d7ceab0 PostgreSQL - added equivalent of the MySQL-specific rebuilddb.sh script, for upgrading 2009-03-08 11:58:27 +00:00
Evan Prodromou
87e5badcb6 add ping daemon to daemons 2009-03-05 14:37:27 -08:00
Evan Prodromou
eaac9350dd Merge branch 'ping' of /var/www/mublog.corrupt into corrupt/ping 
Conflicts:

	lib/util.php
 2009-03-05 14:34:53 -08:00
Zach Copley
344f7194f0 Fixed wrong date on my msg in the laconica.spec changelog section 2009-03-04 17:03:01 -08:00
Zach Copley
8ba8eaa330 Bumped the version number in laconica.spec in prep for a 0.7.2. RPM 2009-03-04 16:55:33 -08:00
Zach Copley
762c56edc6 Merge branch '0.7.x' of git://gitorious.org/laconica/ksedgwic-clone into review/0.7.x 2009-03-04 16:37:35 -08:00
Sarven Capadisli
e239a5529a Yahoo! SearchMonkey applications: 
* Displays user profile information http://identi.ca
* Displays user's XFN on http://identi.ca
 2009-03-04 21:05:26 +00:00
ken.sedgwick
7fa6bb07d8 Added some missing php dependencies. 
Made the avatar directory apache owned.
 2009-02-28 20:13:37 -08:00
ken.sedgwick
3bf485ec95 Switched tarball ext ".bz2" -> ".gz" in spec file. 2009-02-28 17:35:36 -08:00
ken.sedgwick
83b084e4ce Added RPM spec file. 2009-02-28 17:33:20 -08:00
Zach Copley
1fdb35bbf1 New doc page for Identi.ca badge and minor updates to badge's js 2009-02-20 17:17:20 -08:00
Evan Prodromou
72b3c9108c Merge branch 'master' of git://gitorious.org/laconica/mainline into 0.7.x 2009-02-18 23:31:28 +00:00
Evan Prodromou
7bcfc9f643 another system message 2009-02-17 12:08:53 -05:00
Zach Copley
1af6423738 Whoops: forgot to include facebookqueuehandler.php with the my original 
Facebook queue handler patch set!
 2009-02-16 18:55:03 +00:00
Zach Copley
4b7ee5455f We have a FacebookQueueHandler now. The update_facebook.php cron 
script is totally deprecated.
 2009-02-13 05:42:00 +00:00
Zach Copley
f8e2ad0677 The fabled twitterqueuehandler 2009-02-12 14:39:21 -08:00
Zach Copley
37a1a6b9d8 Safer, better script for automatically updating Facebook statuses 2009-02-09 12:44:36 -05:00
Zach Copley
4b4ed63190 Safer, better script for automatically updating Facebook statuses 2009-02-07 18:16:34 -08:00
Evan Prodromou
343cd6f205 Move common_avatar_* functions to Avatar 
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
 2009-02-06 03:55:48 -05:00
Ciaran Gultnieks
c33258c40e Minor fix to allow update_facebook script to bootstrap correctly 2009-02-02 16:36:47 +00:00
Zach Copley
5008023206 Better logging for update_facebook script. 2009-01-27 14:23:37 -08:00
Evan Prodromou
01c9d5e240 Add a script for decaching an object 2009-01-25 19:28:25 +01:00
Evan Prodromou
32f81b3c0e Initial support for ping service 
It makes sense to use the weblogs.com ping service to alert people to
changes on the site. So, we do. Includes an extra ping queue handler.
 2009-01-24 18:38:12 +01:00
Evan Prodromou
a7c85bebd5 Merge branch 'master' of /var/www/mublog 
Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!
 2009-01-23 08:58:31 +01:00
Zach Copley
78bf361291 trac750 fix href for theme stylesheet 2009-01-23 07:09:00 +00:00
Zach Copley
8dad87ea95 trac750 FB script to update statuses working again with new uiredesign stuff 2009-01-23 04:23:44 +00:00
root
2f6152f2f3 A script to uncache a bunch of users, in case you made changes 2009-01-20 03:07:10 +00:00
root
b28e11a7e3 Some production requirements for making inbox_users.php work 2009-01-20 03:06:34 +00:00
Evan Prodromou
d1cbd75636 Change inboxes to have 1000 items rather than last full month 2009-01-19 21:37:31 -05:00
Zach Copley
739baf0396 trac750 Add notice input box to FB app and ability to post notices 2009-01-19 07:24:12 +00:00
Zach Copley
125f05563b trac750 Add prefix string option in Facebook app for notice sync 2009-01-12 05:25:07 +00:00
Ori Avtalion
ee8dab3f40 Updated file id's of language files 2009-01-11 08:36:06 -05:00
Zach Copley
a373e6f500 trac750 Automatically update Identi.ca profile box with user's latest dent 2009-01-11 08:33:28 +00:00
Evan Prodromou
1ef42babb5 Make some scripts executable 2009-01-08 16:19:22 -05:00
Evan Prodromou
aa4fb6b71e trim the body of an incoming message 
darcs-hash:20081214002239-84dde-9d4d15f37b48ed1830c0423e7e34cb11c7cf9c2d.gz
 2008-12-13 19:22:39 -05:00
Evan Prodromou
3c5f1a5b88 xmppdaemon uses 'xml' rather than 'raw' accessor 
darcs-hash:20081211183250-5ed1f-73f542de534be2931508841a2c85162e2fe15160.gz
 2008-12-11 13:32:50 -05:00
Zach Copley
53cabc0171 trac750 added some output to the facebook_update.php script 
darcs-hash:20090105045603-7b5ce-2cef1b92d9c91b0db70269d94f42ae06076229b2.gz
 2009-01-04 23:56:03 -05:00
Zach Copley
e0fbf02bbf trac750 configurable sync flags for Facebook app (noticesync, replysync) 
darcs-hash:20090105040212-7b5ce-37f6195649dc673241e4566a93183b13e428d98f.gz
 2009-01-04 23:02:12 -05:00
Zach Copley
fd6f9b9d76 trac750 Automatically update linked Facebook users' statuses 
darcs-hash:20090105010407-7b5ce-559da13720b18e3c570e730326f5e5ef2b2dc1ab.gz
 2009-01-04 20:04:07 -05:00
Evan Prodromou
b264c03d32 move opening brace of class declaration to next line 
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
 2008-12-23 14:49:23 -05:00
Evan Prodromou
7ad2f2a371 TRUE 
More PEAR coding standards global changes. Here, I've changed all
instances of TRUE to true and FALSE to false.

darcs-hash:20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz
 2008-12-23 14:44:28 -05:00
Evan Prodromou
04ef1ba8ee change function headers to K&R style 
Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).

darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
 2008-12-23 14:33:23 -05:00
Evan Prodromou
eb2f9c98ac replace NULL with null 
Another global search-and-replace update. Here, I've replaced the PHP
keyword 'NULL' with its lowercase version. This is another PEAR code
standards change.

darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz
 2008-12-23 14:21:29 -05:00
Evan Prodromou
edbc0c665c replace all tabs with four spaces 
The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
 2008-12-23 14:19:07 -05:00
millette
ce08833303 shorten urls for posts > 140 chars only, from anywhere. Only show long urls in title attributes for links we shortened ourselves. 
darcs-hash:20081128210114-099f7-4e4cde0a983c2ac6d41efb59b46cb7dbf45dc7a6.gz
 2008-11-28 16:01:14 -05:00
Evan Prodromou
1c0a19b457 lets an admin set the password for a user 
A small utility script for updating users' passwords. Since I have to
do this once in a while, I figured it was good to have a script for.
Will also (I think) update memcached.

darcs-hash:20081207192917-84dde-6a24da9dae18bb003944d9044eaa2631bde07902.gz
 2008-12-07 14:29:17 -05:00
Evan Prodromou
0a4905035a new auto-reply regexp (thanks @lilyhill!) 
darcs-hash:20081204174754-5ed1f-dcce210332c55a544c35d535c3f3008aa8c165d3.gz
 2008-12-04 12:47:54 -05:00