Commit graph

2756 commits

Author SHA1 Message Date
nobody
d2e4fd4151 updates 2021-07-26 15:41:19 -07:00
nobody
6e4d7c3f7d Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-26 15:27:43 -07:00
nobody
90d16e7884 Merge branch 'dev' of ../p3 into dev 2021-07-25 17:21:25 -07:00
nobody
3a03e6285c some preliminary work on threaded comments refactor, bring back poke app. 2021-07-25 17:20:10 -07:00
nobody
4b8de363f2 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-24 14:58:32 -07:00
nobody
8c422bf2c9 provide separate network timeout settings for get and post. We can allow a bit more time for posting as this is nearly always done in the background, and a lot of sites seem to be running on under-powered hardware these days and are failing to respond within 60 seconds and are therefore effectively dead when it comes to pushing stuff. 2021-07-24 14:48:51 -07:00
nobody
955ae420b4 codecomments 2021-07-22 03:58:54 -07:00
nobody
1dcea2925a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-21 18:11:25 -07:00
nobody
a582e6e9d8 directory issue when choosing collections and no collections exist. This always returns the first directory entry with no xchan_name and makes the directory unusable afterward; so ensure there is a search string before redirecting to chanview 2021-07-20 15:56:12 -07:00
nobody
b04484ca5f Merge branch 'dev' of ../p3 into dev 2021-07-20 02:31:10 -07:00
nobody
34adec27a6 redirect editpost to mod_photos correctly and open the form if photo 2021-07-20 02:29:52 -07:00
nobody
eab05b4c90 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-19 14:22:29 -07:00
nobody
11050854ec Merge branch 'dev' of ../p3 into dev 2021-07-19 14:21:48 -07:00
nobody
8f3ae4e600 mod_photos: upgrade likes 2021-07-19 14:20:27 -07:00
nobody
3baade2087 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-18 16:20:42 -07:00
nobody
b55801ff15 Merge branch 'dev' of ../p3 into dev 2021-07-18 16:06:13 -07:00
nobody
de7092f826 rework mod_like cont. - should be good for everything but photos at the moment 2021-07-18 16:01:59 -07:00
nobody
4666a150ae fixes 2021-07-18 14:17:42 -07:00
nobody
d7f34c2b4f like refactor 2021-07-17 04:28:12 -07:00
nobody
243305a8c5 remove deprecated module admin/features 2021-07-16 16:12:02 -07:00
nobody
83ddfb0dd3 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-13 22:36:01 -07:00
nobody
f6fb939478 fix edge cases in our implementation of Mastodon's undocumented remote comment over OStatus follow. 2021-07-13 18:09:30 -07:00
nobody
4c6c2c920d Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-12 23:52:52 -07:00
nobody
c333a4c5f2 bring back 'post_mail' permission, but remove PERMS_NETWORK as an option as it is ambiguous in Zap and derivatives 2021-07-12 17:24:49 -07:00
nobody
21290566a0 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-12 01:56:53 -07:00
nobody
4461aa4404 chanview: don't fetch any additional profile info if we're going to redirect. 2021-07-12 01:54:36 -07:00
nobody
63d9629163 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 23:18:37 -07:00
nobody
06ad713d0c addd followers/following counts to chanview 2021-07-11 23:17:40 -07:00
nobody
879af8a750 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 22:37:54 -07:00
nobody
f7790c7b75 incorrect xprof column name 2021-07-11 19:43:48 -07:00
nobody
83fe677e9e typos 2021-07-11 15:32:09 -07:00
nobody
28ad858121 chanview ui improvements 2021-07-11 14:41:51 -07:00
nobody
4d8ea8f02e chanview ui updates 2021-07-11 14:05:22 -07:00
nobody
d0dd93b184 subdue video search header 2021-07-11 01:26:00 -07:00
nobody
ac180a832a Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-11 00:19:22 -07:00
nobody
605d0435e5 change text on public stream notification setting, push new strings 2021-07-10 21:18:57 -07:00
nobody
d1c158eed2 Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-10 20:03:42 -07:00
nobody
ed2246c7bd more consolidation of stream and channel notification resets - as stream is a superset of channel 2021-07-09 17:10:41 -07:00
nobody
3baa2ef430 clear home notifications when clearing stream notifications, but not the other way around. 2021-07-09 17:06:23 -07:00
nobody
e6f302229e Merge branch 'dev' of /home/macgirvin/z into dev 2021-07-02 01:06:11 -07:00
nobody
44f9e8c683 cleanup 2021-07-02 01:03:31 -07:00
nobody
45b22d9018 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-26 18:45:41 -07:00
nobody
7afd23edc7 cleanup mod_setup, change variable named $item_id to $item_uuid to avoid confusion 2021-06-26 14:25:55 -07:00
nobody
38e012179a rework setup and include wording fix from zap pull #30 which could not be merged due to conflicts. 2021-06-25 15:40:15 -07:00
nobody
7f1e3d4923 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-25 02:50:03 -07:00
nobody
4fb318a92e let people know they shouldn't block shares from groups because that kinda' keeps the group from working correctly. 2021-06-24 00:16:17 -07:00
nobody
38e5b8d107 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-23 21:30:30 -07:00
nobody
73a6e614a8 syntax 2021-06-23 16:48:19 -07:00
nobody
91f32b11ca mastogroups - support moderation 2021-06-23 00:19:51 -07:00
nobody
a3c866768b Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-22 14:26:06 -07:00
Andrzej Budziński
b7d079651d Fixes:
1) fixed bug in Zotlabs/Module/Setup.php#788
2) generated new util/messages.po file
3) fixes to Polish translation
2021-06-22 21:41:57 +02:00
nobody
a84c1cd7ab Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-21 23:34:18 -07:00
zot
f7ca1d1709 Merge pull request 'A few fixes' (#28) from astabski/zap:ab-dev into dev
Reviewed-on: https://codeberg.org/zot/zap/pulls/28
2021-06-22 07:41:25 +02:00
nobody
fa95483172 remove debugging 2021-06-21 22:13:23 -07:00
nobody
129ab00406 port photo edit changes to roadhouse 2021-06-21 22:10:44 -07:00
nobody
0a34b71a46 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-21 22:08:01 -07:00
nobody
cabed0682c improved photo editing and alt text support 2021-06-21 22:03:11 -07:00
Andrzej Budziński
d6f230587d Fixes:
1) fixed bugs in Zotlabs/Modules/Setup.php#202 #207
2) generated new util/messages.po
3) translated new translation strings for the Polish translation
2021-06-21 16:46:17 +02:00
Andrzej Budziński
8dba3bf257 A few fixes:
1) fixed synatx bug in Zotlabs/Module/Setup.php#788
2) generated new util/messages.po
3) a few fixes to Polish translation
2021-06-21 15:28:28 +02:00
nobody
41f1159adc Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-21 00:38:33 -07:00
nobody
f78ef46a51 turn off E_WARNING during setup. 2021-06-20 22:21:29 -07:00
nobody
377905023a more warnings. 2021-06-20 22:13:29 -07:00
nobody
e0b5393817 Merge branch 'dev' of ../p3 into dev 2021-06-18 22:13:56 -07:00
nobody
5dde6a54c1 groups work from roadhouse 2021-06-18 22:12:23 -07:00
nobody
5ea7105272 ongoing: fix a few more php 8.x warnings 2021-06-18 16:54:08 -07:00
nobody
35ea8d7d7e finish removal of deprecated server_role and sitelist 2021-06-17 14:54:15 -07:00
nobody
613ea96687 move developer docs to their own directory. This provides a hopefully obvious example of adding documentation directories with translations. 2021-06-16 00:26:05 -07:00
nobody
7689676e7d Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-12 14:59:51 -07:00
nobody
441261e2d8 updates 2021-06-12 14:57:46 -07:00
nobody
1a2d4288d4 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-11 16:09:31 -07:00
nobody
c22877385c mastodon group issue 2021-06-10 22:10:53 -07:00
nobody
2aa8fab213 Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-05 14:56:30 -07:00
nobody
1682ec2b8e cleanup 2021-06-03 22:02:38 -07:00
nobody
b384c44f34 cleanup some loose ends w/r/t activitypub addressing and confederation of activitypub signatures over nomad for use by third-parties on activitypub. 2021-06-03 21:57:08 -07:00
nobody
661e34be81 misty issue 4 - admin option exists to enable invite_only mode, but the invite app was deprecated until it could be fixed. So remove the admin option until the app is reinstated. 2021-06-02 02:00:44 -07:00
nobody
462253d4aa Merge branch 'dev' of /home/macgirvin/z into dev 2021-06-01 15:55:58 -07:00
nobody
014a8c167e only provide the copy_of_pubitem notice when it was actually copied 2021-06-01 15:31:56 -07:00
nobody
c3393df3ce notification and siteinfo cleanup 2021-05-31 14:32:02 -07:00
nobody
0e30c992d1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-28 00:08:16 -07:00
nobody
6db3ed986d provide friendly status message when posting comments to the public stream, bring back duplicate suppression 2021-05-27 23:36:31 -07:00
nobody
da7296bbda Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-27 17:35:59 -07:00
nobody
adc69d8393 notification regression 2021-05-27 17:34:28 -07:00
nobody
6e9f33f27b Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-27 16:33:46 -07:00
nobody
1fbc54fae6 regression 2021-05-27 16:31:31 -07:00
nobody
b5f57ad9db Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-27 04:10:08 -07:00
nobody
da6d8d8179 notification usability work 2021-05-27 04:04:16 -07:00
nobody
0a28510df6 move block_public_dir to security settings with the other block_public stuff 2021-05-26 16:56:54 -07:00
nobody
177967e7ef Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-20 19:34:32 -07:00
nobody
7f4e6c2b64 undo experimental order change (undesirable interaction with loadtime variable) 2021-05-20 19:31:31 -07:00
nobody
f529c7dc4b Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-20 18:54:27 -07:00
nobody
82eabd114b per module loadtime 2021-05-20 18:47:10 -07:00
nobody
66b76f0ed6 Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-20 18:22:09 -07:00
nobody
969ce1972f stream: order by changed (experimental) 2021-05-20 18:17:28 -07:00
nobody
b5547eadbd various bugfixes 2021-05-20 18:01:42 -07:00
nobody
ae6aa577e4 Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-19 15:51:45 -07:00
nobody
12d9796e8a use 'Ignore' for unfollowing threads instead of 'Unfollow' which isn't specified in the ActivityStreams vocabulary. This is low impact since these activities do not federate. Updates to previously unfollowed threads may show up after this change and may require unfollowing again since existing activities were not modified. 2021-05-17 14:14:57 -07:00
nobody
46260ac1cc Merge branch 'dev' of /home/macgirvin/z into dev 2021-05-02 16:43:33 -07:00
nobody
631904f145 Zot/10 = 'Nomad' 2021-05-02 16:41:18 -07:00
nobody
3aa90a042e more smithereen group quirks 2021-04-29 21:24:30 -07:00
nobody
7f7f6f7c20 incorrect activity type returned in Accept Activity if somebody chooses to Join a group rather than Follow the group 2021-04-29 17:12:51 -07:00
nobody
d1eb8cc41a more work on writeable collections 2021-04-28 23:42:39 -07:00
nobody
489a94749f Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-27 17:19:38 -07:00
nobody
42943ab824 more work on copy_of_pubitem issues 2021-04-27 17:18:18 -07:00
nobody
20a6b731d9 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-26 18:10:23 -07:00
nobody
890ceea3ee remove experimental setting on replyTo, limit incoming message size (regression), fix variable re-use in storage/basicauth, and add attachments for all attached photos/files. 2021-04-22 14:41:26 -07:00
nobody
ede4dfd3ae Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-20 20:22:37 -07:00
nobody
9c72688c56 only return cache entry if it has contents 2021-04-20 19:33:06 -07:00
nobody
a18d0457e8 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-19 18:04:55 -07:00
nobody
e22220a61c incorrect variable 2021-04-19 18:00:02 -07:00
nobody
aec0003de8 use personal setting (if available) for number of threads to fetch on pubstream page 2021-04-19 17:29:12 -07:00
nobody
ed1139fdd2 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-19 15:56:31 -07:00
nobody
23a21fc63f Don't fetch replyTo by default. It's wasteful. Just store the value. 2021-04-19 15:51:15 -07:00
nobody
c3616bcc0f Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-18 13:19:26 -07:00
nobody
1f2981418e move 'replyto' from initial concept to experimental stage 2021-04-17 16:34:36 -07:00
nobody
6e822afcb5 Merge branch 'dev' of ../p3 into dev 2021-04-16 18:43:56 -07:00
nobody
29fcd158cb implement conversation endpoint 2021-04-16 18:43:14 -07:00
nobody
e9a0a682c4 only one entry showing on notifications page 2021-04-16 04:34:35 -07:00
nobody
a59b6399fa Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-14 21:38:16 -07:00
nobody
c1f99901f8 check sites module for blocked stuff 2021-04-14 19:19:06 -07:00
nobody
41927d89d6 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-14 17:41:53 -07:00
nobody
5828a844b6 Add site restriction checking to returned directory entries. Previously we only checked personal blocklists. Also some performance improvements on directory filtering. 2021-04-14 17:18:23 -07:00
nobody
6e484c73c9 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-13 21:13:33 -07:00
nobody
a110783fe9 comment control issues 2021-04-13 21:07:24 -07:00
nobody
0985428607 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-13 20:18:00 -07:00
nobody
7b6e1acbde unbalanced parens 2021-04-13 20:17:06 -07:00
nobody
982d3b5e5b Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-13 20:12:50 -07:00
nobody
bd298f4165 "active" setting for directory searches 2021-04-13 20:11:33 -07:00
nobody
b4d755f8ab provide "updated only" setting on directory searches which limits to entries that have been updated in < 60 days 2021-04-13 19:03:27 -07:00
nobody
112a3463c1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-13 18:46:54 -07:00
nobody
df781212d4 propagate item comment settings to local children. This serves no practical purpose other than data consistency since we only check comment permissions against the parent item. 2021-04-13 18:35:07 -07:00
nobody
32d03a825d onepoll: improvements in fetching outbox content 2021-04-12 22:37:08 -07:00
nobody
0f62a46844 cleanup 2021-04-12 20:49:58 -07:00
nobody
f3079addde Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-12 18:39:27 -07:00
nobody
1a4a46db6d summon requires array 2021-04-12 18:32:44 -07:00
nobody
36d5aec5f4 debugging queued collection fetches 2021-04-12 18:19:27 -07:00
nobody
3fca2da820 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-11 19:35:26 -07:00
nobody
5fa03c416c not enough levels of array 2021-04-11 19:20:28 -07:00
nobody
31c46fdb13 prevent looping on the sync packet 2021-04-11 19:13:36 -07:00
nobody
64ed1be4e1 cleanup after tests 2021-04-11 18:13:41 -07:00
nobody
d21f3ef61f abook uses 'entry_deleted' instead of just 'deleted' to detect deletions in sync packets 2021-04-10 20:36:03 -07:00
nobody
fa57e701d2 edge cases syncing atokens 2021-04-10 20:15:55 -07:00
nobody
d9d4a47dbb clone atokens and their associated structures 2021-04-10 18:41:35 -07:00
nobody
06d70288ef porting access tokens and making them generally more useful by adding them to connections 2021-04-10 15:32:14 -07:00
nobody
7aee418044 some oauth work necessary for AP C2S. This appears to be heading down the path of favouritism towards oauth2 and deprecating openid connect. In theory we should be able to support both, but the underlying library isn't quite as flexible as hoped and appears to favour one or the other without involving multiple installations. 2021-04-10 00:51:12 -07:00
nobody
456ea265bc provide option to block/ignore reshared content from any individual connection 2021-04-07 23:22:10 -07:00
nobody
89d2c293e7 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-07 19:13:13 -07:00
nobody
38c2f8666b allow setting the UA string for fetches 2021-04-07 19:11:55 -07:00
nobody
486197c88e Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-07 18:03:38 -07:00
nobody
64f3490839 comments 2021-04-06 21:03:47 -07:00
nobody
965430bd70 very slow progress on AP C2S API 2021-04-06 20:33:27 -07:00
nobody
ee99f8f27f issue commenting from search/display if you're the site admin 2021-04-06 19:49:44 -07:00
nobody
b48a70641e refactor the content search algorithm slightly to return public results if there are no results owned by the logged in channel. 2021-04-06 17:05:00 -07:00
nobody
9c4c7524a9 revision 2021-04-05 19:23:04 -07:00
nobody
49849ec811 Merge branch 'dev' of ../p3 into dev 2021-04-05 19:22:02 -07:00
nobody
038b1cbe06 fetch collections 2021-04-05 19:21:28 -07:00
nobody
598d6cbc00 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-05 18:04:08 -07:00
nobody
5edf428930 don't show draft threads in the drafts display if your draft comment was deleted but not yet wiped from disk. 2021-04-05 18:02:19 -07:00
nobody
6338fe995b Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-05 17:58:30 -07:00
nobody
f4b131a00a issue displaying draft comments on stream page 2021-04-05 17:57:39 -07:00
nobody
3a73d2ffbf allow collections in navbar ActivityStreams search, but restrict number of items imported to 10 in order to avoid memory exhaustion. There is a plan to provide an extension to the import module in the future to import complete or at least much larger collections; which may require disabling automatic conversation completion or running as a background task. 2021-04-04 20:18:28 -07:00
nobody
886c7337df Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-01 17:04:24 -07:00
nobody
26eb01dc39 Merge branch 'dev' of ../p3 into dev 2021-04-01 15:23:12 -07:00
nobody
d24b9a9544 disable file activities until a few more things are fixed. 2021-04-01 15:21:19 -07:00
nobody
bbc466c7a8 Merge branch 'dev' of /home/macgirvin/z into dev 2021-04-01 14:47:39 -07:00
nobody
eb8db87fe6 issue with siteinfo 2021-04-01 14:46:50 -07:00
nobody
a125379844 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-31 18:30:58 -07:00
nobody
34d7b074ae more work on AP fetchable photo albums 2021-03-31 18:25:14 -07:00
nobody
dcba7dc613 initial work on supporting activitypub fetchable photo albums (and eventually file collections) 2021-03-31 17:22:47 -07:00
nobody
8dcdba5f40 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-29 19:28:36 -07:00
nobody
2e372e5901 activitypub "public" detection improvements, per the spec section 5.6 2021-03-29 18:47:39 -07:00
nobody
85fd544334 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-28 12:16:14 -07:00
nobody
55a5e03c9b allow acl changes on drafts 2021-03-28 12:14:47 -07:00
nobody
94fa0cb111 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-27 14:54:38 -07:00
nobody
82ffc326fb wrong variable name 2021-03-27 14:53:17 -07:00
nobody
153ccca230 wip: dm links, possibly requires significant refactor of the acl_selector before all is said and done 2021-03-25 20:29:42 -07:00
nobody
866182aaaa Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-23 20:52:01 -07:00
nobody
ce67fdb790 issue syncing photos of non-zero imgscale 2021-03-23 20:50:41 -07:00
nobody
5e4d7d15a1 Merge branch 'dev' of /home/macgirvin/z into dev 2021-03-21 22:01:51 -07:00
nobody
e38fb2de29 use multicode by default 2021-03-21 21:56:18 -07:00
nobody
47246212f4 don't search mastodon urls as actors if AP fetch failed. Change to wording of expire setting. 2021-03-21 17:44:24 -07:00
nobody
1ba4e50bc7 more nomadic content 2021-03-18 18:53:29 -07:00
nobody
e9584aff10 remove accounts that do not complete email verification in 3 days 2021-03-17 18:30:37 -07:00
nobody
e74c0e2f90 cleanup 2021-03-16 20:06:35 -07:00
nobody
0b08169eb2 initial exploration into the next generation of access tokens. First make the old system work again. 2021-03-16 18:59:56 -07:00
nobody
6589475b26 Merge branch 'dev' of ../p3 into dev 2021-03-14 22:12:39 -07:00
nobody
d69589e17e scripted replace of 'array()' with '[]' 2021-03-14 22:10:44 -07:00
nobody
730c386cd8 search actor url from navbar 2021-03-14 16:41:45 -07:00
nobody
7b9d245841 search actor urls 2021-03-14 16:04:13 -07:00
nobody
b431f938b8 whitespace 2021-03-13 23:14:32 -08:00
nobody
c1282570df catch two more places where follow|unfollow->note could leak. 2021-03-13 15:40:35 -08:00
nobody
e85dcd6f11 Merge branch 'dev' of ../p3 into dev 2021-03-12 14:27:31 -08:00
nobody
073db32fe1 minor tweaks (php8 cont.) 2021-03-12 14:26:56 -08:00
nobody
9088d135b6 improve connedit: refresh photo on ap 2021-03-12 12:37:11 -08:00
nobody
2f3a618eb5 bugfixes after php8 fixes 2021-03-11 20:36:42 -08:00
nobody
2b289594db php8 cont. 2021-03-11 20:00:59 -08:00
nobody
988f223ca3 yet more php8 2021-03-11 17:09:22 -08:00
nobody
3b67277ff8 even more php8 stuff 2021-03-11 16:03:45 -08:00
nobody
157aca4c3b php8 cont. 2021-03-10 21:31:13 -08:00
nobody
2415b55567 php8 cont. 2021-03-10 19:46:10 -08:00
nobody
f1a1aafbcb more php8 2021-03-10 19:30:25 -08:00