bfd25a5c3f
Update es.json
2019-05-06 08:38:24 +00:00
cf72ebb407
update copy
2019-05-03 11:40:05 -04:00
5d0bae5569
update generic error message
2019-05-03 11:40:05 -04:00
d115d98a1b
add translations
2019-05-03 11:40:05 -04:00
2cda9010df
add user reporting modal
2019-05-03 11:40:05 -04:00
0438031da4
Merge branch 'develop' into 'develop'
...
[i18n]Update oc.json
See merge request pleroma/pleroma-fe!777
2019-05-03 14:57:04 +00:00
09253420a2
Update es.json
2019-05-03 00:22:14 +00:00
b98bab52a9
Update oc.json
2019-05-01 16:40:40 +00:00
b1bd5bd08e
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
...
# Conflicts:
# src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
95bc2d727b
add “export blocks” feature
2019-04-27 08:31:06 -04:00
08eaf9bd33
make reusable Exporter component
2019-04-27 08:31:06 -04:00
0ab2f9dfa5
add “block import” feature
2019-04-27 08:31:06 -04:00
6d0e98a1c2
make Importer component reusable
2019-04-27 08:31:06 -04:00
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
55823b8d67
add BBCode strings
2019-04-26 22:48:21 +00:00
2b5cf61a8f
firefox
2019-04-24 21:53:51 +03:00
8af8f719e4
fix i18n
2019-04-22 21:37:27 +03:00
ed9aa8df76
Update oc.json
2019-04-20 14:44:43 +00:00
213891ac71
Update oc.json
2019-04-20 14:38:04 +00:00
69468c7c41
Update oc.json
2019-04-20 14:35:14 +00:00
44f18caf4d
Update oc.json
2019-04-20 14:29:04 +00:00
ac9ddfb1e2
support i18n
2019-04-17 11:32:49 -04:00
d874ca905c
support i18n
2019-04-14 23:44:50 -04:00
fd171da0dc
attempt at making it work
2019-04-13 18:28:50 +03:00
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
70071b870f
#469 - update text copy
2019-04-02 12:46:22 -04:00
67258571c5
#469 - update behavior of safe_dm
2019-04-02 11:19:45 -04:00
6b6878bde0
Added moderation menu
2019-04-01 23:30:06 +03:00
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
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
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
dee9ab7bda
#470 - update button text capitalization
2019-04-01 13:04:40 -04:00
6847e70a49
#470 - update i18n
2019-04-01 12:58:23 -04:00
6828c7d74c
Update Polish translation
2019-03-31 13:50:51 +00:00
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
e1e0b8b254
Update oc.json for !611 and !691
2019-03-27 18:46:40 +00:00
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
9857002bf5
Add hideMutedPosts setting and wire up to post-returning endpoints
2019-03-21 16:33:02 -04:00
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
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
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
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
3108722eda
Add button to save without cropping
2019-03-18 18:19:42 -07:00
5717d97182
#442 - update placeholder linebreak
2019-03-18 10:35:13 -04:00
543cc0d285
#442 - clean up Bio placeholder text
2019-03-17 16:59:08 -04:00
7babbce522
[i18n] Update oc.json
2019-03-15 17:23:30 +00:00
3c5c09c74f
Merge branch 'develop' into feature/version-info
2019-03-13 15:24:09 -07:00
03f1b95252
fixing typos and badly translated strings
2019-03-11 18:26:40 -03:00
130fb7ae1e
#434 - fix plain text issue
2019-03-11 16:48:27 -04:00
3414fce53b
I18n: Update Czech translation
2019-03-11 14:28:44 +00:00
068c9724e4
Added new tab to display versions of BE/FE
2019-03-10 16:58:12 -07:00
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
292cdfb24b
Merge content types translations
2019-03-06 20:13:04 -08:00
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
f91e4a5801
Load post status content type from instance config
2019-03-04 21:29:56 -08:00
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
5a273d528f
Update oc.json
2019-03-04 18:53:16 +00:00
4ab3e29877
Merge branch 'develop' into 'develop'
...
Portuguese translation update
See merge request pleroma/pleroma-fe!637
2019-03-04 18:21:14 +00:00
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
a2a3bda1f6
more pt strings
2019-03-04 08:36:35 -03:00
116a51e949
more pt strings
2019-03-03 19:42:02 -03:00
ae1a9a8626
More strings
2019-03-03 19:03:11 -03:00
793abed7ed
Translating more strings
2019-03-03 21:55:16 +00:00
3e16b5a2e0
Update of the Occitan file.
...
Not at 100% but more complete then what it was.
2019-03-03 19:06:32 +00:00
6184c88ac7
Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:45:17 +02:00
93f5f94698
I18n: Add Czech translation
2019-03-02 18:25:49 +01:00
a884bbb6a6
Update and complete the Esperanto translation
2019-03-02 17:50:59 +01:00
c4f8426349
Re-do status header a bit, add more consistent spacing to status
2019-03-02 16:35:38 +00:00
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
c71f411ad6
Show only "app_name" and "valid_until" (OAuth tokens table)
2019-02-28 04:05:54 +03:00
2c7406d9a8
Add OAuth Tokens management to settings
2019-02-28 04:04:26 +03:00
95fb768b5a
Fix #399 Make max attachments configurable
2019-02-27 14:38:58 +00:00
b78227456e
Better error handling
2019-02-26 12:26:04 -05:00
e687b58091
Show error message when visit profile page of invalid user
2019-02-26 11:08:13 -05:00
20c68d33eb
#396 : update en.json
2019-02-24 15:44:06 -05:00
8275f2aa9a
#396 : update registration form
2019-02-24 14:30:29 -05:00
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
85d43d17f5
Add missing translation strings
2019-02-20 13:30:31 -05:00
395d212904
Add new strings to i18n
2019-02-20 13:30:31 -05:00
e91a94ff9c
Add mutes tab
2019-02-20 13:30:30 -05:00
52913d8f87
Complete functionality of BlockCard
2019-02-20 13:30:30 -05:00
0220d3d304
Finally, added BlockCard
2019-02-20 13:30:30 -05:00
a56d2dfeb1
Add blocks tab with test data to user settings page
2019-02-20 13:30:30 -05:00
e20a7be3aa
#376 : update status timeline when it's empty
2019-02-20 10:13:28 -05:00
32df77c16a
Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop
2019-02-19 18:34:09 +02:00
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
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
e801d78e9d
Take over branch and fix some issues
2019-02-17 18:54:22 +02:00
b24db12e1c
Make embedded image cropper
2019-02-15 13:34:33 -05:00
228e6681e3
Localization of ImageCropper component
2019-02-15 13:34:33 -05:00
a001ffecf0
Add back the existing translation string
2019-02-15 13:34:33 -05:00
13725f040b
Add avatar crop popup
2019-02-15 13:34:33 -05:00
0f06cd6af5
update japanese translation
2019-02-15 13:16:34 +09:00
2226f80076
Update spanish translate - es.json
2019-02-11 18:29:56 +00:00
971e75aa64
Add translation strings
2019-02-10 13:26:08 -05:00
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
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
b129049fed
Update spanish translate
2019-02-08 13:42:02 +00:00
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
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
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
b3823b79b4
Grammar
2019-02-06 22:00:31 +00:00
e107ed8ddc
Merge branch 'develop' into feature/add-an-option-for-a-default-formatting
2019-02-06 14:28:50 -05:00
460976c6e5
#301 - add an option for default formatting
2019-02-06 14:26:46 -05:00
fbdb7d3d95
Add german translation for option label
2019-02-06 10:50:21 -08:00
a57f8bdd68
Add option to hide filtered statuses
2019-02-06 10:18:13 -08:00
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
d00b74b607
Refactor visibleRole for better readability
...
Improve translation
2019-02-06 18:07:37 +03:00
648f635429
Allow to configure visibility for admin and moderator badges
2019-02-06 18:07:10 +03:00
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
0c5c889850
Rename "hide_following" to "hide_follows"
2019-02-06 14:21:13 +03:00
e4c0bbddd9
Merge branch 'develop' into fix/create-a-login-hint-on-mobile
2019-02-06 04:37:00 -05:00
18594569bd
Split hide_network into hide_followers & hide_followings
2019-02-06 02:59:59 +03:00
37c7d850f1
Update es.json
2019-02-05 22:20:45 +00:00
c758d103bd
fix #308 - show login hint above timeline when user is not logged in
2019-02-05 13:47:27 -05:00
54e7e0e31b
merge develop and fix conflicts AGAIN
2019-02-04 19:49:23 +02:00
d4991d0162
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !497
2019-02-03 14:32:23 +00:00
18ae7bd5f3
Combine friends/followers
2019-02-03 11:58:49 +02:00
c7ee2ed831
Merge branch '238-add-avatar-size-suggestion' into 'develop'
...
Add avatar size instruction notice
Closes #238
See merge request pleroma/pleroma-fe!512
2019-02-03 07:05:38 +00:00
d8ad494081
Add avatar size instruction notice
2019-02-02 20:39:41 -05:00
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
c7cffbb6c7
Merge branch 'develop' into feat/media-modal
2019-01-30 20:49:24 +02:00
1717e70046
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
...
fix #292 dont show "load more" when bottomed out
Closes #292
See merge request pleroma/pleroma-fe!496
2019-01-30 17:49:27 +00:00
298cea8f6d
Split hide_network into hide_followers & hide_followings
2019-01-30 01:11:40 +03:00
62e9525724
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
2019-01-29 21:04:52 +02:00
51024a2c8a
Merge branch 'develop' into feat/media-modal
2019-01-28 19:02:46 +02:00
2585dfa4c2
Merge branch 'develop' into 'develop'
...
Add Dutch translation
See merge request pleroma/pleroma-fe!482
2019-01-28 04:32:55 +00:00
d40a2f0429
Add Dutch translation
2019-01-27 19:44:17 +01:00
0ab828bb30
Merge develop and fix conflict
2019-01-26 17:50:41 +02:00
3978aaef84
Redo everything in the MR
2019-01-26 17:45:03 +02:00
7b296696a3
user profile: add media timeline
2019-01-26 13:49:24 +00:00
3a3cf1d48a
Merge branch 'favorites' into 'develop'
...
Add Favorites TL to user profile, add some initial support for MastoAPI
Closes #265 and #262
See merge request pleroma/pleroma-fe!462
2019-01-22 17:46:08 +00:00
a680f7d684
localization strings
2019-01-17 22:49:33 +03:00
fc83d76ab5
update japanese translation
2019-01-16 18:14:15 +09:00
05ead45fb7
Show who to follow in the mobile view
2019-01-16 02:33:08 +00:00
d4eb3cb36b
Add Korean translation
2019-01-10 14:56:05 +09:00
a60fc390a0
Add instance information page for mobile
2019-01-07 17:26:47 +00:00
681b4e665d
updated German translation
...
* added theme settings
* added various missing single strings
2019-01-03 19:53:53 +01:00
650655709d
fix conflict in user card content
2018-12-28 21:44:09 +02:00
8ae3518a9a
Update japanese translation
2018-12-25 09:03:05 +00:00
f72b1d048e
Merge branch 'develop' into feature/replace-panel-switcher
2018-12-22 17:32:35 +02:00
4836c8ac74
Add some more routes to side drawer
2018-12-22 17:32:07 +02:00
10642df528
Add a translation to the captcha strings in the registration form
2018-12-21 15:12:46 +03:00
d7973b0b80
Merge remote-tracking branch 'upstream/develop' into async_follow
...
* upstream/develop: (45 commits)
fix chrome
Prevent html-minifier to remove placeholder comment in index.html template
Add placeholder to insert server generated metatags. Related to #430
added condition to check for logined user
fix gradients and minor artifacts
keep track of new instance options
fix old MR
oof
get rid of slots
fix timeago font
added hide_network option, fixed properties naming
Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
improve notification subscription
Refactor arrays to individual options
Reset enableFollowsExport to true after 2 sec when an export file is available to download
Write a unit test for fileSizeFormatService
add checkbox to disable web push
I am dumb
Handle errors from server
Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
...
2018-12-14 17:17:58 +03:00
99b2b7a203
Merge branch 'feature/file-size-checking' into 'develop'
...
[pleroma#36] Add errors when file uploading fails
See merge request pleroma/pleroma-fe!405
2018-12-13 21:02:17 +00:00
e2f825266a
added condition to check for logined user
2018-12-13 23:20:59 +05:30
610724ffcd
Merge remote-tracking branch 'upstream/develop' into mobile-back
...
* upstream/develop: (142 commits)
fix timeago font
added hide_network option, fixed properties naming
Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
improve notification subscription
Fix typo that prevented scope copy from working.
added check for activatePanel is function or not
addressed PR comments
activate panel on user screen click
added not preload check so hidden toggles asap
removed counters from left panel
added router-links to all relavent links
added activatePanel onclick for timeago button
added PR comments
add checkbox to disable web push
removed brackets from condition
resolved lint issue
renamed config to preload images and add ident to config
added config for preload and made attachment responsive to it
preload nsfw image
fix
...
2018-12-13 17:50:36 +03:00
ad905576fc
Merge branch 'hide_network' into 'develop'
...
FE part of pleroma!490
See merge request pleroma/pleroma-fe!415
2018-12-13 14:40:49 +00:00
6de4dcc7c9
Resolve merge conflict
2018-12-13 17:22:19 +03:00
tarteka
taehoon
Shpuld Shpludson
Exilat
eugenijm
Henry Jameson
William Pitcock
dave
HJ
jared
Marcin Mikołajczak
jasper
Edijs
Rond
Lorem Ipsum
aaabulafiaaa
Tirifto
Maxim Filippov
Hakaba Hitoyo
HJ
Mark Felder
Xiaofeng An
lambda
spctrl
Hakaba Hitoyo
kjwon15
Vinzenz Vietzke
Ekaterina Vaartis
ValD
Rinpatch