Commit Graph

595 Commits

Author SHA1 Message Date
audmaxwell 8b1142fd7d HD-4 Wrote clipboard processor, changed actuallyUploadMedia params 2019-11-24 15:29:55 -05:00
audmaxwell 8c1c0573f8 Merge branch 'develop-1.1.0-beta1' into copy-paste-image
# Conflicts:
#	package.json
2019-11-24 14:53:27 -05:00
Marquis Kurt ee865cd494
Merge pull request #128 from hyperspacedev/develop-1.1.0-iconify
Update empty pages with new iconified design
2019-11-24 14:50:29 -05:00
Marquis Kurt 83e97c343b
Merge branch 'develop-1.1.0-beta1' into develop-1.1.0-iconify 2019-11-24 14:50:18 -05:00
Marquis Kurt d8d5b52609
Merge pull request #130 from hyperspacedev/HD-23-emergency-login-fix
[HD-23] Emergency login fix
2019-11-24 14:39:43 -05:00
Marquis Kurt 78a9ff6c2a
Comment out MAS links in README 2019-11-23 14:40:36 -05:00
Marquis Kurt 15d654b662
Remove HTTPS=true from start script 2019-11-23 14:06:18 -05:00
Marquis Kurt 2e2ae7e48b
Merge branch 'master' into 1.0.4-patches 2019-11-23 12:59:12 -05:00
Marquis Kurt a47631cbb1
Merge branch 'staging' into develop-1.1.0-beta1 2019-11-23 12:58:12 -05:00
Marquis Kurt ae295992df
Merge branch 'master' into staging 2019-11-23 12:57:11 -05:00
Marquis Kurt 33a2c2468c
Change default Jira issue type to "Unsorted" 2019-11-23 12:52:25 -05:00
Marquis Kurt e98372d785
HD-23 Perform a check if the redirect address is set to desktop before authing emergency login 2019-11-22 16:22:17 -05:00
Marquis Kurt fe001a716a
HD-23 Update package lock (#129) 2019-11-22 12:15:44 -05:00
Marquis Kurt a61e31a0b5
Re-run Prettier on Activity file 2019-11-21 11:03:04 -05:00
Marquis Kurt 86047e649c
Update TS dependency to 3.7.2 2019-11-21 11:00:42 -05:00
Marquis Kurt 3a0f75b97f
Update Recommendations text 2019-11-21 10:54:54 -05:00
Marquis Kurt 7a977aeddd
Iconify Activity, Messages, Notifications, and Recommendations 2019-11-21 10:50:10 -05:00
Marquis Kurt 0d27cabe53
Merge branch 'develop-1.1.0-beta1' of github.com:hyperspacedev/hyperspace into copy-paste-image 2019-11-21 10:10:18 -05:00
Marquis Kurt f36000a939
Add Activity menu entry, remove ellipses from Recommendations 2019-11-21 10:09:57 -05:00
Marquis Kurt dbe2319ea4
Merge branch '1.0.4-patches' of github.com:hyperspacedev/hyperspace into HD-21-emoji-picker 2019-11-21 10:03:17 -05:00
Marquis Kurt 9d6cb2525f
Fix hardcoded about menu entry 2019-11-21 10:02:49 -05:00
Marquis Kurt e6ab97be66
HD-21 Return undefined in EmojiPicker's retrieveFromLocal if the localStorage item is null 2019-11-19 17:46:03 -05:00
Marquis Kurt 2ad8c8fb45
Bump version to 1.0.4 2019-11-19 17:36:02 -05:00
audmaxwell 86c0b151b8 HD-4 added eventlistener for pasteevent 2019-11-19 17:01:19 -05:00
Marquis Kurt aedb332f68
[HD-19 #resolve] Merge pull request #126 2019-11-19 15:52:42 -05:00
Marquis Kurt a41c543311
Apply settings to composer (HD-19)
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-17 14:15:59 -05:00
Marquis Kurt d8f3bf8a26
Create setting for imposing a char limit (HD-19)
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-17 13:55:53 -05:00
Marquis Kurt 0e81ae527c
Finish merge with v1.0.3
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-17 13:13:36 -05:00
Marquis Kurt 034458ed4c
Finish merge of v1.0.3
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-16 17:04:11 -05:00
Marquis Kurt 3c8c54dc96
Merge pull request #124 [HD-8 #close]
[HD-8] v1.0.3
2019-11-16 16:34:04 -05:00
Marquis Kurt a2a9edcb5b
Merge pull request #123 from hyperspacedev/1.0.3-pleroma-about-fix
[HD-17] Fix Pleroma about page blank regression
2019-11-16 16:13:57 -05:00
Marquis Kurt f9dd8a5801
Remove isPleroma from localStorage, window reload on account storage change [HD-17]
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-13 12:02:59 -05:00
Marquis Kurt 72cc633d18
Write shouldRenderInstanceContact method in About [HD-12 #start-progress]
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-13 11:46:52 -05:00
Marquis Kurt 3bc3f59dda
Catch other areas missed for HD-12 (titlebar, Electron menu)
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-12 10:31:32 -05:00
Marquis Kurt d67d900e9c
Merge pull request #122 from hyperspacedev/1.0.3-brand-rename
HD-12 Brand rename
2019-11-11 17:21:28 -05:00
Marquis Kurt eeb3353a9c
Merge PR #121 (fix HD-16)
Add a basic audio player [HD-16]
2019-11-11 17:20:23 -05:00
audmaxwell 448a10ef6f HD-12 Changed "Hyperspace" strings in the about page to "Hyperspace Desktop" 2019-11-11 17:09:20 -05:00
Marquis Kurt 2720d5e774
HD-16 Prepare for PR
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-11 13:15:54 -05:00
Marquis Kurt 0293ff0d60
Update audio player styles
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-11 13:10:07 -05:00
Marquis Kurt 761946c2b5
Complete functionality of audio player, fix some attachment styles
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-11 13:06:35 -05:00
Marquis Kurt d254de3fbf
Create dummy AudioPlayer component
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-11 11:39:56 -05:00
Marquis Kurt a13e561f5b
Add basic HTML5 audio component to audio files
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-11 11:31:04 -05:00
Marquis Kurt b31b9cce9d
Merge pull request #112 from hyperspacedev/develop-1.1.0-trending
Add Activity page
2019-11-10 13:54:24 -05:00
Marquis Kurt f9945250ed
Merge changes from master
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
2019-11-06 11:56:21 -05:00
Marquis Kurt 923e8dd944
Merge branch 'master' into develop-1.1.0-beta1 2019-11-06 11:54:40 -05:00
Marquis Kurt ae09fc57dd
Update CODEOWNERS 2019-11-06 11:47:28 -05:00
Marquis Kurt c8298dd9bc
Update Jira base URL 2019-11-06 11:27:18 -05:00
Marquis Kurt 52e703c790
Merge pull request #117 from hyperspacedev/jira
Update and rename main.yml to jira-create.yml
2019-11-06 11:24:24 -05:00
Marquis Kurt b16d4b6969
Update and rename main.yml to jira-create.yml 2019-11-06 11:19:07 -05:00
Marquis Kurt 94380d8100
Update version in config.json 2019-11-05 09:48:55 -05:00