192 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marquis Kurt	deecd99845	Fix merge conflicts	2019-05-11 12:59:36 -04:00
Marquis Kurt	1ac3835623	Merge pull request #50 from hyperspacedev/federated-config ... Make federation controls more granular, change config fields	2019-05-09 14:23:52 -04:00
Marquis Kurt	9e6e509f30	Use new Federation scheme, convert JSON values for bools to boolean	2019-05-08 15:24:36 -04:00
Marquis Kurt	87d5c8af25	Update About page	2019-05-08 15:08:08 -04:00
Marquis Kurt	ced1dfc3b5	Use federation.universalLogin in Welcome	2019-05-08 09:14:46 -04:00
Marquis Kurt	4987040a39	Expand "federated" to a Federation type with controls	2019-05-08 09:08:20 -04:00
Marquis Kurt	9403cd14b2	Pull latest changes from Beta 4	2019-05-08 09:02:34 -04:00
Marquis Kurt	2c279bce60	Merge pull request #49 from hyperspacedev/app-card ... App info redesigned	2019-05-07 08:45:29 -04:00
Marquis Kurt	58e392cf2a	Merge pull request #48 from hyperspacedev/instance-card ... Redesign "About your instance"	2019-05-07 08:45:14 -04:00
Marquis Kurt	04ef3aca1e	Create app info card	2019-05-06 15:39:58 -04:00
Marquis Kurt	b3504a82cf	Design new card (inspired by #46)	2019-05-06 13:52:07 -04:00
Marquis Kurt	3c3fc4be23	Bump to 1.0.0beta4	2019-05-06 12:28:44 -04:00
Marquis Kurt	b46c153d70	Update gitignore	2019-05-03 16:10:39 -04:00
Marquis Kurt	72a4820ca8	Update to 1.0.0beta3 instead of b2u3 1.0.0beta3	2019-05-03 15:34:14 -04:00
Marquis Kurt	e233d4c09b	Merge pull request #43 from hyperspacedev/b2u3 ... 1.0.0beta3 (final check)	2019-05-03 15:30:48 -04:00
Marquis Kurt	aa5df74b6b	Merge branch 'master' of github.com:hyperspacedev/hyperspace into b2u3	2019-05-03 14:46:46 -04:00
Marquis Kurt	8195aed76a	Fix Codeowners?	2019-05-03 14:46:06 -04:00
Marquis Kurt	90e88536c7	Merge pull request #42 from hyperspacedev/settings-icons ... Add icons to Settings page	2019-05-03 14:31:11 -04:00
Marquis Kurt	b69e8ef220	Fix account icons	2019-05-03 14:25:40 -04:00
Marquis Kurt	d54f573b64	Change to Bell Alert icon	2019-05-03 14:23:22 -04:00
Marquis Kurt	fd9fa9ba73	Resolve merge conflicts	2019-05-03 13:11:53 -04:00
Marquis Kurt	fd442bb2b1	Change URLs	2019-05-03 13:09:33 -04:00
Marquis Kurt	b3bdfdacb1	Merge pull request #41 from hyperspacedev/edit-profile ... Edit profile	2019-05-03 13:08:39 -04:00
Nodar Sotkilava	1536247af4	deleted extra error function calls ... added console.error()	2019-05-03 11:52:22 -04:00
Marquis Kurt	6dbd6b6224	Redirect to localhost when config set to desktop	2019-05-02 16:49:09 -04:00
Marquis Kurt	bc67814ae9	Update gitignore	2019-05-02 16:25:01 -04:00
Nodar Sotkilava	63775d6d91	Show new name on snackbar, updated mesasages	2019-05-02 15:06:43 -04:00
Nodar Sotkilava	0c3fc53db2	Added functionality to update Bio and Display Name	2019-05-02 14:39:21 -04:00
Marquis Kurt	a58a172fe5	Start work on testing Hyperspace desktop app (note: BROKEN)	2019-04-30 16:53:50 -04:00
Marquis Kurt	8529b51c05	Add missing mdi-material-ui dep to package.json	2019-04-30 12:02:39 -04:00
Marquis Kurt	206937cdb6	Fix merge conflicts	2019-04-29 21:07:35 -04:00
Marquis Kurt	e3357809a3	Merge branch 'b2u3' of github.com:hyperspacedev/hyperspace into edit-profile	2019-04-29 21:06:30 -04:00
Marquis Kurt	bd9e096bd8	Merge pull request #33 from hyperspacedev/media-uploads ... Fix persistent media upload snackbar	2019-04-29 21:04:17 -04:00
Marquis Kurt	ad34581293	Merge branch 'b2u3' of github.com:hyperspacedev/hyperspace into media-uploads	2019-04-29 14:58:24 -04:00
Marquis Kurt	1c59f2b6d8	Merge pull request #35 from hyperspacedev/brand-name-takeover ... Fix #34	2019-04-29 14:55:46 -04:00
Marquis Kurt	b4c99af026	Merge pull request #39 from hyperspacedev/login-logic ... Fix well-known login caused by faulty check in federation status	2019-04-29 14:55:33 -04:00
Marquis Kurt	6ed271f349	Fix well-known login caused by faulty check in federation status	2019-04-29 14:44:05 -04:00
Marquis Kurt	80a59081e9	Fix brand name stuff in AppLayout	2019-04-29 14:38:28 -04:00
Marquis Kurt	747a71df6e	Merge branch 'b2u3' of github.com:hyperspacedev/hyperspace into settings-icons	2019-04-28 15:56:12 -04:00
Marquis Kurt	b89ff971f7	Merge branch 'b2u3' of github.com:hyperspacedev/hyperspace into media-uploads	2019-04-28 15:55:51 -04:00
Marquis Kurt	3f62066b8c	Pull from b2u3 (error?)	2019-04-28 15:52:08 -04:00
Marquis Kurt	7ebfff138b	Dynamically change app name in rrgistry, change name in Welcome pages	2019-04-28 15:50:18 -04:00
Marquis Kurt	1a05cb9417	Dynamically change Hyperspace name in settings	2019-04-28 15:38:44 -04:00
Marquis Kurt	8bf135ed93	Assign key to media uploading sb, change variants, close in catch (fix #32)	2019-04-28 13:16:21 -04:00
Marquis Kurt	32f3583698	Add icons to Settings options (depends on #14 before close)	2019-04-28 12:46:26 -04:00
Marquis Kurt	733c772705	Pull from b2u3	2019-04-27 19:24:02 -04:00
Marquis Kurt	04c784f342	Merge pull request #31 from hyperspacedev/defederate ... More control on defederation settings	2019-04-27 19:21:27 -04:00
Marquis Kurt	ff0836c8cc	Merge pull request #29 from hyperspacedev/attract-theme ... Update themes and empty text padding CSS	2019-04-27 19:18:03 -04:00
Marquis Kurt	549cf39c75	Hide "Not from x?" message when defederated	2019-04-27 19:15:50 -04:00
Marquis Kurt	3010a77c9b	Merge branch 'b2u3' of github.com:hyperspacedev/hyperspace into defederate	2019-04-27 19:05:16 -04:00