e64af481d2
Merge branch 'hide-statistics' into 'develop'
...
Add options for hiding post and user engagement statistics.
See merge request pleroma/pleroma-fe!336
2018-10-16 14:37:32 +00:00
2bb663f0f6
satisfy lint
2018-10-16 14:15:04 +01:00
4cc1ed6171
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics
2018-10-16 14:09:29 +01:00
f554edc054
Merge branch 'update-nb' into 'develop'
...
Update norwegian translation
See merge request pleroma/pleroma-fe!356
2018-10-14 08:41:27 +00:00
7c4790d1bc
Update norwegian translation
2018-10-14 06:22:04 +02:00
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
9d0bbe37e6
Merge branch 'fix/i18n/instance_default' into 'develop'
...
Fix instance_default in en and fr
See merge request pleroma/pleroma-fe!352
2018-09-25 11:38:56 +00:00
85235981d1
i think it's due to my shitty js-to-json regex
2018-09-25 14:30:05 +03:00
11f1bac502
Less confusing description
2018-09-25 14:01:01 +03:00
bfd2b45672
Merge branch 'fixup_french_translation' into 'develop'
...
Fixup french translation
See merge request pleroma/pleroma-fe!350
2018-09-24 15:10:47 +00:00
8cb62fae70
src/i18n/fr.json: More accurate translation
2018-09-24 16:55:19 +02:00
40210ae31b
Merge branch 'update-japanese-translation' into 'develop'
...
Update Japanese translation
See merge request pleroma/pleroma-fe!349
2018-09-24 10:43:18 +00:00
86528d84e2
update Japanese translation
2018-09-23 10:27:05 +09:00
01127c2db0
Merge branch 'update/french-translation' into 'develop'
...
update french translation
See merge request pleroma/pleroma-fe!348
2018-09-22 04:53:38 +00:00
2f674eb13d
update french translation
2018-09-22 04:46:09 +00:00
1cbabf31ee
Merge branch 'feature/rich-text-optout' into 'develop'
...
add support for disabling rich text formatting
See merge request pleroma/pleroma-fe!347
2018-09-22 04:44:02 +00:00
1af5c8fd39
add support for disabling rich text formatting
2018-09-22 03:54:05 +00:00
cd48268c85
Merge branch 'betterStorage' into 'develop'
...
Better storage
See merge request pleroma/pleroma-fe!343
2018-09-21 09:19:02 +00:00
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
6f32ccf417
Merge branch 'translations-separation' into 'develop'
...
Separation of translation file into several smaller ones.
Closes #142
See merge request pleroma/pleroma-fe!337
2018-09-21 09:02:01 +00:00
a61ad0544a
small thing to display instance-provided default
2018-09-20 17:21:11 +03:00
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
419744080f
console.log cleanup
2018-09-17 19:16:58 +03:00
03f28d3fa6
Fixed "user.id is undefined" or something error more sane by properly handling
...
HTTP errors
2018-09-17 18:55:11 +03:00
e53f238278
undo rename because it makes less sense now.
2018-09-17 18:54:48 +03:00
347c2c02df
proxying nodeinfo
2018-09-17 18:54:34 +03:00
9467462ef0
made FE work even without either api or static config
2018-09-17 18:54:08 +03:00
40a175389a
Removed warning. Added support for working without static/config.json
2018-09-17 18:00:56 +03:00
394153380d
more missing stuff
2018-09-17 17:51:39 +03:00
136add8a2f
fix some missing stuff
2018-09-17 17:51:39 +03:00
1245d7917f
translations
2018-09-17 17:51:39 +03:00
580aae1b54
Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
2018-09-17 17:51:39 +03:00
82fa5d08c4
more refactoring
2018-09-17 17:51:39 +03:00
2db991fc7f
some recategorization of options...
2018-09-17 17:51:39 +03:00
f1c16327b6
Initial version
2018-09-17 17:51:39 +03:00
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
9989ad29df
Merge branch 'patch-1' into 'develop'
...
Update Hebrew translation
See merge request pleroma/pleroma-fe!345
2018-09-12 16:43:19 +00:00
9b95c4c7b5
Update Hebrew translation
2018-09-12 16:16:55 +00:00
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
89f9b3a468
fixed autocomplete
2018-09-12 11:46:02 +03:00
0c14dd9575
More languages
2018-09-09 18:54:23 +03:00
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
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
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
aea00310c6
fix lint
2018-09-09 16:01:44 +03:00
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
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
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
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