2079 Commits

Author	SHA1	Message	Date
kumavis	e3d7062e9b	sentry - rewrite report urls + use raven-js from npm	2018-03-23 17:22:44 -07:00
artiya4u	4c15a121a3	๊๊Update Thai translate.	2018-03-24 02:38:31 +07:00
artiya4u	47e09b0f2b	First add Thai translate.	2018-03-23 02:33:57 +07:00
Dan	b9309f689b	Use extension api to get initial locale.	2018-03-22 12:49:19 -02:30
Dan	d613dfb434	Correct reprice title and subtitle key names.	2018-03-22 01:19:00 -02:30
Dan	be845fd190	Merge branch 'master' into i18n-translator-redux	2018-03-21 22:28:58 -02:30
Dan	d24a0590d3	i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props.	2018-03-21 22:11:47 -02:30
kumavis	9362239231	v4.3.0	2018-03-21 14:16:00 -07:00
kumavis	278e1ba61e	Merge pull request #3656 from MetaMask/trigun0x2-master2 ... Prevent batch request from opening multiple windows (3)	2018-03-21 12:42:03 -07:00
kumavis	a80be4c8c3	Merge pull request #3648 from raulk/patch-1 ... Minor adjustments to Spanish translation	2018-03-21 12:33:52 -07:00
kumavis	1343f5ede4	Merge branch 'master' of github.com:MetaMask/metamask-extension into trigun0x2-master	2018-03-21 11:55:24 -07:00
kumavis	5d3246c836	Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into trigun0x2-master	2018-03-21 11:55:09 -07:00
kumavis	dc4752c703	i18n - fix german json formatting	2018-03-21 11:44:31 -07:00
Nico	1eee1909ac	Tranlate to German (#3575) ... Translation into German	2018-03-21 11:41:17 -07:00
Victor Charapaev	ec1188f250	Translate to Russian (#3644) ... * Add Russian localization	2018-03-21 11:37:54 -07:00
N1X	332a0203ac	hn _locales : message.json [HINDI] (#3611) ... adding hn_IN `_locales`	2018-03-21 11:33:32 -07:00
Raúl Kripalani	759b65ddf9	Minor adjustments to Spanish translation	2018-03-21 10:51:44 +00:00
kumavis	cbaa70751b	Merge pull request #3625 from bradford-hamilton/master ... add Dutch translations	2018-03-20 17:14:16 -07:00
kumavis	1b27edca4d	Merge pull request #3641 from hermanjunge/master ... Nuke the es_419 locale	2018-03-20 16:55:35 -07:00
kumavis	112a9443ee	Merge pull request #3585 from lazaridiscom/laz/i3568 ... [WIP] document/rearrange metamask-controller.js, re #3568	2018-03-20 16:47:04 -07:00
Herman Junge	ac34c8f480	Nuke the es_419 locale	2018-03-20 20:43:20 -03:00
kumavis	1a60094d50	Merge pull request #3504 from lazaridiscom/laz/i3427 ... adds READMEs to folders, re #3427	2018-03-20 16:28:47 -07:00
Herman Junge	89acc955fa	last pass (for now)	2018-03-20 20:08:09 -03:00
Herman Junge	7e614ec6db	all 286 english strings were found in your locale	2018-03-20 19:49:10 -03:00
Herman Junge	1cc1737d42	all 264 strings declared in your locale were found in the english one	2018-03-20 19:32:13 -03:00
Herman Junge	3d885cae92	alphabetic sort of spanish messages.json	2018-03-20 19:25:21 -03:00
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Bradford Lamson-Scribner	bb8b84f2fe	add Dutch translations	2018-03-20 13:22:47 -06:00
Jeffrey Tong	93495b2809	fix for lint	2018-03-20 12:18:48 -07:00
Thomas	dd19a93447	Add i18n to tx status	2018-03-20 12:06:59 -07:00
Thomas	d4eb883958	Merge branch 'master' into i3571-CompleteI18nTemplates	2018-03-20 11:35:59 -07:00
Grana69	8840f50527	Add messages.json from @Grana69	2018-03-20 15:04:22 -03:00
Thomas	2c42cfdf1e	Update onlySendToEtherAddress message	2018-03-20 11:04:15 -07:00
Thomas	4fc68ca208	Add i18n in settings/info	2018-03-20 10:56:35 -07:00
kumavis	706a943189	Merge pull request #3613 from alvesjtiago/master ... Portuguese translations.	2018-03-20 10:53:20 -07:00
kumavis	d21bf822e3	Merge pull request #3579 from matteopey/italian-translation ... Italian translation	2018-03-20 10:48:14 -07:00
kumavis	3a2f1c7c00	Merge pull request #3574 from marvinvista/master ... Tagalog Translation	2018-03-20 10:30:28 -07:00
Thomas	7a8e080245	Started on Tx list i18n	2018-03-20 10:29:22 -07:00
Thomas	de98cb4039	Remove duplicate keys	2018-03-20 02:33:46 -07:00
matteopey	ee85a9c9d0	Update translation based on the new message.json	2018-03-19 20:54:30 +01:00
Dan Finlay	f5b0d56b9d	Add send screen template	2018-03-19 12:38:14 -07:00
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan Finlay	293ca6c9a6	Add template for settings and info	2018-03-19 12:03:35 -07:00
Dan Finlay	2e7d4db2de	Add recover and backup tempaltes	2018-03-19 11:43:22 -07:00
Dan Finlay	e504bc6215	Add connecting indication templates	2018-03-19 11:28:02 -07:00
Dan	d8788af9b8	Merge branch 'master' into retry-tx-refractor	2018-03-19 15:30:47 -02:30
Tiago Alves	1f132d613a	Portuguese translations.	2018-03-20 00:10:55 +07:00
Dan	5733820024	Merge branch 'master' into i18n-translator-redux	2018-03-19 14:39:04 -02:30
Dan	a51e8f6a16	Fetch localeMessages in front end only.	2018-03-19 13:36:16 -02:30
kumavis	02d2b3db43	Merge pull request #3555 from mamiM/mamiM-Ja-translation ... Translation to Japanese #3536	2018-03-17 14:30:49 -07:00
kumavis	627a5af66a	Merge pull request #3560 from Orangem21/master ... Translate to Chinese (Mandarin) #3529	2018-03-17 14:28:56 -07:00
kumavis	61e7f19af6	Merge pull request #3602 from vietlq/master ... Vietnamese Translation	2018-03-17 14:24:40 -07:00
kumavis	9b0c652a14	Merge pull request #3564 from nujabes403/patch-1 ... Translate to Korean #3563	2018-03-17 14:16:10 -07:00
Viet Le	6601bc5eff	space	2018-03-17 20:56:28 +00:00
Viet Le	0dd2f918b3	corrected vn -> vi	2018-03-17 20:49:19 +00:00
Viet Le	2a1a9c2215	Translated to Vietnamese. Translator: Trang Ha, Editor: Viet Le	2018-03-17 19:19:10 +00:00
Dan Finlay	3bc8493166	Merge pull request #3590 from SaptakS/feature/whitelist ... Inject Script: Blacklist domains where not to inject script	2018-03-16 15:48:08 -07:00
Alexander Tseung	6f749e5576	Update Confirm Contract screen (#3597)	2018-03-16 13:09:49 -07:00
Saptak Sengupta	6174c00c10	Inject Script: Blacklist domains where not to inject script ... Put a blacklist domain check where if the page url is in the list of blacklisted domains, we shouldn't inject script in that web page.	2018-03-17 01:02:08 +05:30
Thomas Huang	ad9feee637	Fix messages typo (#3591)	2018-03-16 14:30:27 -02:30
Lazaridis	e1d6398b0f	moves setup-related code towads end of file, re #3568	2018-03-16 18:37:56 +02:00
matteopey	b3c3f50cf9	Clients because we mean Ethereum clients	2018-03-16 14:55:49 +01:00
matteopey	51f85b8021	Fix as requested by review	2018-03-16 14:53:57 +01:00
nujabes403	0a725285b4	Update messages.json	2018-03-16 14:27:56 +09:00
nujabes403	7432b13b33	Update messages.json	2018-03-16 14:26:40 +09:00
nujabes403	6fa8de6e93	Update messages.json	2018-03-16 14:24:41 +09:00
nujabes403	4be9d146db	Update messages.json	2018-03-16 14:22:36 +09:00
nujabes403	55d0ffd4a0	Update messages.json	2018-03-16 14:22:09 +09:00
Lazaridis	bb6af25e20	add ESLint exceptions for //= and //-, re #3568	2018-03-16 03:22:10 +02:00
Lazaridis	904f00e8ac	group all vault/keyring related methods together, re #3568	2018-03-16 02:29:53 +02:00
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
Thomas	9523dd6266	More for i18n	2018-03-15 16:05:49 -07:00
Lazaridis	d8f5150aa5	adds initial documentation, re #3568	2018-03-16 00:27:10 +02:00
kumavis	67e87a4fd4	Merge pull request #3576 from Senshii/master ... fix plural in french translation	2018-03-15 13:07:21 -07:00
matteopey	8b065443f2	Add italian translation	2018-03-15 18:45:49 +01:00
frankiebee	4c947d466c	Merge branch 'master' into retry-tx-refractor	2018-03-15 09:47:25 -07:00
Alexander Tseung	66193c823c	Update Deposit Eth icon (#3569)	2018-03-15 13:50:22 -02:30
frankiebee	cd721f52cb	Merge branch 'master' into retry-tx-refractor	2018-03-15 08:07:16 -07:00
simon fourdinier	09fe5ed9ba	fix plural in french translation	2018-03-15 09:37:00 +01:00
Marvin Vista	dff09cf95d	Translate to Tagalog #3535 ... Changed some special characters	2018-03-15 15:02:36 +08:00
Marvin Vista	d2d0e2324b	Translate to Tagalog #3535	2018-03-15 14:58:26 +08:00
nujabes403	9cd9b16689	Translated whole message in KR	2018-03-15 12:14:00 +09:00
Orange	d79ef5bf15	fix ... change loose => 疏松； change imported => 已导入私钥	2018-03-15 09:27:31 +08:00
Mami Mordovets	e781ba2c55	Translation to Japanese	2018-03-14 16:44:30 -07:00
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -07:00
kumavis	6bdef5f4c8	Merge pull request #3545 from vincentlg/master ... Add French translation 🇫🇷	2018-03-14 11:47:53 -07:00
kumavis	6aef2ed0b2	local-store - fix class syntax	2018-03-14 10:59:47 -07:00
kumavis	c4e90c9359	local-store - check for error from extension.runtime	2018-03-14 10:49:54 -07:00
kumavis	481983aae8	local-store - fix promisification of methods	2018-03-14 10:31:25 -07:00
nujabes403	70ae807618	Update kr translation to messages.json	2018-03-15 02:25:01 +09:00
Vincent Le Gallic	9963bf6429	Update messages.json ... thx to @Senshii	2018-03-14 18:08:14 +01:00
Orange	95742596e3	Merge pull request #2 from MetaMask/master ... update	2018-03-15 00:20:32 +08:00
frankiebee	b609924125	fix destructuring of variables	2018-03-14 08:21:50 -07:00
frankiebee	bc987a1129	fix destructuring of variables	2018-03-14 08:20:54 -07:00
Orange	d2fb1c2b82	fix ... fix 接收 to 接受	2018-03-14 23:19:08 +08:00
yuanchao	f595e8f424	yuanaichi	2018-03-14 22:37:28 +08:00
Dan	106ce091a9	Fix TransactionStateManager spelling.	2018-03-14 11:45:04 -02:30
Lazaridis	2d3763d709	add READMEs to folders, re #3427	2018-03-14 15:33:22 +02:00
Orange	fd5bdb3241	fix ... fix	2018-03-14 15:15:56 +08:00
Mami Mordovets	8299ab438a	Translation to Japanese	2018-03-14 14:33:26 +09:00
Orange	5fa8e83b3c	fix ... fix	2018-03-14 11:13:52 +08:00
Dan	798988597b	Merge branch 'master' into retry-tx-refractor	2018-03-14 00:02:27 -02:30
kumavis	dc5fbf5eb2	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-13 15:43:37 -07:00
kumavis	22cd788203	tx-gas-utils - fix code style	2018-03-13 15:39:33 -07:00
frankiebee	e5a83d3f1a	transactions move validation of the to field to validateRecipient	2018-03-13 15:32:03 -07:00
frankiebee	a2c14ad02b	Merge remote-tracking branch 'origin/i#3509' into i#3509	2018-03-13 15:27:26 -07:00
frankiebee	c465d510b1	fix error message	2018-03-13 15:26:45 -07:00
Frankie	c83a9ceb04	Merge branch 'master' into i#3509	2018-03-13 15:23:46 -07:00
frankiebee	d195cfab50	transactions - insure if a to field in tx params has a truthy valu that it is a valid addres and if it is falsy that it is not null to fix issue #3509	2018-03-13 15:13:05 -07:00
kumavis	e48934dc04	Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead	2018-03-13 14:49:26 -07:00
frankiebee	9d7640996a	transactions - return the txMeta in retryTransaction	2018-03-13 14:42:26 -07:00
Vincent Le Gallic	c15d3e0e23	Add French translation	2018-03-13 22:04:13 +01:00
Orange	c33eeb0d3e	update ... update	2018-03-14 03:21:31 +08:00
frankiebee	9fd349d740	transactions:state - add a submittedTime stamp so the ui has a better grasp of the time of submission	2018-03-13 09:51:37 -07:00
Thomas	f7138d81e3	Add sigRequest for Signature Request	2018-03-12 11:41:26 -07:00
Thomas Huang	b7c7083a11	Merge branch 'master' into i18n	2018-03-12 10:50:55 -04:00
Jeffrey Tong	4f853bbd3c	remove console log	2018-03-11 10:18:55 -07:00
Jeffrey Tong	bda493dc9d	add comments that need clarification on naming convention	2018-03-11 10:17:08 -07:00
Dan	81e72147ef	Merge branch 'master' into retry-tx-refractor	2018-03-09 02:07:27 -03:30
kumavis	a88e436b7d	lint fix	2018-03-08 14:55:35 -08:00
kumavis	455faece9e	Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead	2018-03-08 14:14:49 -08:00
kumavis	98efca0a97	background - storage - cleanup storage wiring	2018-03-08 14:10:28 -08:00
frankiebee	5572345b78	fix marking of confirmed transaction as dropped	2018-03-08 10:37:47 -08:00
frankiebee	4a3288fec9	transactions - make _markNonceDuplicatesDropped	2018-03-07 22:01:14 -08:00
Jeffrey Tong	aaef2aeefd	fixed multiple notification windows when executing batch	2018-03-07 20:09:40 -08:00
frankiebee	8adb03074c	Merge branch 'master' into retry-tx-refractor	2018-03-07 17:16:35 -08:00
frankiebee	62febac876	refactor retrytx with higher gas price: ... - create a new tx instead of overwriting the tx hash - add a new state 'dropped' to the txStateManager - mark duplicate txs as dropped when one gets confirmed in a block	2018-03-07 17:16:16 -08:00
Dan Finlay	f4e5dd37b1	Merge pull request #3409 from scsaba/seed-phrase-verification ... Add seed phrase verification script into background process	2018-03-07 16:47:13 -08:00
Dan Finlay	64fcd27102	Tighten up data loading code	2018-03-07 14:42:59 -08:00
Dan Finlay	b97ac5106f	Add clarifying comment	2018-03-07 14:38:26 -08:00
Dan Finlay	d58e47edec	Some fixes for new storage strategy ... - Don't persist undefined data - Write to new storage strategy without waiting for completion. - Continue writing to localStorage as fallback.	2018-03-07 14:23:31 -08:00
Jeffrey Tong	40b1688c67	removed check for width & height on multiple popup windows	2018-03-07 14:19:27 -08:00
Dan Finlay	ab55c184c7	Increase storage debounce to 2s	2018-03-07 13:50:22 -08:00
Dan Finlay	d0ba2d2d94	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-07 13:39:44 -08:00
Jeffrey Tong	cad5f5f000	fix typo in tests and tx-state-manager	2018-03-07 10:24:36 -08:00
Jeffrey Tong	57dc5a6e9b	fix typo in transaction.js	2018-03-06 20:37:26 -08:00
Dan Finlay	abe8bc19a8	Merge branch 'master' into i18n	2018-03-06 20:13:53 -08:00
kumavis	e91a521b1b	Version 4.2.0	2018-03-06 17:30:12 -08:00
Dan	7c2257e09c	Missing comma in messages.json	2018-03-06 21:25:30 -03:30
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan Finlay	423f084cb4	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-06 14:59:09 -08:00
Dan Finlay	dd9cac69ae	Merge pull request #3309 from scsaba/edge-support ... Add Edge Support	2018-03-06 09:39:57 -08:00
Csaba Solya	59007a6c36	modify verifySeedPhrase to async and call it from addNewAccount also	2018-03-06 15:56:27 +01:00
Csaba Solya	f7d4a1080d	add documentation	2018-03-04 08:47:46 +01:00
Csaba Solya	2b86d65d0c	verify seedwords on log in	2018-03-03 22:08:10 +01:00
Csaba Solya	3e05b693db	verify addresses regardless case	2018-03-03 14:11:02 +01:00
Csaba Solya	4bd7f1a37a	fix lint issues	2018-03-03 00:40:40 +01:00
Csaba Solya	92453f8715	seed phrase verifier	2018-03-03 00:32:57 +01:00
Dan Finlay	452c5d0513	Version 4.1.3	2018-03-02 12:47:40 -08:00
Kevin Serrano	923c702164	Merge pull request #3356 from MetaMask/cdn-minimization ... Check in all font files locally.	2018-03-01 12:30:03 -08:00
kumavis	00cd5a340d	4.1.2	2018-02-28 16:11:58 -08:00
Thomas Huang	98bd06f331	Merge pull request #3361 from MetaMask/4.1.1 ... Version 4.1.1	2018-02-28 14:57:33 -08:00
kumavis	190389a068	v4.1.1	2018-02-28 14:26:14 -08:00
Kevin Serrano	d45116824c	Check in all font files locally.	2018-02-28 13:03:46 -08:00
kumavis	c3bd27c965	sentry - extractErrorMessage - fix comment formatting	2018-02-28 10:57:54 -08:00
kumavis	8e5bcf8935	sentry - failed tx - improve ethjs-rpc error formating	2018-02-28 10:53:54 -08:00
kumavis	fca2cbc8ef	sentry - clean - move setupRaven to lib	2018-02-28 10:37:53 -08:00
Frankie	ced62ac551	Merge pull request #3323 from MetaMask/version-4.0.0 ... Version 4.1.0	2018-02-27 10:48:36 -08:00
Thomas	d9486a3ce5	Bump Version	2018-02-27 10:35:43 -08:00
Dan Finlay	fe21f8a952	Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch ... sentry - report failed tx with more specific message	2018-02-27 10:15:18 -08:00
Csaba Solya	73d9bfc52c	make keyFromPassword private	2018-02-23 10:09:16 +01:00
Thomas	b45295499e	Version 4.0.0	2018-02-22 14:57:24 -08:00
Csaba S	2f34630486	Merge branch 'master' into edge-support	2018-02-22 14:55:46 +01:00
Csaba Solya	5ec311ba3e	add edge support	2018-02-22 14:39:32 +01:00
Thomas Huang	e27a3823ba	Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix ... [NewUI] Prevents new tx from active tab from opening popup	2018-02-21 12:50:45 -08:00
Dan Finlay	716acc088e	Merge branch 'master' into uat-master	2018-02-21 10:56:23 -08:00
Dan	a4ed6af2ad	Prevents new transaction from generating popup when metamask is open in an active tab.	2018-02-21 15:04:04 -03:30
Dan Finlay	98d3fba3ef	Fix promise construction	2018-02-20 15:45:48 -08:00
Dan	7169cb1eb8	Bump uat version to 4.0.12	2018-02-16 19:38:01 -03:30
kumavis	06838774fa	sentry - report failed tx with more specific message	2018-02-16 10:21:06 -08:00
kumavis	c0893f2bcc	Merge pull request #3250 from MetaMask/i#3136 ... fix - hex prefix estimatedGas on txMeta	2018-02-16 15:59:20 +00:00
Dan Finlay	73e5ae6e29	Fix incorrect promise instantiation	2018-02-15 15:32:48 -08:00
Dan Finlay	71be537f1c	Version 3.14.2	2018-02-15 14:23:22 -08:00
Thomas Huang	ed33f3160a	Make oldui compatible with newUI style changes	2018-02-15 12:36:26 -08:00
Dan Finlay	58871cb146	Merge pull request #3222 from MetaMask/mesh-test ... metamask mesh - inject mesh testing container	2018-02-15 12:08:06 -08:00
frankiebee	dc3f3e79ca	fix - hex prefix estimatedGas on txMeta	2018-02-14 14:37:02 -08:00
Lazaridis	58a554b168	use the providers initial _blocktracker. fixes #2393	2018-02-11 05:09:27 +02:00
kumavis	94cd5b9df4	metamask mesh - inject mesh testing container	2018-02-10 19:33:33 +00:00
Alexander Tseung	eb919f4710	Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254	2018-02-08 16:43:31 -08:00
Dan	b0db68a281	Merge branch 'uat' into uat-next	2018-02-07 21:19:14 -03:30
Dan J Miller	7f151b861c	[NewUI] Opens to full screen when restoring from seed. (#3201) ... * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.	2018-02-07 21:08:55 -03:30
Dan	d8896a8c31	Merge branch 'master' into uat	2018-02-07 16:32:47 -03:30
Dan Finlay	9f304e3026	Version 3.14.1	2018-02-01 15:53:18 -08:00
Dan Finlay	0608d1579f	Version 3.14.0	2018-02-01 12:27:19 -08:00
Alexander Tseung	4f1fe1da62	Fix merge conflicts from uat-next	2018-01-31 18:24:20 -08:00
Frankie	201e0579a5	Merge branch 'master' into localStorage-clean-up	2018-01-31 11:57:38 -08:00
frankiebee	c3adbda5f5	remove RecentBlocks from disk	2018-01-31 10:49:58 -08:00
Bruno Barbieri	c1b7cfe91d	preserve other networks TXs	2018-01-31 13:29:02 -05:00
Bruno Barbieri	7dc1b09f94	use txMeta.txParams	2018-01-31 04:40:32 -05:00
Bruno Barbieri	03d17c75ae	wipe only transactions for current account	2018-01-31 04:25:32 -05:00
Bruno Barbieri	5f39844382	clean up	2018-01-31 03:36:04 -05:00
Bruno Barbieri	e6fda855a5	added reset account feature	2018-01-31 03:33:15 -05:00
frankiebee	28ee0aae91	creater migration to remove BlacklistController	2018-01-30 14:07:32 -08:00
frankiebee	f13ad6bd6a	remove BlacklistController from disk state	2018-01-30 14:07:32 -08:00
Alexander Tseung	ecc39c5a7a	Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254	2018-01-29 18:22:52 -08:00
Nick Doiron	abfa74f09a	complete i18n across new UI	2018-01-29 15:29:01 -05:00
Dan Finlay	62b2ce5b69	Version 3.13.8	2018-01-29 11:38:25 -08:00
Dan Finlay	8ba64c657f	Increase storage debounce value	2018-01-25 15:38:43 -08:00
Dan Finlay	ceebc6caa4	Debounce storage to avoid crashing pump	2018-01-25 13:01:03 -08:00
Kevin Serrano	19a379edba	Bump limit for event emitter warning.	2018-01-25 12:28:11 -08:00