scarlett
2bb663f0f6
satisfy lint
2018-10-16 14:15:04 +01: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
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
b66d7901f1
forgot to actually handle the instance config. this part needs a rewrite...
2018-09-25 16:31:06 +03:00
Henry Jameson
d5e82625d3
lint fix
2018-09-25 15:21:47 +03:00
Henry Jameson
ef968d8e1e
now it actually works
2018-09-25 15:16:26 +03: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
419744080f
console.log cleanup
2018-09-17 19:16:58 +03:00
Henry Jameson
03f28d3fa6
Fixed "user.id is undefined" or something error more sane by properly handling
...
HTTP errors
2018-09-17 18:55:11 +03:00
Henry Jameson
e53f238278
undo rename because it makes less sense now.
2018-09-17 18:54:48 +03:00
Henry Jameson
9467462ef0
made FE work even without either api or static config
2018-09-17 18:54:08 +03:00
Henry Jameson
40a175389a
Removed warning. Added support for working without static/config.json
2018-09-17 18:00:56 +03:00
Henry Jameson
394153380d
more missing stuff
2018-09-17 17:51:39 +03:00
Henry Jameson
136add8a2f
fix some missing stuff
2018-09-17 17:51:39 +03:00
Henry Jameson
1245d7917f
translations
2018-09-17 17:51:39 +03:00
Henry Jameson
580aae1b54
Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
2018-09-17 17:51:39 +03:00
Henry Jameson
82fa5d08c4
more refactoring
2018-09-17 17:51:39 +03:00
Henry Jameson
2db991fc7f
some recategorization of options...
2018-09-17 17:51:39 +03:00
Henry Jameson
f1c16327b6
Initial version
2018-09-17 17:51:39 +03:00
kaniini
7887e42fca
Merge branch 'fixAutocomplete' into 'develop'
...
Fixes broken autocomplete for users
See merge request pleroma/pleroma-fe!344
2018-09-13 19:30:28 +00:00
Artik Banana
9b95c4c7b5
Update Hebrew translation
2018-09-12 16:16:55 +00:00
Henry
c94b9796ae
Merge branch 'debug-who-to-follow-panel' into 'develop'
...
Small debug for Who to follow panel
See merge request pleroma/pleroma-fe!342
2018-09-12 08:53:13 +00:00
Henry Jameson
89f9b3a468
fixed autocomplete
2018-09-12 11:46:02 +03: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
207c188c16
Debug
2018-09-09 15:22:55 +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
ed6abeacad
Merge branch 'post-polish-fixes' into 'develop'
...
Post polish fixes
See merge request pleroma/pleroma-fe!333
2018-09-09 11:59:49 +00:00
kaniini
369fd648f6
Merge branch 'remove-outdated-settings' into 'develop'
...
Remove outdated settings
See merge request pleroma/pleroma-fe!335
2018-09-09 11:56:34 +00: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
Hakaba Hitoyo
3a17252929
use prime number step for Who to follow panel
2018-09-09 14:34:51 +09:00
Henry Jameson
5726be6830
fix
2018-09-08 05:16:25 +03:00
Artik Banana
78e12bc812
Revert "Revert "Update messages.js""
...
This reverts commit 385484566a
2018-09-07 16:51:25 +00:00
Henry
2eab0cb115
Merge branch 'feature/features-panel' into 'develop'
...
Features panel
See merge request pleroma/pleroma-fe!331
2018-09-07 16:37:24 +00:00
Henry
385484566a
Revert "Update messages.js"
...
This reverts commit 5e1f0d9416
2018-09-07 16:22:59 +00:00
Artik Banana
5e1f0d9416
Update messages.js
...
Update the Occitan language - Fixed Linting
2018-09-07 16:18:01 +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
hakabahitoyo
dbf24e1fbf
Remove outdated settings
2018-09-04 11:15:00 +09:00
Hakaba Hitoyo
49ab19c342
features panel i18n
2018-09-04 10:59:02 +09:00
Hakaba Hitoyo
65115bfc7f
features panes supports chat & gopher
2018-09-04 10:44:25 +09:00
scarlett
145929207e
Revert "Don't only include whitespace conditionally, to fix the fade."
...
This reverts commit 8dc85b057e
2018-09-04 02:00:12 +01:00
scarlett
8dc85b057e
Don't only include whitespace conditionally, to fix the fade.
2018-09-04 01:19:59 +01:00
scarlett
5a59eb4efa
Don't hide the bio.
2018-09-04 01:10:22 +01:00
scarlett
699ee0891d
Changeable defaults for hideUserStats and hidePostStats
2018-09-04 00:48:14 +01: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
dc0b47e8bd
fix collapse link being too small
2018-09-03 23:30:07 +03:00
Henry Jameson
f9eb9e0b70
small fix for non-square gif avatars
2018-09-03 22:49:46 +03:00
Henry Jameson
6e64324d37
Fixed collapseMessageWithSubjectLocal always using instance-provided config.
2018-09-03 22:40:45 +03:00
Henry Jameson
d4f9d21857
Fix last place with usercard having wrong width
2018-09-03 22:23:53 +03:00
Henry Jameson
08b044c365
Fixed non-masked image looking weird in chrome.
2018-09-03 22:18:59 +03:00
Henry Jameson
a6047e0ad5
Kinda went back to using align-items: stretch. Fixed error message floating.
2018-09-03 22:12:18 +03:00
Henry Jameson
36101abc22
Simplified image sensitivity label
2018-09-03 18:52:07 +03:00
Dingdreher
900aaefb98
Update users.js
2018-09-03 12:01:05 +00:00
hakabahitoyo
fa477dd41f
show features panel only if not login
2018-09-03 16:02:06 +09:00
hakabahitoyo
38b683b30c
update
2018-09-03 15:57:22 +09:00
Hakaba Hitoyo
049e2397b1
update
2018-09-03 15:23:09 +09:00
hakabahitoyo
07ef43c7b5
debug
2018-09-03 14:55:40 +09:00
Hakaba Hitoyo
52fe01e4d8
mock features panel
2018-09-03 14:43:10 +09:00
Shpuld Shpludson
20b0ffc0b9
Merge branch 'imvomitingasicodethisshit' into 'develop'
...
Made showing format selection optional and default to false
See merge request pleroma/pleroma-fe!329
2018-09-01 05:57:58 +00:00
Henry Jameson
d6240c25cf
small fix
2018-08-31 17:24:46 +03:00
Henry Jameson
17f30190e0
Made showing format selection optional and default to false
2018-08-31 17:00:41 +03:00
shpuld
77e8933b2e
Fix mistakes
2018-08-31 16:13:43 +03:00
shpuld
384c80e238
Change styles a bit, make pre-formatted blocks not overflow but scroll
2018-08-31 16:04:52 +03:00
shpuld
f07e6b271c
Add styles for h1/2/3/4/5 tags in status html
2018-08-31 15:11:27 +03:00
William Pitcock
f9bfe2ea37
post status form: styling fixes for content-type selector, align icons with selector
2018-08-31 04:23:06 +00:00
kaniini
958acbab8d
Merge branch 'polish' into 'develop'
...
Another one of those MR that fixes many many small-to-medium things
Closes #92 , #75 , #122 , #52 , #72 , and #87
See merge request pleroma/pleroma-fe!324
2018-08-31 04:10:17 +00:00
meireikei
2e37e8cf39
Pass user id to fetchFriends
...
It looks like the API that fetchFriends expects was changed, to require
an ID.
2018-08-31 04:07:25 +00:00
kaniini
e71b0411aa
Merge branch 'post-button-labels' into 'develop'
...
Add labels to post buttons
See merge request pleroma/pleroma-fe!323
2018-08-31 04:04:44 +00:00
William Pitcock
cabcb5c81b
i18n: make "plain text" translatable
2018-08-31 03:42:12 +00:00
William Pitcock
9a43ba73e6
add the ability to select a post's content type
2018-08-31 03:42:11 +00:00
Henry Jameson
8c07e63f77
fix
2018-08-31 04:39: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
Henry Jameson
e99534ef71
added option for logo in navbar to follow color scheme of the rest of the site
...
also fixed potential mess-up between api/static configs
2018-08-31 04:06:00 +03:00
William Pitcock
20a67e6809
i18n: make "plain text" translatable
2018-08-31 00:44:25 +00:00
William Pitcock
38e3c2493d
add the ability to select a post's content type
2018-08-31 00:42:42 +00:00
Henry Jameson
63fdad8703
fix
2018-08-30 22:59:52 +03:00
Henry Jameson
1461a52ade
vodka translations
2018-08-30 20:45:50 +03:00
Henry Jameson
065d1c7f49
fix
2018-08-30 20:16:36 +03:00
Henry Jameson
3b9cb1384a
fix
2018-08-30 19:53:13 +03:00
Henry Jameson
fa4c4c9122
fixed #87
2018-08-30 18:23:43 +03:00
Henry Jameson
fa1116249d
fixup! panel styling cleanup
2018-08-30 17:13:54 +03:00
Henry Jameson
507d5bc444
fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
2018-08-30 16:27:35 +03:00
Henry Jameson
1246463f96
fixes broken nsfw hider in notifications
2018-08-30 16:21:10 +03:00
Henry Jameson
fb7f65481e
restored "progress" cursor indicator for loading nsfw images
2018-08-30 16:11:31 +03:00
Henry Jameson
e58221fb87
fixed #72
2018-08-30 16:02:53 +03:00
Henry Jameson
b0e0686c7f
Added ability to hide certain types of notifications
2018-08-28 21:21:29 +03:00
Henry Jameson
66a22762c2
fixup! Separated tab-switcher into a reusable component. This depends on JSX addition
2018-08-28 16:22:49 +03:00
Henry Jameson
da362b2b88
minor style tweaks
2018-08-28 16:20:04 +03:00
Henry Jameson
330288b4cd
panel styling cleanup
2018-08-28 16:14:32 +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
8e560676f1
allow multiple file upload
2018-08-28 14:05:03 +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
Henry Jameson
226849b26e
Added logic to process reply to favorite request and update likes counter
...
accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
2018-08-27 23:15:58 +03:00
Henry Jameson
fd604dfd2a
fixed still-image not preserving original aspect ratio and resolution.
2018-08-27 22:40:30 +03:00
Henry Jameson
eacbd9b500
Separated tab-switcher into a reusable component. This depends on JSX addition
2018-08-27 22:22:25 +03:00
Ekaterina Vaartis
d2640d4bb5
Add titles to source/expand buttons
2018-08-27 12:55:46 +03:00
Ekaterina Vaartis
14c1704ea1
Add titles to post visibility icons
2018-08-27 12:55:46 +03:00
scarlett
74a6df8a55
Match users using startsWith instead of match.
2018-08-26 13:51:21 +01:00
scarlett
b68ebf3056
Match emoji using startsWith instead of match.
2018-08-26 13:50:36 +01:00
kaniini
bc4f09b775
Merge branch 'serverside-frontend-configuration-2' into 'develop'
...
serverside-frontend-configuration-2
See merge request pleroma/pleroma-fe!312
2018-08-26 06:20:19 +00:00
scarlett
54ac0dfefd
Preserve subject in replies.
2018-08-26 01:50:11 +01:00
kaniini
a7c6007d54
Merge branch 'attachment-collapse' into 'develop'
...
When a post with a subject is collapsed, hide its attachments.
See merge request pleroma/pleroma-fe!316
2018-08-26 00:02:32 +00: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
scarlett
52ce86ed57
Don't use nsfw clickthrough if the post is collapsed by default.
2018-08-26 00:21:54 +01:00
Hakaba Hitoyo
c6913e3909
correct /static/config.json decoding
2018-08-26 07:01:56 +09:00
Hakaba Hitoyo
8b9e973a55
save /api/statusnet/config.json connection
2018-08-26 07:00:23 +09:00
Hakaba Hitoyo
a3cc78115c
rename apiStatusnetConfigSitePleromafe to apiConfig
2018-08-26 06:56:52 +09:00
Hakaba Hitoyo
a81c3b1324
fix typo
2018-08-26 06:54:03 +09:00
scarlett
a7811e7bd9
Add a checkbox for marking a post's attachments as NSFW
2018-08-25 22:18:43 +01:00
scarlett
d50440d802
When a post with a subject is collapsed, hide its attachments.
2018-08-25 20:33:44 +01:00
Ekaterina Vaartis
c1e4bfa90f
Make interface language configurable from settings
...
The locale can now be configured in settings and is stored in
Vuex. The changes are applied immidiately after selection. The list of
languages is taken from the messages file, which contains all the
available locales (and a new value, `interfaceLanguage`, to control
the translation of this option in the options menu)
Closes #36
2018-08-25 13:29:49 +03:00
William Pitcock
30a6b7be5b
attachment: add support for rendering alt text on images
2018-08-25 00:32:10 +00:00
kaniini
fe906cc3f0
Merge branch 'develop' into 'notifications'
...
# Conflicts:
# src/main.js
2018-08-24 23:00:56 +00:00
scarlett
da96294866
Don't hide replies when inConversation.
2018-08-24 21:46:45 +01:00
scarlett
60b115320f
Fix indentation
2018-08-24 20:19:22 +01:00
scarlett
50b3bd22e6
Remove old implementation of isReply.
2018-08-24 20:08:49 +01:00
scarlett
296ab54301
Add settings for changing the visibility of replies in the timeline.
2018-08-24 20:04:26 +01:00
kaniini
14db3f279d
Merge branch 'feature/who-to-follow-panel-uses-suggestions-api' into 'develop'
...
Who to follow panel uses suggestions api
See merge request pleroma/pleroma-fe!294
2018-08-24 18:46:23 +00:00
kaniini
0429963e63
Merge branch 'easy-japanese' into 'develop'
...
Easy Japanese translation
See merge request pleroma/pleroma-fe!305
2018-08-24 18:45:22 +00:00
kaniini
71576947ed
Merge branch 'feature/update-russian-translation' into 'develop'
...
Update Russian translations
See merge request pleroma/pleroma-fe!313
2018-08-24 18:43:54 +00:00
kaniini
b0568ca5c3
Merge branch 'center-bios' into 'develop'
...
Centre-align profile bios.
See merge request pleroma/pleroma-fe!311
2018-08-24 18:42:09 +00:00
dtluna
81c04fac17
Update Russian translations
2018-08-24 21:21:14 +03:00
tsukada-ecsec
dfc5f170c6
update
2018-08-24 18:46:14 +09:00
Henry Jameson
13acdc4a00
fixed error not displaying for 500 error.
2018-08-22 15:51:03 +03:00
