Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3805 commits 59 branches 16 tags 15 MiB
Commit graph

3805 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shpuld Shpludson
e7ff9b5227 Merge branch '600-2' into 'develop' 
Preserve formatting of status content

Closes #600

See merge request pleroma/pleroma-fe!872
 2019-07-07 10:21:55 +00:00
Shpuld Shpludson
19b5aea081 Merge branch 'preserve-follows-followers-visibility-settings' into 'develop' 
Set hide_follows and hide_followers settings when parsing Mastodon format

See merge request pleroma/pleroma-fe!873
 2019-07-07 10:20:55 +00:00
Eugenij
14ec12b4f6 Set hide_follows and hide_followers settings when parsing Mastodon format 2019-07-07 10:20:55 +00:00
Shpuld Shpludson
e80ed386be Merge branch 'fix-hmr' into 'develop' 
fix hot reload always reloading the page

See merge request pleroma/pleroma-fe!874
 2019-07-07 10:20:36 +00:00
Henry Jameson
020c6d1bcf all the manual fixes 2019-07-07 00:54:17 +03:00
Henry Jameson
1ec4caa0bb fix merge conflict 2019-07-06 23:52:10 +03:00
HJ
8f53796420 Merge branch 'develop' into 'eslint-fix' 
# Conflicts:
#   src/components/post_status_form/post_status_form.vue
 2019-07-06 20:43:38 +00:00
Henry Jameson
4991e34c49 fix hot reload always reloading the page 2019-07-06 23:42:03 +03:00
Egor Kislitsyn
9fc9925488 Use target from the settings 2019-07-06 18:14:19 +07:00
taehoon
bba4b57dd8 preserve formatting of content 2019-07-05 21:57:48 -04:00
taehoon
c712754150 add unit tests 2019-07-05 13:38:52 -04:00
taehoon
66842efd81 update regex for commit hash 2019-07-05 11:11:31 -04:00
Shpuld Shpludson
60b413d02c Merge branch '602' into 'develop' 
Fix mixed profiles bug on user profile page

Closes #586

See merge request pleroma/pleroma-fe!865
 2019-07-05 13:28:15 +00:00
Shpuld Shpludson
7ec02445cc Merge branch 'develop' into 'develop' 
[i18n] Update of the Occitan translation

See merge request pleroma/pleroma-fe!866
 2019-07-05 13:22:49 +00:00
Shpuld Shpludson
4f0ba97be9 Merge branch '603' into 'develop' 
Hide text format when only plaintext is available

Closes #603

See merge request pleroma/pleroma-fe!867
 2019-07-05 13:22:04 +00:00
Henry Jameson
8d6750d9c2 eslint --fix --ext .js,.vue src 2019-07-05 10:17:44 +03:00
Henry Jameson
2c2b84d31d npm eslint --fix . 2019-07-05 10:02:14 +03:00
HJ
6bea363b9d Merge branch 'fix-android-emoji-autocompletion' into 'develop' 
Fix android emoji autocompletion

Closes #606

See merge request pleroma/pleroma-fe!869
 2019-07-04 18:55:13 +00:00
Henry Jameson
f86f4b514f Support compositionupdate event to properly show autocomplete popup for IMEs and 
android
 2019-07-03 23:08:51 +03:00
taehoon
6c6aa8446d place scope selector on the left consistently 2019-07-03 12:19:25 -04:00
taehoon
0c102deeed hide text format when only plaintext is available 2019-07-02 16:36:14 -04:00
taehoon
d8e210df4d update test for clearTimeline action 2019-07-02 15:07:18 -04:00
taehoon
b70c2bfef7 make sure that user timelines are empty when opening profile page 2019-07-02 14:43:01 -04:00
taehoon
0e9b8be88c clear userId property of timeline by default in clearTimeline action 2019-07-02 14:32:46 -04:00
Egor Kislitsyn
52319acf58 Revoke oAuth token 2019-07-02 15:33:40 +07:00
Exilat
fe500c44ed Update oc.json 2019-06-30 14:24:34 +00:00
HJ
225090bb79 Apply suggestion to docs/CONFIGURATION.md 2019-06-28 12:29:44 +00:00
Henry Jameson
b3e9a5a718 fix link? 2019-06-27 21:27:51 +03:00
Henry Jameson
e1c2cf47ce PROFILE 2019-06-27 21:26:52 +03:00
HJ
6afee3013f fix email highlight 2019-06-26 21:19:35 +00:00
Henry Jameson
277553094b formatting fix 2019-06-27 00:16:42 +03:00
Henry Jameson
c79c8f26c8 deletion update 2019-06-27 00:15:27 +03:00
Henry Jameson
185a4d8ab2 DOCUMENTATION 2019-06-27 00:10:51 +03:00
Henry Jameson
27b898f5c9 More configuration 2019-06-26 23:44:05 +03:00
Henry Jameson
926285685b HACKERMAN 2 2019-06-26 23:16:06 +03:00
HJ
69d3b8b20e Merge branch 'docs-settings' into 'docs' 
Documentations: Add docs for settings.

See merge request pleroma/pleroma-fe!851
 2019-06-26 12:24:30 +00:00
HJ
3354aea356 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:51:38 +00:00
HJ
0fc04893af Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:48:25 +00:00
HJ
624277c406 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:48 +00:00
HJ
afb8ef1983 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:31 +00:00
HJ
c95a3f0a1a Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:30 +00:00
HJ
c6a29b48eb Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:47:26 +00:00
HJ
0892c13c2c Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:19 +00:00
HJ
0b4c6127c5 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:16 +00:00
HJ
b02a92e9f6 Apply suggestion to docs/USER_GUIDE.md 2019-06-26 11:46:13 +00:00
HJ
221db9f210 Merge branch 'fix-emoji-input' into 'develop' 
fix all known problems with clicks on autocomplete emojis

See merge request pleroma/pleroma-fe!857
 2019-06-25 21:38:45 +00:00
Henry Jameson
82464b3a7e review 2019-06-26 00:34:09 +03:00
Henry Jameson
9dbafa4c78 lint fix 2019-06-25 21:39:33 +03:00
Henry Jameson
01bda605a7 fix all known problems with clicks on autocomplete emojis 2019-06-25 21:31:43 +03:00
Shpuld Shpludson
a6bcd56c9f Merge branch 'fix/gallery-margin-fix' into 'develop' 
fix specificity that made attachments misalign

See merge request pleroma/pleroma-fe!855
 2019-06-25 16:30:21 +00:00