Commit Graph

1463 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
3e9a5a0b12 Add exclusion list for domains. 2022-04-11 17:50:19 -03:00
Paulo Gustavo Veiga
7af7925610 Add control to limit the number of accounts to share. 2022-04-11 16:58:06 -03:00
Paulo Gustavo Veiga
c6ddadba45 Fix tooltip rendering. 2022-04-11 15:41:13 -03:00
Paulo Gustavo Veiga
50e0069532 Improve email template 2022-04-11 15:09:42 -03:00
Paulo Gustavo Veiga
b0517db79e Bump up version. 2022-04-11 14:51:43 -03:00
Paulo Gustavo Veiga
c76ae8da06 Release 5.0.11 2022-04-11 14:43:24 -03:00
Paulo Gustavo Veiga
b8b63509d0 Configure resources loading encoding. 2022-04-11 14:36:28 -03:00
Paulo Gustavo Veiga
735bb640b6 Minor fix 2022-04-11 10:05:30 -03:00
Paulo Gustavo Veiga
f1cfef8cf0 Improve message translation on email 2022-04-11 10:03:27 -03:00
Paulo Gustavo Veiga
e435cd4666 Fix file encoding issue on emails. 2022-04-11 09:51:15 -03:00
Paulo Gustavo Veiga
08374056cc Disable cache on entitles. 2022-04-04 23:04:57 -03:00
Paulo Gustavo Veiga
86a0a876ca Fix error trying to delete account with labels created. 2022-04-03 22:02:20 -03:00
Paulo Gustavo Veiga
a618849afc Remove REST API application/xml type support 2022-04-02 12:59:54 -03:00
Paulo Gustavo Veiga
ad20d06d19 Update spring framework version. 2022-04-02 12:22:25 -03:00
Paulo Gustavo Veiga
accf252e78 Fix email encodding problem. 2022-03-30 07:50:42 -03:00
Paulo Gustavo Veiga
641bcbbe17 Fix reset passwod issue on message. 2022-03-30 07:45:15 -03:00
Paulo Gustavo Veiga
8248e162fe Enable base url discovery. 2022-03-29 22:41:21 -03:00
Paulo Gustavo Veiga
6f19323292 Add debug information. 2022-03-28 08:15:46 -03:00
Paulo Gustavo Veiga
8a5bd2de94 Remove junit unsed dependency 2022-03-27 22:55:44 -03:00
Paulo Gustavo Veiga
6508b9eb67 Revert jslt scope change 2022-03-27 22:52:08 -03:00
Paulo Gustavo Veiga
1ac332a18e Revert "Exclude version in collition"
This reverts commit e9ff9b36fc.
2022-03-27 22:46:34 -03:00
Paulo Gustavo Veiga
e9ff9b36fc Exclude version in collition 2022-03-27 22:44:53 -03:00
Paulo Gustavo Veiga
5fa6a82b3a Update java dependencies. 2022-03-27 20:05:21 -03:00
Paulo Gustavo Veiga
de5febaf15 Bump up version 2022-03-27 15:04:19 -03:00
Paulo Gustavo Veiga
b4fb536137 Prepare for release 5.0.10 2022-03-27 15:01:50 -03:00
Paulo Gustavo Veiga
86a5b39124 Partial i18n share message. 2022-03-27 14:50:35 -03:00
Paulo Gustavo Veiga
791b99e753 Fix typo 2022-03-27 14:38:50 -03:00
Paulo Gustavo Veiga
d063e4eb20 Translate missing resources. 2022-03-27 14:37:58 -03:00
Paulo Gustavo Veiga
ff2b37f4cf i18n password changed. 2022-03-27 14:29:29 -03:00
Paulo Gustavo Veiga
f70f1d89ab Translate welcome email. 2022-03-27 07:32:53 -03:00
Paulo Gustavo Veiga
20b2e8f1e8 Improve mindmap format validation. 2022-03-26 21:06:51 -03:00
Paulo Gustavo Veiga
c5c47892cb Improve collab error email report. 2022-03-24 00:14:38 -03:00
Paulo Gustavo Veiga
9d08ad57b9 Fix failing lock test 2022-03-23 23:41:18 -03:00
Paulo Gustavo Veiga
d380b97938 Clean up lock implementation 2022-03-23 23:32:19 -03:00
Paulo Gustavo Veiga
b8eadb7533 Fix unit tests 2022-03-23 10:56:57 -03:00
Paulo Gustavo Veiga
63f83e879d Merge branch 'develop' into feature/lock2 2022-03-22 22:09:00 -03:00
Paulo Gustavo Veiga
0ee642c246 Improve exception un invalid email 2022-03-22 20:44:07 -03:00
Paulo Gustavo Veiga
20a9978577 Improve toString on User class. 2022-03-22 08:53:52 -03:00
Paulo Gustavo Veiga
b18505050a Revert "Fix CSS collition"
This reverts commit f4cf7e623e.
2022-03-22 08:48:09 -03:00
Paulo Gustavo Veiga
f4cf7e623e Fix CSS collition 2022-03-22 08:38:52 -03:00
Paulo Gustavo Veiga
cbdd6ebb47 WIp 2022-03-22 08:35:47 -03:00
Paulo Gustavo Veiga
fdd6fb928b Improve lock logic. 2022-03-17 19:25:33 -03:00
Paulo Gustavo Veiga
340ddcd1ef Update copyright 2022-03-17 18:47:34 -03:00
Paulo Gustavo Veiga
92dd4a7014 Improve lock code. 2022-03-16 23:16:34 -03:00
Paulo Gustavo Veiga
a9d091a187 Improve error handle on security errors. 2022-03-15 10:30:18 -03:00
Paulo Gustavo Veiga
4cab5299c4 Change mapping of securiy exceptions. 2022-03-14 23:33:16 -03:00
Paulo Gustavo Veiga
9d35aa8279 Fix resource in Chinese 2022-03-14 22:56:02 -03:00
Paulo Gustavo Veiga
c769a5fbe7 Fix compilation 2022-03-14 15:08:31 -03:00
Paulo Gustavo Veiga
7ca5bf716f Improve message on lack of permissions to perform map operations 2022-03-14 15:04:15 -03:00
Paulo Gustavo Veiga
e38c1bcc7c Bump up to 5.0.10 2022-03-14 00:09:47 -03:00
Paulo Gustavo Veiga
c978d02514 Release 5.0.9 version 2022-03-14 00:08:31 -03:00
Paulo Gustavo Veiga
c68c43f5d7 Add chinese support 2022-03-13 23:08:19 -03:00
Paulo Gustavo Veiga
5694697c5f Improve exception handling on non permissions 2022-03-09 17:18:14 -08:00
Paulo Gustavo Veiga
d217768b83 Remove unused context variables. 2022-03-09 13:24:41 -08:00
Paulo Gustavo Veiga
d0a03ad2a3 Revert "Git add CORS"
This reverts commit 5c201d40df.
2022-03-06 21:27:06 -08:00
Paulo Gustavo Veiga
ffd976ffe5 Revert "Add header changes on cors"
This reverts commit 297931508a.
2022-03-06 21:26:54 -08:00
Paulo Gustavo Veiga
297931508a Add header changes on cors 2022-03-06 21:10:45 -08:00
Paulo Gustavo Veiga
5c201d40df Git add CORS 2022-03-06 20:47:45 -08:00
Paulo Gustavo Veiga
1acf84de3f Add anonymous to js loading 2022-03-06 20:16:48 -08:00
Paulo Gustavo Veiga
e0dac73873 Fix NPE on null user. 2022-02-28 21:12:28 -08:00
Paulo Gustavo Veiga
a8e2c74a21 Remove homepage 2022-02-28 14:51:25 -08:00
Paulo Gustavo Veiga
67cc7e586c Rember me redirect on maps on login 2022-02-27 13:16:39 -08:00
Paulo Gustavo Veiga
732127a7a9 Fix to many redirects on remember me 2022-02-27 13:11:55 -08:00
Paulo Gustavo Veiga
b60f5b331f Disable remember me until solve too many redirect problem. 2022-02-27 09:59:03 -08:00
Paulo Gustavo Veiga
c5f1ca88be Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-02-25 06:24:08 -08:00
Paulo Gustavo Veiga
194e858191 Bump up size limit 2022-02-25 06:23:52 -08:00
polly good
6892732389 Merged in ru-locale (pull request #11)
messages_ru.properties

* messages_ru.properties 

Approved-by: Paulo Veiga
2022-02-25 00:45:12 +00:00
Paulo Gustavo Veiga
8b61809bbe Fix css location for bootstrap 2022-02-23 16:36:08 -08:00
Paulo Gustavo Veiga
c3be0b6552 Increase number of nodes supported. 2022-02-23 14:34:55 -08:00
Paulo Gustavo Veiga
50fa9d80f5 Improve error message 2022-02-23 09:51:02 -08:00
Paulo Gustavo Veiga
dd8e9e2f5d Bump up version 2022-02-23 07:11:13 -08:00
Paulo Gustavo Veiga
77a1560625 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-02-23 06:58:18 -08:00
Paulo Gustavo Veiga
2cda03e80d Bump up version 2022-02-23 06:53:42 -08:00
Matias Arriola
73b0454d14 Fix error image. 2022-02-23 14:10:56 +00:00
Paulo Gustavo Veiga
fbbd2c43ff Fix marging on view 2022-02-22 18:14:21 -08:00
Paulo Gustavo Veiga
c3f93fdf4a Improve validation of xml mindmaps during save. 2022-02-22 14:17:13 -08:00
Paulo Gustavo Veiga
342099194d Add missing resources 2022-02-21 10:53:34 -08:00
Paulo Gustavo Veiga
0cd62f612b Improve error handling in not public maps. 2022-02-21 09:43:04 -08:00
Paulo Gustavo Veiga
820e268e3e Fix bug on non-existing last modified 2022-02-21 09:08:28 -08:00
Paulo Gustavo Veiga
aa6531efe1 Remove unsed resources. 2022-02-20 22:12:40 -08:00
Paulo Gustavo Veiga
859c3dd927 Clean up styles now that are part of the editor 2022-02-20 21:55:40 -08:00
Matias Arriola
93f3e91cc1 Delete log file
set session-timeout back to 180
2022-02-20 18:38:16 -03:00
Paulo Gustavo Veiga
f7a9804065 Clean up unused url patterns 2022-02-19 19:47:14 -08:00
Paulo Gustavo Veiga
1c8f3bb203 Fix unit tests. 2022-02-19 19:43:50 -08:00
Paulo Gustavo Veiga
6aadb5a363 Complete security filter 2022-02-19 17:21:45 -08:00
Paulo Gustavo Veiga
f2c15d100d Add CSRD to get operations 2022-02-19 15:57:57 -08:00
Paulo Gustavo Veiga
9966412705 Clean up paths 2022-02-19 12:43:35 -08:00
Paulo Gustavo Veiga
e1bd2630aa First steps on csfr impl 2022-02-19 12:39:38 -08:00
Paulo Gustavo Veiga
bea7bea486 Add flush to commit changes. 2022-02-17 18:11:54 -08:00
Paulo Gustavo Veiga
fad7442ffc Clean up code 2022-02-17 17:36:46 -08:00
Paulo Gustavo Veiga
1eab15f8f3 Fix constrain issue. 2022-02-17 17:34:22 -08:00
Paulo Gustavo Veiga
8e080075a0 Add missing image 2022-02-16 19:18:37 -08:00
Paulo Gustavo Veiga
f0f32178c7 Change mail image to png 2022-02-16 19:05:32 -08:00
Paulo Gustavo Veiga
7cf2644fa8 Bump up snapshot version 2022-02-16 18:46:41 -08:00
Paulo Gustavo Veiga
f16762636b Chores: remove duplicated code 2022-02-16 18:31:41 -08:00
Paulo Gustavo Veiga
1f99ce3889 Fix sharing of man on new collabs. 2022-02-16 18:29:28 -08:00
Paulo Gustavo Veiga
63cfe44d50 Remove orphan collabs on registration 2022-02-16 18:05:26 -08:00
Paulo Gustavo Veiga
7fd227d56f Fix version to be downloaded 2022-02-15 21:00:35 -08:00
Paulo Gustavo Veiga
5d7e7f8d30 Parametrize GA key 2022-02-15 20:36:17 -08:00
Paulo Gustavo Veiga
d69373f563 Update GA JS 2022-02-15 19:38:12 -08:00
Paulo Gustavo Veiga
7d7373768f Update dependencies 2022-02-14 20:06:21 -08:00
Paulo Gustavo Veiga
5c0c18eba0 Add email validation on collaborators. 2022-02-14 19:59:36 -08:00
Paulo Gustavo Veiga
188b280bf2 Add ads.txt file. 2022-02-13 21:35:26 -08:00
Paulo Gustavo Veiga
fb1755768c Adjust log level 2022-02-13 08:25:09 -08:00
Paulo Gustavo Veiga
c269cd9edb Remove support for admin to remove mindmaps 2022-02-12 12:47:54 -08:00
Paulo Gustavo Veiga
89dd7e0193 Remove hackcode forze of lazy loading. 2022-02-12 12:34:30 -08:00
Paulo Gustavo Veiga
ccc0b10ea0 Improve captch erorr handling on invalid input 2022-02-12 10:33:05 -08:00
Paulo Gustavo Veiga
83cff3f66d Split error message 2022-02-12 09:17:52 -08:00
Paulo Gustavo Veiga
f35d145fb8 Improve JS error loggin 2022-02-12 09:15:18 -08:00
Paulo Gustavo Veiga
609fdd7144 Split error message on browser error. 2022-02-12 08:35:29 -08:00
Paulo Gustavo Veiga
b67cd407a4 Improve captcha error processing. 2022-02-12 08:29:53 -08:00
Paulo Gustavo Veiga
6c808dfc2a Disable ; strict control 2022-02-12 08:04:16 -08:00
Paulo Gustavo Veiga
9af7247072 Fix captcha error list 2022-02-12 07:52:16 -08:00
Paulo Gustavo Veiga
ea1349c518 Clean up code. 2022-02-12 00:33:50 -08:00
Paulo Gustavo Veiga
607418dcf7 Add missing message resource. 2022-02-12 00:27:24 -08:00
Paulo Gustavo Veiga
0da8c73d74 Clean up google analytics initialization 2022-02-12 00:12:03 -08:00
Paulo Gustavo Veiga
19ae88e93f Improve JS error loggin 2022-02-12 00:03:55 -08:00
Paulo Gustavo Veiga
4f662acefe Bump up version 2022-02-11 18:06:31 -08:00
Paulo Gustavo Veiga
6abc5a9e5e Fix map creation url 2022-02-09 19:13:09 -08:00
Paulo Gustavo Veiga
571895a2b3 Fix label delete 2022-02-09 16:49:48 -08:00
Paulo Gustavo Veiga
62e009b7e4 Fix add label. 2022-02-09 14:17:28 -08:00
Paulo Gustavo Veiga
4e45aea3f9 Bump up version 2022-02-08 17:43:47 -08:00
Paulo Gustavo Veiga
11e4a4a76a Fix keyboard icon position 2022-02-07 19:13:43 -08:00
Paulo Gustavo Veiga
45bdd80f8d Minor fixes 2022-02-06 09:42:36 -08:00
Paulo Gustavo Veiga
afa73b6a44 Remove unsuported languages 2022-02-05 07:31:01 -08:00
Paulo Veiga
e5200d337b Update messages_es.properties (POEditor.com) 2022-02-05 15:28:58 +00:00
Paulo Veiga
ae80d74122 Update messages_de.properties (POEditor.com) 2022-02-05 15:28:56 +00:00
Paulo Veiga
faa0f4cf72 Update messages_fr.properties (POEditor.com) 2022-02-05 15:28:54 +00:00
Paulo Veiga
265d493dfd Update messages_en.properties (POEditor.com) 2022-02-05 15:25:35 +00:00
Paulo Gustavo Veiga
c55025f07f Fix NPE on recapcha validation 2022-02-03 21:27:43 -08:00
Paulo Gustavo Veiga
119eb03f53 Remove notifier to send emails. 2022-02-03 21:02:28 -08:00
Paulo Gustavo Veiga
677bfe8b89 Fix template emails 2022-02-02 22:13:36 -08:00
Paulo Gustavo Veiga
a71f083416 Fix editor page title 2022-01-30 09:55:07 -08:00
Paulo Gustavo Veiga
bcd3384829 Fix history render 2022-01-27 19:06:51 -08:00
Matias Arriola
5bea640a83 Integrate webapp to mindmap editor with toolbar actions 2022-01-26 22:34:00 +00:00
Paulo Gustavo Veiga
058bb4ef1c Fix initialization scripts for docker 2022-01-23 14:55:07 -08:00
Paulo Gustavo Veiga
f25a1279a3 Extract conexion datapool
Please enter the commit message for your changes. Lines starting
2022-01-23 00:56:30 -08:00
Paulo Gustavo Veiga
19354f4ec1 Fix distribution creation 2022-01-22 23:50:20 -08:00
Paulo Gustavo Veiga
5923d514b7 Remove depreacated code 2022-01-22 09:40:47 -08:00
Paulo Gustavo Veiga
eabc55307c Remove lazy initialization from collaboation 2022-01-18 13:19:25 -08:00
Paulo Gustavo Veiga
6307af005c Optimize mindmap list query. 2022-01-18 13:16:39 -08:00
Paulo Gustavo Veiga
f844692e66 Change initializations of Collabs to eager 2022-01-16 22:47:33 -08:00
Paulo Gustavo Veiga
7fc91abe59 Migrate hibernate xml annotation to annotations 2022-01-16 20:01:56 -08:00
Paulo Gustavo Veiga
4668cba3bf Fix url for static 2022-01-14 16:39:20 -08:00
Paulo Gustavo Veiga
202b3dd285 Add support for remote load of .js on viewer 2022-01-12 19:02:08 -08:00
Paulo Gustavo Veiga
75997b11b3 Add support for external CDN references 2022-01-12 16:09:28 -08:00
Paulo Gustavo Veiga
451c181fd6 Update web.xml to servlet 3.0 2022-01-11 20:44:47 -08:00
Paulo Gustavo Veiga
fc182bc69f Additional resources clean up 2022-01-11 19:04:52 -08:00
Paulo Gustavo Veiga
5db0b756bf Fix adsense registration 2022-01-11 19:01:36 -08:00
Paulo Gustavo Veiga
ba71ff848f Clean up unsed resource properties 2022-01-11 18:57:30 -08:00
Paulo Gustavo Veiga
9cba042f70 Add adds support 2022-01-11 18:18:55 -08:00
Paulo Gustavo Veiga
dcc9bdcdef Change adds code. 2022-01-11 13:17:20 -08:00
Matias Arriola
d2617f8358 * Move toolbarRight inside toolbar
* Add bootstrap again to avoid popovers and other styles breaking

Approved-by: Paulo Veiga
2022-01-11 14:05:48 +00:00
Paulo Gustavo Veiga
7f8b9a8121 Remove less 2022-01-10 21:13:06 -08:00
Paulo Gustavo Veiga
a6b6d67277 Add link to the icon page 2022-01-10 20:21:44 -08:00
Paulo Gustavo Veiga
decc76015c Improve styles 2022-01-10 19:49:06 -08:00
Paulo Gustavo Veiga
b1b8dde547 Improve error page styling 2022-01-10 19:12:58 -08:00
Paulo Gustavo Veiga
a118547523 Clen up unsed classes and resources 2022-01-10 16:51:06 -08:00
Paulo Gustavo Veiga
86b83807f4 Fix Try action support 2022-01-10 16:22:24 -08:00
Paulo Gustavo Veiga
3bac526593 Update toolbar with center position 2022-01-10 12:13:13 -08:00
Paulo Gustavo Veiga
9b5b4b2eda Add publish button to editor 2022-01-08 14:26:36 -08:00
Paulo Gustavo Veiga
897e7d90a5 Fix embedded support. 2022-01-08 10:47:32 -08:00
Paulo Gustavo Veiga
101dbd81c3 Fix public mindmap view including new zoom and style 2022-01-08 10:32:49 -08:00
Paulo Gustavo Veiga
761b2e5ee0 Add account information render 2022-01-07 17:47:53 -08:00
Paulo Gustavo Veiga
0f9639fc73 Revert "Remove unused resources."
This reverts commit 006698341c.
2022-01-07 10:31:48 -08:00
Paulo Gustavo Veiga
006698341c Remove unused resources. 2022-01-06 21:24:58 -08:00
Paulo Gustavo Veiga
5c5af9ecfe Remove shade on toolbar 2022-01-04 19:20:40 -08:00
Paulo Gustavo Veiga
e244d694f5 Update Spring dependencies. 2022-01-04 18:20:30 -08:00
Paulo Gustavo Veiga
307d8ea2b8 Remove JAXB, now supporting any version of JAVA 2022-01-04 13:07:05 -08:00
Paulo Gustavo Veiga
758e18dffc Clean up code 2022-01-04 13:00:39 -08:00
Paulo Gustavo Veiga
0885c9e27e Add missing records 2022-01-03 17:39:11 -08:00
Paulo Gustavo Veiga
7153b0b103 Remove transformers 2022-01-03 16:49:28 -08:00
Paulo Gustavo Veiga
628d819325 Move tests to front-end 2021-12-31 09:37:22 -08:00
Paulo Gustavo Veiga
71fefdd8c6 Remove Image export support. It will be moved to the front end. 2021-12-31 09:13:07 -08:00
Paulo Gustavo Veiga
ac7fd7e706 Add image support on toolbar 2021-12-30 22:52:00 -08:00
Paulo Gustavo Veiga
c387eca16c Clean up images, now are embeded. 2021-12-30 22:30:22 -08:00
Paulo Gustavo Veiga
b7d6bcb5d9 Modernize toolbar 2021-12-27 23:28:21 -08:00
Paulo Gustavo Veiga
955a363ce5 Improve public view 2021-12-26 09:23:51 -08:00
Paulo Gustavo Veiga
fbc9a978f2 Working on fixing mindplot loading 2021-12-25 23:30:57 -08:00
Paulo Gustavo Veiga
9cb4018ce4 Fix mindplot public view issue 2021-12-25 22:55:22 -08:00
Paulo Gustavo Veiga
b3e26caee4 Fix major update integrating with external wisemapping frond end 2021-12-24 18:03:23 -08:00
Paulo Gustavo Veiga
39ff095df7 Remove openid 2020-11-28 15:48:40 -08:00
Paulo Gustavo Veiga
cade40e1a3 Add ads support 2020-11-24 19:50:49 -08:00
Paulo Gustavo Veiga
4e0c621994 Bump up version. 2020-11-23 19:39:34 -08:00
Paulo Gustavo Veiga
e8a246d980 Adjust number of iterations to 12 for BCrypt 2020-11-23 18:27:29 -08:00
Paulo Gustavo Veiga
7a5b4ca75a Fix regression bug. 2020-11-23 18:17:48 -08:00
Paulo Gustavo Veiga
3ef7f6a7f0 Fix create user error. 2020-11-22 17:41:20 -08:00
Paulo Gustavo Veiga
dcd04df8df Update admin password for testing purposes. 2020-11-22 14:41:33 -08:00
Paulo Gustavo Veiga
939478cda5 Bump to 5.0.1-SNAPSHOT 2020-11-22 13:18:03 -08:00
Paulo Gustavo Veiga
ddb7de8c63 Update version 2020-11-22 13:14:05 -08:00
Paulo Gustavo Veiga
306c34d7d5 Fix log level on hibernate.
Fix footer.
2020-11-22 13:12:03 -08:00
Paulo Gustavo Veiga
62fa88cb3e Update favicon 2020-11-22 13:01:26 -08:00
Paulo Gustavo Veiga
3a006f1fbc Fix error on mindmap publish & details 2020-11-22 12:53:35 -08:00
Paulo Gustavo Veiga
64411c6232 Fix wrong query. 2020-11-08 15:42:51 -08:00
Paulo Gustavo Veiga
2a485b71db Copy Sha1 implementationo 2020-11-08 15:29:42 -08:00
Paulo Gustavo Veiga
df88b7d0ff Fix password encription 2020-11-08 13:43:38 -08:00
Paulo Gustavo Veiga
49c459f386 Merge branch 'feature/migration-spring5' of bitbucket.org:wisemapping/wisemapping-open-source into feature/migration-spring5 2020-11-08 13:36:09 -08:00
Paulo Gustavo Veiga
430b30bffb Fix password encoder for compatibility 2020-11-08 12:08:13 -08:00
Paulo Gustavo Veiga
1a524434da Update JDBC drivers for mysql & others... 2020-11-07 18:44:53 -08:00
Paulo Gustavo Veiga
4778433466 Update to tiles 3 version 2020-11-07 14:46:20 -08:00