Henry Jameson
e0247e21f6
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (126 commits)
entity normalizer: hook up in_reply_to_account_acct
add BBCode strings
fix follow button not updating bug in follow-card
refer searched user objects from the global user rep
set max-width of textarea in settings page
Remove space in the timeline setting copy
user_card.vue: Fix .emoji to apply to img
Update oc.json
Update oc.json
Update oc.json
Update oc.json
replace pencil with wrench icon
rebuild fontello with wrench icon added
fetch all friends using pagination
stop fetching user relationship when user is unauthorized
Revert "recover border between basic-user-card using list component"
remove extra spacing
code readability
fix typos
clean up
...
2019-04-27 12:26:17 +03:00
William Pitcock
55823b8d67
add BBCode strings
2019-04-26 22:48:21 +00:00
Henry Jameson
2b5cf61a8f
firefox
2019-04-24 21:53:51 +03:00
shpuld
8af8f719e4
fix i18n
2019-04-22 21:37:27 +03:00
Exilat
ed9aa8df76
Update oc.json
2019-04-20 14:44:43 +00:00
Exilat
213891ac71
Update oc.json
2019-04-20 14:38:04 +00:00
Exilat
69468c7c41
Update oc.json
2019-04-20 14:35:14 +00:00
Exilat
44f18caf4d
Update oc.json
2019-04-20 14:29:04 +00:00
taehoon
ac9ddfb1e2
support i18n
2019-04-17 11:32:49 -04:00
taehoon
d874ca905c
support i18n
2019-04-14 23:44:50 -04:00
Henry Jameson
fd171da0dc
attempt at making it work
2019-04-13 18:28:50 +03:00
Shpuld Shpludson
546ced43d9
Merge branch 'moderation-menu' into 'develop'
...
Moderation menu #310
See merge request pleroma/pleroma-fe!595
2019-04-08 19:01:40 +00:00
dave
70071b870f
#469 - update text copy
2019-04-02 12:46:22 -04:00
dave
67258571c5
#469 - update behavior of safe_dm
2019-04-02 11:19:45 -04:00
eugenijm
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
Shpuld Shpludson
a595febcb8
Merge branch 'develop' into 'develop'
...
[i18n] Update oc.json for !611 and !691
See merge request pleroma/pleroma-fe!712
2019-04-01 19:49:16 +00:00
Shpuld Shpludson
3b38e1b8a7
Merge branch 'patch-2' into 'develop'
...
Update Polish translation
See merge request pleroma/pleroma-fe!719
2019-04-01 19:44:11 +00:00
HJ
3c2931529e
Merge branch 'minimal-scopes-mode' into 'develop'
...
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
See merge request pleroma/pleroma-fe!633
2019-04-01 19:32:37 +00:00
jared
dee9ab7bda
#470 - update button text capitalization
2019-04-01 13:04:40 -04:00
jared
6847e70a49
#470 - update i18n
2019-04-01 12:58:23 -04:00
Marcin Mikołajczak
6828c7d74c
Update Polish translation
2019-03-31 13:50:51 +00:00
Henry Jameson
9f4a9bff46
Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode
...
* upstream/develop: (173 commits)
Fix: Change condition
fix typo
update store according to retweeted status
#433 - update sort by for conversation
display replies_count right after reply icon
expose replies_count from mastodon api
Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
make side drawer use gesture service and fix its animations
review/remove error hiding
errata
review
#433 - sort conversation for retweets and clean up
Revert "Merge branch 'revert-987b5162' into 'develop'"
Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
Add await to login action'
Remove console log
Fix warnings in user profile routing
Add tests for gesture service, fix bug with perpendicular directions
#255 - clean up autocomplete form
#255 - clean up user settings page with self-closing html tags
...
2019-03-30 12:31:50 +02:00
Exilat
e1e0b8b254
Update oc.json for !611 and !691
2019-03-27 18:46:40 +00:00
HJ
2f1e690478
Merge branch 'issue-442-placeholder-fix' into 'develop'
...
#442 - clean up Bio placeholder text
Closes #442
See merge request pleroma/pleroma-fe!689
2019-03-25 22:29:17 +00:00
taehoon
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
Shpuld Shpludson
9890e41440
Merge branch 'feature/bypass-avatar-cropper' into 'develop'
...
#443 Add button to save without cropping
Closes #443
See merge request pleroma/pleroma-fe!691
2019-03-21 15:44:26 +00:00
Shpuld Shpludson
9e17853b2c
Merge branch 'patch-2' into 'develop'
...
[i18n] Update oc.json
See merge request pleroma/pleroma-fe!684
2019-03-21 15:38:19 +00:00
Shpuld Shpludson
a284a267ce
Merge branch 'develop' into 'develop'
...
Fixing typos and badly translated strings (Portuguese)
See merge request pleroma/pleroma-fe!676
2019-03-21 15:37:05 +00:00
Shpuld Shpludson
57cd6f8018
Merge branch 'feature/version-info' into 'develop'
...
Added new tab to display versions of BE/FE
Closes #397
See merge request pleroma/pleroma-fe!671
2019-03-21 15:25:59 +00:00
jasper
3108722eda
Add button to save without cropping
2019-03-18 18:19:42 -07:00
dave
5717d97182
#442 - update placeholder linebreak
2019-03-18 10:35:13 -04:00
dave
543cc0d285
#442 - clean up Bio placeholder text
2019-03-17 16:59:08 -04:00
Exilat
7babbce522
[i18n] Update oc.json
2019-03-15 17:23:30 +00:00
Edijs
3c5c09c74f
Merge branch 'develop' into feature/version-info
2019-03-13 15:24:09 -07:00
Rond
03f1b95252
fixing typos and badly translated strings
2019-03-11 18:26:40 -03:00
dave
130fb7ae1e
#434 - fix plain text issue
2019-03-11 16:48:27 -04:00
Lorem Ipsum
3414fce53b
I18n: Update Czech translation
2019-03-11 14:28:44 +00:00
Edijs
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
Shpuld Shpludson
bf1fa52e5e
Merge branch 'fix/post-content-type' into 'develop'
...
#327 : Load post status content type from instance config
Closes #327
See merge request pleroma/pleroma-fe!641
2019-03-07 16:03:06 +00:00
Edijs
292cdfb24b
Merge content types translations
2019-03-06 20:13:04 -08:00
Shpuld Shpludson
423e1b3b12
Merge branch 'i18n-cs' into 'develop'
...
I18n: Add Czech translation
See merge request pleroma/pleroma-fe!627
2019-03-06 20:23:46 +00:00
Edijs
f91e4a5801
Load post status content type from instance config
2019-03-04 21:29:56 -08:00
Shpuld Shpludson
3e4d465eba
Merge branch 'patch-2' into 'develop'
...
Update of the Occitan file.
See merge request pleroma/pleroma-fe!635
2019-03-04 19:27:38 +00:00
Exilat
5a273d528f
Update oc.json
2019-03-04 18:53:16 +00:00
Shpuld Shpludson
4ab3e29877
Merge branch 'develop' into 'develop'
...
Portuguese translation update
See merge request pleroma/pleroma-fe!637
2019-03-04 18:21:14 +00:00
Shpuld Shpludson
d6e9ad3b61
Merge branch 'develop' into 'develop'
...
Update and complete the Esperanto translation
See merge request pleroma/pleroma-fe!630
2019-03-04 16:11:17 +00:00
aaabulafiaaa
a2a3bda1f6
more pt strings
2019-03-04 08:36:35 -03:00
aaabulafiaaa
116a51e949
more pt strings
2019-03-03 19:42:02 -03:00
aaabulafiaaa
ae1a9a8626
More strings
2019-03-03 19:03:11 -03:00
rondnelly assis
793abed7ed
Translating more strings
2019-03-03 21:55:16 +00:00
Exilat
3e16b5a2e0
Update of the Occitan file.
...
Not at 100% but more complete then what it was.
2019-03-03 19:06:32 +00:00
Henry Jameson
6184c88ac7
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:45:17 +02:00
Aditoo17
93f5f94698
I18n: Add Czech translation
2019-03-02 18:25:49 +01:00
Tirifto
a884bbb6a6
Update and complete the Esperanto translation
2019-03-02 17:50:59 +01:00
Shpuld Shpludson
c4f8426349
Re-do status header a bit, add more consistent spacing to status
2019-03-02 16:35:38 +00:00
Shpuld Shpludson
dc01f90dde
Merge branch '386-display-invalid-user-profile' into 'develop'
...
Show error message when visit profile page of invalid user
Closes #386
See merge request pleroma/pleroma-fe!606
2019-02-28 17:19:14 +00:00
Maxim Filippov
c71f411ad6
Show only "app_name" and "valid_until" (OAuth tokens table)
2019-02-28 04:05:54 +03:00
Maxim Filippov
2c7406d9a8
Add OAuth Tokens management to settings
2019-02-28 04:04:26 +03:00
Shpuld Shpludson
95fb768b5a
Fix #399 Make max attachments configurable
2019-02-27 14:38:58 +00:00
taehoon
b78227456e
Better error handling
2019-02-26 12:26:04 -05:00
taehoon
e687b58091
Show error message when visit profile page of invalid user
2019-02-26 11:08:13 -05:00
dave
20c68d33eb
#396 : update en.json
2019-02-24 15:44:06 -05:00
dave
8275f2aa9a
#396 : update registration form
2019-02-24 14:30:29 -05:00
Shpuld Shpludson
e34e1ccdae
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
2019-02-22 14:54:12 +00:00
taehoon
85d43d17f5
Add missing translation strings
2019-02-20 13:30:31 -05:00
taehoon
395d212904
Add new strings to i18n
2019-02-20 13:30:31 -05:00
taehoon
e91a94ff9c
Add mutes tab
2019-02-20 13:30:30 -05:00
taehoon
52913d8f87
Complete functionality of BlockCard
2019-02-20 13:30:30 -05:00
taehoon
0220d3d304
Finally, added BlockCard
2019-02-20 13:30:30 -05:00
taehoon
a56d2dfeb1
Add blocks tab with test data to user settings page
2019-02-20 13:30:30 -05:00
dave
e20a7be3aa
#376 : update status timeline when it's empty
2019-02-20 10:13:28 -05:00
shpuld
32df77c16a
Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop
2019-02-19 18:34:09 +02:00
Shpuld Shpludson
7b9a6f8d43
Merge branch '256-avatar-crop-popup' into 'develop'
...
Add avatar cropper
Closes #256
See merge request pleroma/pleroma-fe!547
2019-02-19 15:37:01 +00:00
Shpuld Shpludson
ed3c318be0
Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop'
...
Fix followers/follows UI, fix #343 fix #340
Closes #340 and #343
See merge request pleroma/pleroma-fe!590
2019-02-19 14:47:32 +00:00
shpuld
e801d78e9d
Take over branch and fix some issues
2019-02-17 18:54:22 +02:00
taehoon
b24db12e1c
Make embedded image cropper
2019-02-15 13:34:33 -05:00
taehoon
228e6681e3
Localization of ImageCropper component
2019-02-15 13:34:33 -05:00
taehoon
a001ffecf0
Add back the existing translation string
2019-02-15 13:34:33 -05:00
taehoon
13725f040b
Add avatar crop popup
2019-02-15 13:34:33 -05:00
Hakaba Hitoyo
0f06cd6af5
update japanese translation
2019-02-15 13:16:34 +09:00
tarteka
2226f80076
Update spanish translate - es.json
2019-02-11 18:29:56 +00:00
taehoon
971e75aa64
Add translation strings
2019-02-10 13:26:08 -05:00
Shpuld Shpludson
d2d06983c9
Merge branch 'patch-2' into 'develop'
...
Update spanish translate
See merge request pleroma/pleroma-fe!549
2019-02-09 07:06:40 +00:00
Shpuld Shpludson
531f150dd3
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
...
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
2019-02-09 06:47:29 +00:00
tarteka
b129049fed
Update spanish translate
2019-02-08 13:42:02 +00:00
HJ
62b3b9b8d4
Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'
...
Add admin and moderator indicators to the user profile
See merge request pleroma/pleroma-fe!519
2019-02-07 22:45:08 +00:00
eugenijm
19dbdd24b4
Update user settings text: staff badges are only visible in user profile
...
Use capitalized text in badges
2019-02-08 01:33:24 +03:00
Shpuld Shpludson
85e281d406
Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop'
...
#301 - add an option for a default formatting
See merge request pleroma/pleroma-fe!541
2019-02-07 15:55:54 +00:00
Mark Felder
b3823b79b4
Grammar
2019-02-06 22:00:31 +00:00
Xiaofeng An
e107ed8ddc
Merge branch 'develop' into feature/add-an-option-for-a-default-formatting
2019-02-06 14:28:50 -05:00
Xiaofeng An
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
jasper
fbdb7d3d95
Add german translation for option label
2019-02-06 10:50:21 -08:00
jasper
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
Shpuld Shpludson
6cca15bade
Merge branch 'fix/create-a-login-hint-on-mobile' into 'develop'
...
create a login hint on mobile
Closes #308
See merge request pleroma/pleroma-fe!530
2019-02-06 18:13:56 +00:00
eugenijm
d00b74b607
Refactor visibleRole for better readability
...
Improve translation
2019-02-06 18:07:37 +03:00
eugenijm
648f635429
Allow to configure visibility for admin and moderator badges
2019-02-06 18:07:10 +03:00
Shpuld Shpludson
6a867f6ae3
Merge branch 'feature/split-hide-network-fixed' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma-fe!536
2019-02-06 14:38:50 +00:00
Maxim Filippov
0c5c889850
Rename "hide_following" to "hide_follows"
2019-02-06 14:21:13 +03:00
Xiaofeng An
e4c0bbddd9
Merge branch 'develop' into fix/create-a-login-hint-on-mobile
2019-02-06 04:37:00 -05:00
Maxim Filippov
18594569bd
Split hide_network into hide_followers & hide_followings
2019-02-06 02:59:59 +03:00