Michael Vogel
cecbc58729
Mass-subscribing to OStatus contacts is enabled again
2015-09-05 10:32:10 +02:00
Michael Vogel
3cccb5ecb1
The repair option is added to the settings
2015-09-05 04:54:48 +02:00
Michael Vogel
86f2eb005f
There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now.
2015-08-26 22:46:59 +02:00
Michael Vogel
b0ddde22c0
By entering a GNU Social account name, the friends of this contact will be added to the friendica account
2015-08-23 22:21:15 +02:00
86f6532c61
adding the subdir
2015-08-17 08:20:19 +02:00
03e81b06d5
we dont need the or anymore
2015-08-17 07:24:48 +02:00
621dec1606
reconstruct the description for more flexible translations
2015-08-17 07:20:50 +02:00
eea258f74c
add the profile url to the settings pages as alternative to the webfinger. See issue 1621
2015-08-16 22:39:08 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
Michael Vogel
5f89cb0923
The autofollow option is moved from the addons to the core.
2015-07-12 21:37:49 +02:00
rabuzarus
cf2a90dfa2
system settings is now a variable in settings_display.tpl
2015-06-30 14:51:14 +02:00
rabuzarus
8cca849c2e
Merge acl-var into develop
...
Conflicts:
mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
5ce125d6e0
cleanup of some unused code
2015-06-26 15:13:52 +02:00
Fabrixxm
4036ad2554
Fix desktop notification
...
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Michael Vogel
472a6f1380
Added explanation for shortening.
2015-05-15 21:09:00 +02:00
Michael Vogel
d995fc3994
The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled.
2015-05-15 20:56:05 +02:00
8367cadeef
dont normalise OpenID URLs and fallback to https if no protocol is specified
2015-04-14 12:27:36 +02:00
106b0b5d23
Merge pull request #1460 from FlxAlbroscheit/develop
...
Issue 1163: Feature allowing desktop-notifications
2015-04-05 11:37:05 +02:00
fabrixxm
0226258e7b
Block settings page for unauthorized users
...
fixes issue #1459
2015-03-31 10:24:23 +02:00
FlxAlbroscheit
001e940c6c
Feature for desktop-notifications
...
see issue #1163
2015-03-31 02:06:07 +02:00
eaaed02ffd
use type email in users settings as well
2015-01-24 09:40:01 +01:00
fabrixxm
816d3f86e7
reword checkbox help text
2015-01-20 22:17:03 +01:00
fabrixxm
b2527039b7
add text-only email option
...
add a checkbok to notification settings. if checked, html body is not added to email.
2015-01-20 19:19:58 +01:00
Michael Vogel
086b3e30c6
Clarification for the hidewall property.
2014-12-12 23:03:23 +01:00
Fabrixxm
fbe664cc44
fix settings page aside menu active item
...
add aside menu to delegate page
2014-09-17 11:00:34 +02:00
Michael Vogel
1a865bf400
New description for the option to reload the page only when on top.
2014-08-01 20:11:56 +02:00
Michael Vogel
ed1dce93d6
Usage of /display/(guid) as path instead of /display/(user)/(id)
...
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Michael Vogel
c980e6d20d
Possibility to disable the automatic reload of the network page
2014-07-09 21:32:32 +02:00
Michael Vogel
2db1029830
APC support is removed due to problems with PHP 5.5.
2014-05-03 12:02:25 +02:00
Michael Vogel
2846dfeb05
Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.
2014-04-26 02:22:30 +02:00
Michael Vogel
30efb0c1e6
menu entry for "Delegations" moved to the settings.
2014-04-24 10:16:02 +02:00
Michael Vogel
5f3d584716
Code beautification and some more logging data - no changes in the functionality.
2014-04-04 11:02:36 +02:00
Michael Vogel
6e7bd68ebb
More "LIMIT 1" removed - and some other SQL improvements.
2014-03-11 23:52:32 +01:00
Michael Vogel
70e017745a
Just some code beautification.
2013-12-02 00:41:59 +01:00
Michael Vogel
e0cf2c5167
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/admin.php
mod/settings.php
2013-12-02 00:33:46 +01:00
Michael Vogel
6684107b66
multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma.
2013-12-02 00:11:31 +01:00
9144dd3780
rename some fields to fix issue #775
2013-11-17 16:45:24 +01:00
4101127c01
better worting of the SUBMIT button in the settings tab and the admin panel
2013-11-17 15:22:11 +01:00
Fabrixxm
0414e0a316
More "relocate":
...
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
2013-11-13 06:07:49 -05:00
Michael Vogel
693b6d0fd4
Infinite scroll: At the end of the network page new content is loaded automatically
2013-10-15 00:43:11 +02:00
Michael Vogel
ab7d8bc6ab
Delete all APC values before showing them in the settings and admin section
2013-09-27 23:02:59 +02:00
friendica
115c8a53bf
issue546 via Tobias
2013-04-23 18:58:52 -07:00
b6d1a1f125
tabwidth
2013-04-14 18:19:01 +02:00
4dd406055c
check password when changing users email
2013-04-14 17:58:16 +02:00
5827db0ea3
check current password before changing the password
2013-04-14 17:22:42 +02:00
friendica
9660117c70
sync username when changed in either the default profile or the settings page
2013-04-04 15:10:14 -07:00
Michael Vogel
86e19dda22
Vier: Some more changes to the theme.
...
Added a switch to suppress displaying of the tags.
2013-03-05 00:46:11 +01:00
Zach Prezkuta
488a38cd85
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
Zach Prezkuta
11c06e21b7
simplify by making Smarty include directives behave like Friendica native ones
2012-12-25 11:55:57 -07:00
Zach Prezkuta
96ed0a7791
Implement Smarty3
2012-12-22 12:57:29 -07:00
Michael Vogel
9ab34f8857
mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header.
2012-12-18 00:47:55 +01:00
Zach Prezkuta
94204d9160
implement features
2012-11-22 09:14:22 -07:00
Zach Prezkuta
f4f3c8375f
send less messages to server; remove delete option
2012-09-29 17:50:34 -06:00
Zach Prezkuta
63d02d98c5
add settings sections and add contacts; other tweaks and fixes
2012-09-07 12:17:03 -06:00
Zach Prezkuta
77529ccdf1
allow individual choice of mobile themes
2012-09-06 17:24:34 -06:00
Zach Prezkuta
c681e69794
limit number of items on profile page too; add show more back to Frost mobile; some show more fixes
2012-08-26 15:21:26 -06:00
Zach Prezkuta
1f09e7ad23
Modify Javascript to improve page loading times
...
1. Add template category 'end' that places content right before final </body> tag
2. Move most Javascript from tpl files into one cacheable file, theme.js
3. Load scripts at end of the HTML document instead of in the header
4. Minify several Javascript files
Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
friendica
a54278649f
poke notifications
2012-07-19 20:13:40 -07:00
friendica
b02c733967
service class restrict the email connector
2012-06-26 18:30:20 -07:00
friendica
1180919c89
some zero theming on settings page
2012-05-30 16:30:51 -07:00
friendica
bdcb8d27dd
transition to beta for private forums
2012-05-30 15:52:17 -07:00
friendica
52995e0b1f
private group fix
2012-05-29 18:14:21 -07:00
friendica
2eafa9a475
ability to only expire contacts, not self
2012-05-29 01:14:53 -07:00
friendica
2dc7e53435
more theme cleanup
2012-05-28 19:17:06 -07:00
friendica
2bd1004587
rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by.
2012-05-27 21:01:58 -07:00
friendica
34b79b4f2b
theming for default group selector
2012-05-18 01:38:11 -07:00
friendica
1d157fc747
make it difficult to setup a private forum with no privacy
2012-05-17 23:05:41 -07:00
friendica
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
friendica
3c0cf72716
make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
...
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
tommy tomson
77a0570162
add link "remove account" to /mod/settings.php
2012-04-26 17:21:27 +02:00
friendica
00cb7f9efb
don't allow non-existent themes as choices
2012-04-22 16:24:29 -07:00
friendica
972c01edb3
profile change activities
2012-04-12 21:10:32 -07:00
friendica
32cd62ff0a
allow setting default new friend notify
2012-04-12 18:15:46 -07:00
Fabio Comuni
18ecac4e93
settings: remove call to profile_load()
2012-04-12 08:42:00 +02:00
Fabio Comuni
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
friendica
8e928d101b
display settings hooks
2012-04-03 22:01:52 -07:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
friendica
b4b1055b50
settings for unknown private mail acceptance
2012-03-31 00:57:59 -07:00
Fabio Comuni
054d21a2e8
settings: add "display settings" tab, with UI-related settings.
...
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
friendica
4fe0b56d76
bug #349 - email notls setting
2012-03-28 14:54:00 -07:00
Fabio Comuni
82cc86a41a
user settings: don't show emoticons
2012-03-23 12:07:22 +01:00
friendica
139a86dbd3
some openid fixes, use identity url from openid server and normalise it.
2012-03-19 06:48:11 -07:00
friendica
82f2bfea5b
convert boolean or int settings to strings to work around issues with template processing
2012-03-16 16:05:16 -07:00
friendica
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
friendica
7e270b043c
addon settings form error
2012-03-13 23:52:13 -07:00
Tobias Hößl
59766b944c
Some security against XSRF-attacks
2012-03-12 20:17:37 +00:00
Michael Johnston
fd1f8fb436
allow user to set number of items to show on network page
2012-03-09 21:29:39 -05:00
friendica
53412dacd4
update globaldir when page-type changes, add spam date field
2012-02-27 23:27:16 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
friendica
44c23cda8e
theme shakeup commences - themes are now administered in admin panel.
2012-02-23 20:29:09 -08:00
Fabio Comuni
73bee08ac2
enable ajax calendar with $a->config['experimentals']['new_calendar']=1
2012-02-15 12:47:50 +01:00
friendica
ffe7d8b1e9
item tag notifications
2012-02-09 21:18:50 -08:00
friendica
c76b224d8a
prune old expired and deleted items
2012-01-30 15:13:24 -08:00
friendica
167ab537b5
backend for delegating forums
2012-01-26 16:52:12 -08:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
969cd145ce
suggestion notifications
2012-01-03 17:29:07 -08:00
root
09be90be02
modified: settings.php corrected TLS email connector not working due to spelling mistake.
2011-12-25 22:52:15 +00:00
friendica
e67f69df81
default ajax settings after conversion
2011-12-12 17:30:29 -08:00
friendica
e74a960327
change default ajax interval to 40 seconds
2011-12-12 17:10:19 -08:00
friendica
a38d3b82b9
browser_update settings
2011-12-11 21:03:33 -08:00
friendica
034038849c
mysql error report fix (no mysqli), suggested friends for new members settings
2011-11-28 19:28:33 -08:00
friendica
f4e1135f79
poco addition to provide a "suggestme" for new members
2011-11-28 15:11:59 -08:00
friendica
c568493f57
add expire_starred option, fix "delete selected" on some themes, new project name in email templates
2011-11-21 19:01:05 -08:00
Fabio Comuni
79603e3146
expire settings for items, notes and photos.
...
show default privacy acl in popup
2011-11-17 15:53:59 +01:00
friendica
b4218614ed
change hide profile setting text
2011-11-16 04:15:14 -08:00
Fabio Comuni
0becdb01db
oauth: fix add new app
2011-11-07 17:54:46 +01:00
Fabio Comuni
00c342e13d
Merge branch 'oauthapi'
2011-11-07 17:41:23 +01:00
Fabio Comuni
4407fc2c5d
oauth apps/authorization management in settings page
2011-11-07 17:38:30 +01:00
Fabio Comuni
69e41f7703
oauth: authorize view, wrong verifier.
2011-11-02 09:54:07 +01:00
Fabio Comuni
ff7fc68382
oauthapi: authorize app
2011-10-26 17:15:36 +02:00
Friendika
efe3365431
tag privacy settings
2011-10-24 21:11:05 -07:00
Friendika
da416e0181
bug in diaspora_reshare
2011-10-20 05:43:33 -07:00
Friendika
19129e06c3
diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order
2011-10-19 15:08:16 -07:00
Friendika
557a7d0cec
stuff
...
- background the external network notifications (Facebook, Twitter, Statusnet)
- add vimeo support
- consolidate editor video options (insert video, regardless of source)
- add "Connector Settings" page purely for configuring connectors
- moved mailbox settings to Connectors
- Move the "Connect/Follow" dialogue out of "find people" and move to top.
- Add "Find People" dialogue
- minor theme edits on duepuntozero and testbubble to make all this stuff work
- A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Fabio Comuni
f64e2d63b9
New common tab template. Update css
2011-10-10 15:28:34 +02:00
fabrixxm
07b6c868b3
remove javascript to set selectect nav item. enanche img template prefetch ignoring
2011-08-17 18:36:24 +02:00
Fabio Comuni
e6444adafd
change nav selected css class
2011-07-25 16:52:30 +02:00
Friendika
74a608e1c7
openid settings appearing when disabled, don't tag numbers, install admin not getting set
2011-07-12 23:14:38 -07:00
Friendika
706b6e8c84
email notifications not working - unable to change notification settings
2011-07-12 05:09:07 -07:00
Friendika
d7b5a606fb
don't show mailbox settings at all if disabled
2011-07-06 20:27:18 -07:00
Friendika
94ca19c016
a few minor fixes to settings page
2011-07-06 16:47:55 -07:00
Fabio Comuni
e7834e60f8
Update settings page to use field templates.
...
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
2011-07-06 12:10:00 +02:00
Friendika
84d12c3e08
move hidewall to user table - queries are getting too complicated and servers falling over
2011-07-05 23:23:43 -07:00
Friendika
c2dcff0d02
move profile privacy settings to the Privacy section of the Settings page
2011-06-19 16:47:03 -07:00
fabrixxm
76f4d85d9a
Small fix to theme selector
2011-06-06 14:55:54 +02:00
Friendika
edbad772ba
add flag for experimental themes
2011-06-05 18:05:25 -07:00
Friendika
55e727de64
make 'visible to everybody' warning toggle correctly in photos and settings
2011-06-01 22:06:53 -07:00
Friendika
7fb9aa24fb
bug #87 alert if email settings don't open mailbox, also display last email connect time
2011-05-29 21:20:50 -07:00
Fabio Comuni
e1107b55c6
add info() function. Works like notice() but show messages in a div with class info-message.
...
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
2011-05-23 11:39:57 +02:00
Friendika
b2e92e0af3
deprecate load_view_file
2011-05-11 04:37:13 -07:00
Friendika
a00813497f
bring back load_view_file for dispy templates
2011-05-10 23:35:31 -07:00
Friendika
c052d68828
don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
2011-05-10 16:12:50 -07:00
Friendika
1d4791d38c
bin2hex not vice versa
2011-04-21 00:43:37 -07:00
Friendika
6e6d143aab
another typo
2011-04-21 00:29:48 -07:00
Friendika
0803abcf53
typo
2011-04-21 00:27:35 -07:00
Friendika
a0179235d2
provide a way to disable mailbox integration
2011-04-18 20:20:04 -07:00
Friendika
b168847b56
still getting a zero
2011-04-18 16:03:07 -07:00
Friendika
e2c9d04b36
leave imap port blank if 0
2011-04-18 15:58:01 -07:00
Friendika
ab099e9102
email integration, cont.
2011-04-17 23:27:11 -07:00
Friendika
44c47f118c
"profile locator/address" is now called "Identity Address" to reduce confusion
2011-04-14 20:37:42 -07:00
Friendika
5198e039df
better visibility of default post permissions
2011-04-13 17:11:24 -07:00
Friendika
e35a5bac55
the rest of the english html templates except for htconfig
2011-04-07 23:10:43 -07:00
Friendika
338ba48554
more templates
2011-04-07 18:00:35 -07:00
Friendika
c32ed16303
more templates converted to string files
2011-04-06 22:42:08 -07:00
Friendika
c4b292a4f1
account/profile/contacts export
2011-03-22 03:07:46 -07:00
Friendika
b7292bc673
user pref -> block remote wall posting
2011-03-20 17:54:50 -07:00
Friendika
f01538a54f
content expiration
2011-03-15 17:31:49 -07:00
Friendika
755c2245e8
move php path setting inside proc_run
2011-02-23 15:16:12 -08:00
Friendika
26cc2e02fe
Merge branch 'fabrixxm-master'
...
Conflicts:
boot.php
2011-01-28 18:50:20 -08:00
Friendika
f5674558ca
propagate name changes to 'self' contact record
2011-01-24 18:18:47 -08:00
fabrixxm
e9251499dd
Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run()
2011-01-24 22:00:02 +01:00
Friendika
95ec0767d8
plugin settings were getting changed
2011-01-05 13:10:47 -08:00
Friendika
bb0c24bd4f
prevent admin hijacks
2011-01-04 22:17:58 -08:00
Friendika
7ae8486b36
settings: ensure system theme is default selection
2011-01-03 21:55:21 -08:00
Friendika
d92659560b
site config to force publish in site directory
2011-01-02 22:09:54 -08:00
Friendika
527ff13f77
validate the openid url as well. We won't change it if it's bogus, but we won't use it either.
2011-01-02 21:25:38 -08:00
Friendika
03e15bd22f
don't update openidserver if openid is empty
2011-01-02 21:20:17 -08:00
Friendika
c0aa8f9312
new string wasn't configured for translation.
2010-12-25 01:24:51 -08:00
Friendika
d045fd04d4
provide separate plugin settings page, update demo plugin, fix hook_register
2010-12-24 23:44:17 -08:00
Friendika
cd073f94f8
slight change on last commit - server discovery for legacy openid
2010-12-23 14:54:34 -08:00
Friendika
c55cb45855
revised openid patch, added fix for Windows servers, make "is now friends with" commentable, fix settings form hook to be inside form
2010-12-23 14:40:32 -08:00
fabrixxm
68868fd74b
OpenID delegation degrade gracefully if database table is not updated.
2010-12-23 21:52:51 +01:00
Friendika
d8969bb84b
add more plugin hooks, etc.
2010-12-22 20:23:41 -08:00
Friendika
878067101f
block connection/friend request spam
2010-12-20 00:27:00 -08:00
Friendika
6b5a83b9b8
profile load optimisation
2010-12-11 04:16:58 -08:00
Friendika
62bb471ba0
localise login template, allow openid to be disabled
2010-11-28 20:58:23 -08:00
Friendika
1d420e473f
add openid settings
2010-11-17 15:41:18 -08:00
Friendika
8c395f96de
view directory cleanup
2010-11-15 21:02:59 -08:00
Friendika
0851669b39
clean up some regex's for i18n, and eliminate old ereg patterns.
2010-11-14 00:32:31 -08:00
Mike Macgirvin
f0b6400584
more lint
2010-10-31 16:38:22 -07:00
Mike Macgirvin
a8e4ec7801
use browser geolocation when desired
2010-10-19 20:52:05 -07:00
Mike Macgirvin
3876cab8ea
sorting out the last(?) quirks in group pages.
2010-10-18 16:38:48 -07:00
Mike Macgirvin
ac824fe83e
eradicate redundant get_uid function
2010-10-18 14:34:59 -07:00
Mike Macgirvin
511c761fec
group/community/celebrity pages
2010-10-18 00:43:49 -07:00
Mike Macgirvin
0f47ac282c
celebrity/group/community pages about 75% implemented
2010-10-17 20:04:17 -07:00
Mike Macgirvin
36e1afa6ae
allow login by username and multiple unique email addresses on system - this will provide support for group/celebrity pages (coming soon).
2010-10-16 20:38:27 -07:00
Mike Macgirvin
dcaadada35
allow leading/trailing whitespace in passwords
2010-10-09 16:19:52 -07:00
Mike Macgirvin
a0a7c3be8b
add linebreak to invisibility notice
2010-09-30 05:13:13 -07:00
Mike Macgirvin
948061e241
notify people when they are invisible
2010-09-30 05:10:25 -07:00
Mike Macgirvin
34eedb503a
stronger type checking on comparisons
2010-09-26 17:24:20 -07:00
Mike Macgirvin
d5a13b1e4c
localisation path for all view templates
2010-09-22 18:00:19 -07:00
Mike Macgirvin
65a420b227
theme cleanup
2010-09-18 21:11:18 -07:00
Mike Macgirvin
f8160ed076
missing paren
2010-09-08 20:52:43 -07:00
Mike Macgirvin
ffb1997902
mistpark 2.0 infrasturcture lands
2010-09-08 20:14:17 -07:00
Mike Macgirvin
024f2019e6
store default location
2010-08-21 16:31:46 -07:00
Mike Macgirvin
f7c56106e7
rename new password field so form filling browsers don't always populate it
2010-08-19 22:18:06 -07:00
Mike Macgirvin
cac8aa7a69
increase visibility of visibility settings
2010-08-19 22:04:18 -07:00
Mike Macgirvin
30e3a65c0f
full theming support
2010-08-16 05:23:26 -07:00
Mike Macgirvin
47e9613acd
mongo notification checkin, wall, comments, settings
2010-08-14 07:55:18 -07:00
Mike Macgirvin
5933f13ab7
default acl's
2010-08-07 23:54:22 -07:00
Mike Macgirvin
b399b20dee
mail, i18n, etc.
2010-07-30 06:09:20 -07:00
Mike Macgirvin
ba8da761e6
more cleanup - start on ajax
2010-07-19 22:52:31 -07:00
Mike Macgirvin
c3fd5ed732
one true profile photo, force nicknames
2010-07-19 19:09:58 -07:00
Mike Macgirvin
a26f4eeff6
new nickname policy
2010-07-08 20:25:05 -07:00
Mike Macgirvin
6817c5d59a
lots of work, 2way friends, comments...
2010-07-05 21:39:55 -07:00
Mike Macgirvin
6348e70daa
Initial checkin
2010-07-01 16:48:07 -07:00
