Exilat
fe500c44ed
Update oc.json
2019-06-30 14:24:34 +00:00
HJ
c4fcdc7125
Merge branch 'mr-origin-740' into 'develop'
...
Update french translation
See merge request pleroma/pleroma-fe!829
2019-06-18 20:39:59 +00:00
lain
0eed2ccca8
Feature/polls attempt 2
2019-06-18 20:28:31 +00:00
Dashie
57dbfc269c
Update translation with review comments
2019-06-18 22:14:02 +02:00
Dashie
64d7dd60cc
Update file with current en.json
2019-06-18 21:22:22 +02:00
Satak
3fcc4ba288
Update fr.json
...
added missing ,
2019-06-18 21:22:21 +02:00
Satak
ceffe72f6f
Update fr.json
...
stoped at line 134, more to do below
2019-06-18 21:22:15 +02:00
Maksim
77eceedbf7
Revert "add TOTP/Recovery Form for mobile version"
...
This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.
2019-06-12 20:16:55 +00:00
Hakaba Hitoyo
322c9fbfb6
i18n/Update Japanese translation
2019-06-11 12:10:47 +00:00
kaniini
b4796ccbf6
Merge branch 'feature/notification-controls' into 'develop'
...
wire up notification settings
See merge request pleroma/pleroma-fe!809
2019-06-01 05:16:15 +00:00
Hakaba Hitoyo
443794b000
i18n/Add Japanese with kanji (2)
2019-05-29 05:31:03 +00:00
William Pitcock
855566f887
notification controls: redesign entirely
2019-05-25 23:44:36 +00:00
William Pitcock
28ca504576
wire up notification settings
2019-05-25 07:34:59 +00:00
j1t
4249a2fd6f
Translation to Hebrew of everything other than theme_helpers and style.
2019-05-22 21:33:05 +03:00
j1t
3b3e4ffc54
Translate up to settings.
2019-05-22 01:46:08 +03:00
HJ
b78ad8998d
Merge branch 'masto-remains' into 'develop'
...
Interactions 2.0, removing last bits of qvitter api. Only login/register and change background remains after that
See merge request pleroma/pleroma-fe!792
2019-05-20 20:54:05 +00:00
HJ
b436e0dd12
Merge branch 'webpack-4-dart-sass' into 'develop'
...
Massive update for dependencies
See merge request pleroma/pleroma-fe!734
2019-05-20 18:09:14 +00:00
Henry Jameson
7976d118ca
Cleanup, little documentation, localization
2019-05-15 20:44:35 +03:00
taehoon
beaf512573
add translation
2019-05-15 12:04:26 -04:00
taehoon
d76bd0044f
fix typo
2019-05-15 12:04:26 -04:00
dave
9fc997500e
#468 - add extra buttons for status actions
2019-05-15 12:04:25 -04:00
tarteka
bacbfc1154
Update es.json
2019-05-15 09:16:49 +00:00
Henry Jameson
750dca4a10
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (116 commits)
Fix small mistake in Polish translation
link interaction avatars to the user profile
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
use backendInteractor
refactor api service functions using new helper
clean up
update favorite number earlier
update status interaction upon retweet action response
sync up favoritedBy with favorite/unfavorite action
do not regenerate status object
reduce needless calculation
Move scope visibility notice to the status form, make it dismissible
Revert "eliminate expandable prop in favor of inConversation"
status attention doesn’t have relationship entities
make it short
fix wrong inlineExpanded
expanded is always false, eliminate it
eliminate expandable prop in favor of inConversation
fix conversationId comparision bug using integer format
Display additional scope description above the status form for mobile users.
...
2019-05-13 20:38:54 +03:00
Marcin Mikołajczak
caf9e627a7
Fix small mistake in Polish translation
2019-05-10 06:52:01 +00:00
HJ
177e53cf6a
Merge branch 'mobile-scope' into 'develop'
...
Display additional scope description above the status form for mobile users.
Closes #505
See merge request pleroma/pleroma-fe!767
2019-05-09 17:13:50 +00:00
eugenijm
a89010843d
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
2019-05-08 16:50:39 +03:00
HJ
157d4e601e
Merge branch 'fix/floating-button' into 'develop'
...
Mobile Post button fix
Closes #506
See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
eugenijm
4af343374a
Move scope visibility notice to the status form, make it dismissible
2019-05-07 19:13:45 +03:00
tarteka
bfd25a5c3f
Update es.json
2019-05-06 08:38:24 +00:00
taehoon
cf72ebb407
update copy
2019-05-03 11:40:05 -04:00
taehoon
5d0bae5569
update generic error message
2019-05-03 11:40:05 -04:00
taehoon
d115d98a1b
add translations
2019-05-03 11:40:05 -04:00
taehoon
2cda9010df
add user reporting modal
2019-05-03 11:40:05 -04:00
Shpuld Shpludson
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
tarteka
09253420a2
Update es.json
2019-05-03 00:22:14 +00:00
Exilat
b98bab52a9
Update oc.json
2019-05-01 16:40:40 +00:00
Shpuld Shpludson
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
eugenijm
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
taehoon
95bc2d727b
add “export blocks” feature
2019-04-27 08:31:06 -04:00
taehoon
08eaf9bd33
make reusable Exporter component
2019-04-27 08:31:06 -04:00
taehoon
0ab2f9dfa5
add “block import” feature
2019-04-27 08:31:06 -04:00
taehoon
6d0e98a1c2
make Importer component reusable
2019-04-27 08:31:06 -04:00
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
tarteka
37c7d850f1
Update es.json
2019-02-05 22:20:45 +00:00
Xiaofeng An
c758d103bd
fix #308 - show login hint above timeline when user is not logged in
2019-02-05 13:47:27 -05:00
shpuld
54e7e0e31b
merge develop and fix conflicts AGAIN
2019-02-04 19:49:23 +02:00
Shpuld Shpludson
d4991d0162
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld
18ae7bd5f3
Combine friends/followers
2019-02-03 11:58:49 +02:00
Shpuld Shpludson
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
taehoon
d8ad494081
Add avatar size instruction notice
2019-02-02 20:39:41 -05:00
shpuld
a8c6b3f538
Change video playing default without bothering making it an instance configurable
2019-01-31 21:19:41 +02:00
shpuld
c7cffbb6c7
Merge branch 'develop' into feat/media-modal
2019-01-30 20:49:24 +02:00
lambda
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
Maxim Filippov
298cea8f6d
Split hide_network into hide_followers & hide_followings
2019-01-30 01:11:40 +03:00
shpuld
62e9525724
Add loading indicator for notifications, make timelines indicate bottoming out when no more statuses
2019-01-29 21:04:52 +02:00
shpuld
51024a2c8a
Merge branch 'develop' into feat/media-modal
2019-01-28 19:02:46 +02:00
Shpuld Shpludson
2585dfa4c2
Merge branch 'develop' into 'develop'
...
Add Dutch translation
See merge request pleroma/pleroma-fe!482
2019-01-28 04:32:55 +00:00
spctrl
d40a2f0429
Add Dutch translation
2019-01-27 19:44:17 +01:00
shpuld
0ab828bb30
Merge develop and fix conflict
2019-01-26 17:50:41 +02:00
shpuld
3978aaef84
Redo everything in the MR
2019-01-26 17:45:03 +02:00
William Pitcock
7b296696a3
user profile: add media timeline
2019-01-26 13:49:24 +00:00
HJ
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
Henry Jameson
a680f7d684
localization strings
2019-01-17 22:49:33 +03:00
hakabahitoyo
fc83d76ab5
update japanese translation
2019-01-16 18:14:15 +09:00
Hakaba Hitoyo
05ead45fb7
Show who to follow in the mobile view
2019-01-16 02:33:08 +00:00
kjwon15
d4eb3cb36b
Add Korean translation
2019-01-10 14:56:05 +09:00
Hakaba Hitoyo
a60fc390a0
Add instance information page for mobile
2019-01-07 17:26:47 +00:00
Vinzenz Vietzke
681b4e665d
updated German translation
...
* added theme settings
* added various missing single strings
2019-01-03 19:53:53 +01:00
shpuld
650655709d
fix conflict in user card content
2018-12-28 21:44:09 +02:00
Hakaba Hitoyo
8ae3518a9a
Update japanese translation
2018-12-25 09:03:05 +00:00
shpuld
f72b1d048e
Merge branch 'develop' into feature/replace-panel-switcher
2018-12-22 17:32:35 +02:00
shpuld
4836c8ac74
Add some more routes to side drawer
2018-12-22 17:32:07 +02:00
Ekaterina Vaartis
10642df528
Add a translation to the captcha strings in the registration form
2018-12-21 15:12:46 +03:00
Henry Jameson
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
HJ
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
ValD
e2f825266a
added condition to check for logined user
2018-12-13 23:20:59 +05:30
Henry Jameson
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
Shpuld Shpludson
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
Rinpatch
6de4dcc7c9
Resolve merge conflict
2018-12-13 17:22:19 +03:00
Henry Jameson
9dfff10717
Merge remote-tracking branch 'upstream/develop' into async_follow
...
* upstream/develop: (131 commits)
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
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
fixed wrong height for selects
better layouting for import-export, error display fixes
added keep-colors option
separated preview and exported from style_switcher
revert that, it's actually used, i'm an idiot
...
2018-12-13 16:15:47 +03:00
Henry Jameson
c52b8019ae
added hide_network option, fixed properties naming
2018-12-13 16:04:22 +03:00
Egor Kislitsyn
a8521fc8d9
Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions
...
# Conflicts:
# src/i18n/en.json
# src/modules/interface.js
# src/modules/users.js
# yarn.lock
2018-12-13 18:22:15 +07:00
Egor Kislitsyn
02c0e15781
add checkbox to disable web push
2018-12-13 00:03:50 +07:00
Rinpatch
bf8bb9ce13
Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
2018-12-12 16:38:01 +03:00
ValD
139659d42c
renamed config to preload images and add ident to config
2018-12-12 03:42:29 +05:30
ValD
7b4e08dd93
added config for preload and made attachment responsive to it
2018-12-12 03:33:53 +05:30
Henry Jameson
c189a08dff
added keep-colors option
2018-12-11 16:36:06 +03:00
Henry Jameson
3452864260
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop:
Fix color fallback order
Use console.warn instead of console.log
Get rid of mutation_types file, use inline approach. Minor fixes
Add fallback color rule.
Change english validation error messages
Clean up the code
Validate name presence on client-side as well
Better styling for client-side validation. Add I18n for validation errors.
Fix broken ToS link. Fix linter errors
Add client validation for registration form
Use Array.reduce instead of lodash.reduce
Humanize validation errors returned on registration
Added user option to hide instance-specific panel, rearranged config screen to better categorize it / adjustments to language selector
fix
2018-12-11 01:01:16 +03:00
Rinpatch
6a00854189
Count in binary bytes and remove i18 from file size format service
2018-12-10 17:06:32 +03:00
Rinpatch
88145c5934
Add a space between filesizes
2018-12-10 10:04:42 +03:00
Rinpatch
c69a8dc197
Add file size formating
2018-12-10 09:50:04 +03:00
rinpatch
f69331e49d
Improve error messages
2018-12-08 22:36:54 +01:00
Rinpatch
ba188eddab
[pleroma#36] Add upload errors
2018-12-08 18:23:21 +03:00
lambda
fb5261b926
Merge branch 'hideISP' into 'develop'
...
Add user configuration option to hide instance-specific panel
Closes #196
See merge request pleroma/pleroma-fe!402
2018-12-08 10:05:16 +00:00
raeno
c03cc3ae83
Change english validation error messages
2018-12-05 20:29:59 +04:00
raeno
91a72d51ff
Validate name presence on client-side as well
...
* remove email address validation, we have it covered by html itself and it's quite annoying
* add shakeError animation
* fix styles a bit
2018-12-05 19:42:33 +04:00
raeno
f9ff839b1a
Better styling for client-side validation. Add I18n for validation errors.
2018-12-05 19:17:29 +04:00
Henry Jameson
403c86e4d1
back button for mobile
2018-12-05 15:01:56 +03:00
Henry Jameson
6636c0f551
mobile fixes
2018-12-05 12:01:24 +03:00
Henry Jameson
47b0b385f4
Added user option to hide instance-specific panel, rearranged config screen to
...
better categorize it / adjustments to language selector
2018-12-05 11:37:01 +03:00
Henry Jameson
51cf4dc298
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop:
Fix iOS Safari from making videos play fullscreen by default
added PR comments
resolved the lint
used the deleted data param as condition in status template
Switch to "timeline" when pressing user-settings
Added user setting tooltip
made links in user bio always open in new tabs
addressed PR comments
added tooltip
Add userId property to timelines so that we don't overwrite user timeline meant for another user
Added option to auto-hide subject field when it's empty.
removes hacks from notifications storage, adds api call to let server update is_seen attribute
fixes vimium not giving retweet button a hint
Do not use underscore at the beginning of the method
Logout user on password change
Route user to the correct profile URL
Typo
Fix filetype detection
Switch to settings when touching settings
Switch to timeline on nav panel actions
2018-12-05 10:43:03 +03:00
ValD
ea4fafb27e
Added user setting tooltip
2018-12-04 15:24:01 +05:30
Henry Jameson
ca19025187
Added support for async following including delayed confirmation if we followed
...
user or not
2018-12-04 12:50:29 +03:00
ValD
c142f7b7b6
addressed PR comments
2018-12-04 00:45:31 +05:30
ValD
c40bda7c2a
added tooltip
2018-12-04 00:45:31 +05:30
Henry Jameson
b34097a5c1
Added option to auto-hide subject field when it's empty.
2018-12-03 06:47:35 +03:00
Henry Jameson
1e56cec2aa
missing string
2018-12-02 10:23:41 +03:00
Henry Jameson
67ca21b2e6
localization strings, fixes
2018-12-02 09:38:40 +03:00
Henry Jameson
bee738c815
making inset shadows work on avatars again
2018-12-02 08:47:55 +03:00
Henry Jameson
406df4399b
avatars shadows, also allows drop-shadow use
2018-11-30 16:39:53 +03:00
Henry Jameson
b45fc6c652
updated preview window
2018-11-27 05:01:18 +03:00
Henry Jameson
2ebc06e30f
fixed keep checkboxes working when exporting
2018-11-26 21:07:22 +03:00
Henry Jameson
a806d43f05
Merge remote-tracking branch 'upstream/develop' into feature/theming2
...
* upstream/develop: (60 commits)
whoops
whoops
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
remove deploy stage
remove deploy stage
updated and completed German translation
On logout switch to public timeline.
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Put oauth text into description.
Display OAuth login on login form button.
...
2018-11-26 05:21:58 +03:00
Henry Jameson
e06717fd0d
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop:
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
2018-11-26 04:38:44 +03:00
Henry Jameson
0ca42bd3d6
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop: (36 commits)
remove deploy stage
remove deploy stage
updated and completed German translation
minor modification of Chinese translation
update Chinese translation
Add Chinese language
Fix posting.
Count spoiler text in the character count. Fixes #135 .
Added Irish (Gaeilge) Language
Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
simplify code
adapt to destructive change of api
Adds Occitan locale
Updated italian translation
Update oc.json
Update oc.json
Update of the oc.json file Actualizacion del fichièr oc.json
Sort messages object by language code so that it's easier from the UI to browse them.
explicitly set collapseMessageWithSubject to undefined
Fall back to instance settings consistently
...
2018-11-26 04:33:41 +03:00
Henry Jameson
9a9dc47fc5
better preview, collateral fixes
2018-11-26 03:19:04 +03:00
Henry
f1a23f2b6e
Merge branch 'update-japanese-translation' into 'develop'
...
Update Japanese translation
See merge request pleroma/pleroma-fe!378
2018-11-25 22:53:21 +00:00
Henry Jameson
94b481fa9c
cosmetic fixes
2018-11-26 00:19:28 +03:00
Henry Jameson
1a65895bfd
initial font support
2018-11-25 21:48:16 +03:00
Henry Jameson
1a8d24d649
some help strings
2018-11-25 17:21:53 +03:00
Henry Jameson
b07d7d7229
reset buttons, better disabled for shadows
2018-11-23 11:36:36 +03:00
Henry Jameson
26b9f787bb
added "keep opacity" option, fixed opacity loading, fixed missing shadows not
...
affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
2018-11-23 10:17:01 +03:00
Henry Jameson
754d71ec19
added checkboxes to keep current roundness and shadows, also cleaned up how
...
shadows/roundness are reset when switching themes
2018-11-23 08:24:55 +03:00
Henry Jameson
91ea9b7b0e
checkbox radius
2018-11-23 07:28:53 +03:00
Henry Jameson
92afd6af12
layout fixes
2018-11-21 22:01:34 +03:00
Henry Jameson
621ab806e6
more default shadows, replaced original shadows with generated ones. maybe gotta
...
update fallbacks...
2018-11-21 21:23:07 +03:00
Henry Jameson
3bdcdefc9b
better tooltips, localized, too
2018-11-21 20:18:49 +03:00
Henry Jameson
32132e225c
localization and small fixes
2018-11-20 20:58:20 +03:00
Hakaba Hitoyo
7044bf2bd7
update-japanese-translation
2018-11-15 11:39:08 +09:00
Roger Braun
c34eebff6c
Add actual user search.
2018-11-14 20:31:06 +01:00
William Pitcock
1ad642c598
incorporate most translation changes from MR 368
2018-11-14 15:43:27 +00:00
William Pitcock
d0a4152f3c
update french translation
2018-11-14 15:36:55 +00:00
Roger Braun
b37a0f4f23
Add direct message tab.
2018-11-13 20:34:56 +01:00
lambda
11f8a4f312
Merge branch 'oauth' into 'develop'
...
Move login to oauth.
See merge request pleroma/pleroma-fe!367
2018-11-13 18:42:07 +00:00
lambda
2a61f2b24c
Merge branch 'i18n/irish' into 'develop'
...
Added Irish (Gaeilge) Language
See merge request pleroma/pleroma-fe!370
2018-11-13 06:59:46 +00:00
Vinzenz Vietzke
ae927f8628
updated and completed German translation
2018-11-12 22:39:55 +01:00
Starmancer
4c5073a66c
minor modification of Chinese translation
2018-11-09 14:29:14 +08:00
Starmancer
819e9ce6a3
update Chinese translation
2018-11-09 14:15:55 +08:00
Nebula
e1d21512a9
Add Chinese language
2018-11-09 05:42:32 +00:00
Roger Braun
1de382f026
Put oauth text into description.
2018-11-08 19:27:19 +01:00
Roger Braun
a04795d723
Display OAuth login on login form button.
2018-11-08 16:12:05 +01:00
dgold
4f258b4940
Added Irish (Gaeilge) Language
...
All translations checked with tearma.ie & acmhainn.ie for language use
and technical accuracy.
2018-11-02 20:08:11 +00:00
Henry
7f0e140a4f
Merge branch 'patch-1' into 'develop'
...
Updated italian translation
See merge request pleroma/pleroma-fe!364
2018-10-25 13:03:49 +00:00
silkevicious
c61e658c1d
Updated italian translation
2018-10-25 09:36:15 +00:00
Exilat
d1614c432f
Update oc.json
2018-10-25 05:54:35 +00:00
Exilat
68d90684c4
Update oc.json
2018-10-24 05:50:49 +00:00
Exilat
8c585b0291
Update of the oc.json file
...
Actualizacion del fichièr oc.json
2018-10-23 19:19:11 +00:00
fadelkon
ec7b7ab49c
Sort messages object by language code so that it's easier from the UI to browse them.
2018-10-21 22:18:38 +02:00
Henry
82cc37a55e
Merge branch 'i18n/arabic' into 'develop'
...
Add arabic translation
See merge request pleroma/pleroma-fe!360
2018-10-21 12:43:30 +00:00
ButterflyOfFire
131526373f
Adding arabic to messages.js
2018-10-21 15:38:56 +03:00
ButterflyOfFire
373d6ca990
Adding arabic translation.
2018-10-21 15:37:44 +03:00
Henry
d81887e34f
Merge branch 'catalan' into 'develop'
...
Create catalan translation
See merge request pleroma/pleroma-fe!355
2018-10-17 18:36:35 +00:00
fadelkon
bf3e3f8b9a
Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text.
2018-10-16 18:11:49 +02:00
scarlett
4cc1ed6171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics
2018-10-16 14:09:29 +01:00
fadelkon
0c2f4b925e
Add catalan require to messages.js
2018-10-14 11:25:20 +02:00
morguldir
7c4790d1bc
Update norwegian translation
2018-10-14 06:22:04 +02:00
fadelkon
59dec1b43f
Finish general and timeago catalan strings. Glossary:
...
* bio: presentació
* timeline: flux [d'entrades]
* post/status: entrada
* settings: configuració
* user: usuari/a
* users: usuàries
* background: fons de pantalla
* banner: fons de perfil
* follower: seguidor/a
* follow: contacte/a qui segueixo
* avatar: avatar
* [visibility] scope: abast de la publicació
Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ .
2018-10-13 18:17:00 +02:00
Henry Jameson
fb29e7c73d
more workings and even less explosions.
2018-10-03 21:21:48 +03:00
fadelkon
f8323b72ae
Translate some strings to catalan. Most part of block "settings" is not translated yet
2018-10-02 20:33:07 +02:00
fadelkon
0beba08618
Add placeholder catalan translation file to be able to see the work in progress in further commits
2018-10-02 20:31:02 +02:00
kaniini
65c03f1a0b
Merge branch 'i18n/no_rich_text' into 'develop'
...
Less confusing description for no_rich_text_formatting
See merge request pleroma/pleroma-fe!351
2018-09-27 21:24:23 +00:00
Henry Jameson
6165b7366a
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
...
* upstream/develop:
i think it's due to my shitty js-to-json regex
2018-09-25 14:48:02 +03:00
Henry Jameson
455cd0d028
settings for scope/subject
2018-09-25 14:47:02 +03:00
Henry Jameson
85235981d1
i think it's due to my shitty js-to-json regex
2018-09-25 14:30:05 +03:00
Henry Jameson
11f1bac502
Less confusing description
2018-09-25 14:01:01 +03:00
Haelwenn (lanodan) Monnier
8cb62fae70
src/i18n/fr.json: More accurate translation
2018-09-24 16:55:19 +02:00
hakabahitoyo
86528d84e2
update Japanese translation
2018-09-23 10:27:05 +09:00
William Pitcock
2f674eb13d
update french translation
2018-09-22 04:46:09 +00:00
William Pitcock
1af5c8fd39
add support for disabling rich text formatting
2018-09-22 03:54:05 +00:00
Henry Jameson
1c2f0029e4
Merge remote-tracking branch 'upstream/develop' into betterStorage
...
* upstream/develop:
More languages
added usage
a tool to check what's missing from a language
all other languages which do not have MRs related to them separated
seems to be working
2018-09-21 12:14:20 +03:00
Henry Jameson
a61ad0544a
small thing to display instance-provided default
2018-09-20 17:21:11 +03:00
Henry Jameson
537b1ff2d8
Merge remote-tracking branch 'upstream/develop' into translations-separation
...
* upstream/develop:
Update Hebrew translation
fixed autocomplete
Debug
2018-09-20 16:12:00 +03:00
Henry Jameson
1245d7917f
translations
2018-09-17 17:51:39 +03:00
Artik Banana
9b95c4c7b5
Update Hebrew translation
2018-09-12 16:16:55 +00:00
Henry Jameson
0c14dd9575
More languages
2018-09-09 18:54:23 +03:00
Henry Jameson
28a26ceab7
Merge remote-tracking branch 'upstream/develop' into translations-separation
...
* upstream/develop:
fix lint
Revert "Revert "Update messages.js""
i18n/messages.js: changed Folgende back to Follower
updated german translation
updated german translation
cleaning up some translations that broke the building
fix trailing comma
Update and fix messages.js (pt, eo)
2018-09-09 18:44:03 +03:00
Henry
4bff6f12ed
Merge branch 'feature/update-de-translation' into 'develop'
...
updated german translation
See merge request pleroma/pleroma-fe!293
2018-09-09 15:41:24 +00:00
Henry
dda0effd65
Merge branch 'pizzaiolo/pleroma-fe-patch-1' into 'develop'
...
Update and fix messages.js (pt, eo)
See merge request pleroma/pleroma-fe!341
2018-09-09 13:27:19 +00:00
Henry Jameson
aea00310c6
fix lint
2018-09-09 16:01:44 +03:00
Henry
8455936cd6
Merge branch 'develop' into 'develop'
...
Update the Occitan language - Fixed Linting
See merge request pleroma/pleroma-fe!339
2018-09-09 12:58:09 +00:00
Henry Jameson
0656e0ef32
Merge remote-tracking branch 'upstream/develop' into translations-separation
...
* upstream/develop: (21 commits)
use prime number step for Who to follow panel
fix
Revert "Update messages.js"
Update messages.js Update the Occitan language - Fixed Linting
remove formatting options
Remove outdated settings
features panel i18n
features panes supports chat & gopher
fix collapse link being too small
small fix for non-square gif avatars
Fixed collapseMessageWithSubjectLocal always using instance-provided config.
Fix last place with usercard having wrong width
Fixed non-masked image looking weird in chrome.
Kinda went back to using align-items: stretch. Fixed error message floating.
Simplified image sensitivity label
show features panel only if not login
update
debug
update
debug
...
2018-09-09 15:55:43 +03:00
kaniini
eb93034a40
Merge branch 'simplify-sensitivity-label' into 'develop'
...
Simplified image sensitivity label
See merge request pleroma/pleroma-fe!334
2018-09-09 11:55:49 +00:00
Artik Banana
78e12bc812
Revert "Revert "Update messages.js""
...
This reverts commit 385484566a
2018-09-07 16:51:25 +00:00
Henry Jameson
e6adddbba6
added usage
2018-09-06 22:10:41 +03:00
Henry Jameson
dbd010abd4
a tool to check what's missing from a language
2018-09-06 21:59:20 +03:00
Henry Jameson
b4a5fddea8
all other languages which do not have MRs related to them separated
2018-09-06 21:29:39 +03:00
Henry Jameson
9f84f4ea05
seems to be working
2018-09-06 19:39:56 +03:00
hakabahitoyo
8b94ea28ec
remove formatting options
2018-09-04 14:50:02 +09:00
Hakaba Hitoyo
49ab19c342
features panel i18n
2018-09-04 10:59:02 +09:00
scarlett
bdcbd110e4
Add option for hiding post statistics (e.g. repeats, favs)
2018-09-04 00:41:52 +01:00
scarlett
dcb7e1ecf4
Add option for disabling counts (followers, statuses) in user profiles.
2018-09-04 00:32:25 +01:00
Henry Jameson
36101abc22
Simplified image sensitivity label
2018-09-03 18:52:07 +03:00
Henry Jameson
46d8b55d44
Merge remote-tracking branch 'upstream/develop' into polish
...
* upstream/develop:
i18n: make "plain text" translatable
add the ability to select a post's content type
2018-08-31 04:20:40 +03:00
William Pitcock
20a67e6809
i18n: make "plain text" translatable
2018-08-31 00:44:25 +00:00
Henry Jameson
1461a52ade
vodka translations
2018-08-30 20:45:50 +03:00
Henry Jameson
b0e0686c7f
Added ability to hide certain types of notifications
2018-08-28 21:21:29 +03:00
Henry Jameson
c3b27ab4c2
moved replies filtering to "filter" category in settings, made it more consistent
2018-08-28 15:47:42 +03:00
Henry Jameson
cff4177bf3
settings page update
2018-08-28 15:38:07 +03:00
Henry Jameson
b48a3210a3
tabs for settings
2018-08-28 14:28:05 +03:00
Henry Jameson
68d15f665e
Show lock icon instead of hiding repeat button, tusky-style. Added hint
...
explaining what's going on. Fixes favorite button jumping left and right
depending on post visibility
2018-08-28 13:42:44 +03:00
kaniini
5bb5ef43ef
Merge branch 'language-override' into 'develop'
...
Make interface language configurable from settings
Closes #36
See merge request pleroma/pleroma-fe!315
2018-08-26 00:01:33 +00:00