Commit graph

1884 commits

Author SHA1 Message Date
lambda
399bd6f25c Merge branch 'fix/dont-show-block-when-logged-out' into 'develop'
Check if logged-in when rendering the block button.

See merge request pleroma/pleroma-fe!145
2017-11-09 10:01:54 +00:00
shpuld
72806b4a99 Check if logged-in when rendering the block button. 2017-11-09 10:33:10 +02:00
Shpuld Shpludson
56a0665b2f Merge branch 'fix/pleromabe-is-other-user' into 'develop'
Fix isOtherUser on pleroma-be

See merge request pleroma/pleroma-fe!137
2017-11-09 08:23:19 +00:00
lambda
9913601080 Merge branch 'feature/timeago-locales' into 'develop'
Revert to English timeago for latin script languages.

See merge request pleroma/pleroma-fe!144
2017-11-09 08:06:35 +00:00
lambda
3059a699ac Merge branch 'fix/dont-show-rts-more-than-once' into 'develop'
Don't show repeats that have been shown already.

See merge request pleroma/pleroma-fe!143
2017-11-09 07:45:19 +00:00
eal
26416ed15c Revert to English timeago for latin script languages. 2017-11-09 09:45:02 +02:00
shpuld
d2ef145115 Don't show repeats that have been shown already. 2017-11-09 08:36:11 +02:00
lambda
bbd80c54bf Merge branch 'ro-translation' into 'develop'
Romanian translation

See merge request pleroma/pleroma-fe!142
2017-11-09 05:32:15 +00:00
Roger Braun
80ccc2ac27 Add spanish translation.
Thanks, Aemon!
2017-11-09 06:30:49 +01:00
Tibike
510015b044 Corrected the const en to const ro for romanian 2017-11-09 02:49:37 +02:00
Tibike
e8f325f345 Added romanian translations 2017-11-09 02:28:33 +02:00
Tibike
b35ef607c4 Added missing hungarinan translations 2017-11-09 01:53:53 +02:00
lambda
0c2f343a66 Merge branch 'fix/i18n-mentions-timeline-title' into 'develop'
Make mentions-timeline use i18n.

See merge request pleroma/pleroma-fe!141
2017-11-08 22:00:37 +00:00
lambda
241fcd12f5 Merge branch 'feature/timeago-locales' into 'develop'
Add timeago locales.

See merge request pleroma/pleroma-fe!140
2017-11-08 22:00:20 +00:00
Shpuld Shpludson
421221997f Make mentions-timeline use i18n. 2017-11-08 21:54:48 +00:00
eal
ceb13a6405 Add timeago locales. 2017-11-08 22:20:50 +02:00
lambda
3cad733593 Merge branch 'develop' into 'develop'
Update Estonian translation

See merge request pleroma/pleroma-fe!138
2017-11-08 17:43:02 +00:00
lambda
5322f90c15 Merge branch 'fix/attachment-fixes' into 'develop'
Fix #38 and video CSS

Closes #38

See merge request pleroma/pleroma-fe!136
2017-11-08 17:42:42 +00:00
eal
be943445e9 Fix isOtherUser on pleroma-be 2017-11-08 19:32:11 +02:00
obrez
bce37767f2 Update Estonian translation 2017-11-08 19:30:33 +02:00
lambda
26a8923a87 Merge branch 'develop' into 'develop'
add japanese translation

See merge request pleroma/pleroma-fe!135
2017-11-08 13:19:36 +00:00
naf
26d27165d6 add japanese translation 2017-11-08 22:10:13 +09:00
shpuld
0e716e3cd9 Fix oembeds from overflowing on Firefox, fix video border color as well as vertical size. 2017-11-08 15:09:02 +02:00
Roger Braun
23d1354046 Update polandish. 2017-11-08 13:41:11 +01:00
lambda
7d84147500 Merge branch 'fix/missing-localization-strings' into 'develop'
Fix #37: Missing localization strings

Closes #37

See merge request pleroma/pleroma-fe!133
2017-11-08 11:03:51 +00:00
shpuld
4d5782b51f Fix conflict 2017-11-08 12:55:10 +02:00
lambda
83297aba15 Merge branch 'develop' into 'develop'
Add Estonian translation

See merge request pleroma/pleroma-fe!134
2017-11-08 10:54:08 +00:00
obrez
a7b2d76347 Add Estonian translation 2017-11-08 12:44:33 +02:00
lambda
37f5e0d8b6 Merge branch 'fix/polish-user-finder-and-nav-buttons' into 'develop'
Fix/polish user finder and nav buttons

See merge request pleroma/pleroma-fe!132
2017-11-08 10:44:24 +00:00
shpuld
191bbe76a8 Add a bunch of missed localization strings, update english and finnish to match. 2017-11-08 12:34:15 +02:00
shpuld
176421163b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/polish-user-finder-and-nav-buttons 2017-11-08 11:27:22 +02:00
shpuld
bfa04bfb11 Hide overflowing elements when userfinder is active. Don't scroll on button presses. Make buttons slightly bigger and more spaced out. 2017-11-08 11:26:42 +02:00
Roger Braun
5dca57cc05 Add Polish translation.
Thanks, Roka!
2017-11-08 09:57:51 +01:00
Roger Braun
62a3c63082 Unify statuses/notices. 2017-11-08 09:31:52 +01:00
Roger Braun
3895e667d9 Merge branch 'tibike/pleroma-fe-hu-translation' into develop 2017-11-08 09:14:14 +01:00
Roger Braun
cadd42c1b2 Merge branch 'develop' into tibike/pleroma-fe-hu-translation 2017-11-08 09:13:35 +01:00
Roger Braun
c65974c8c8 Fix typo. 2017-11-08 09:12:48 +01:00
Roger Braun
483fef731a Fix typo. 2017-11-08 09:10:32 +01:00
Roger Braun
32cb5e1a48 Add italian translation.
Thank, Eidon!
2017-11-08 09:09:34 +01:00
Roger Braun
38bd0dbfcd Add french translation.
Thanks, azu!
2017-11-08 09:05:10 +01:00
lambda
cdbcf569f8 Merge branch 'feature/blocks' into 'develop'
Add blocks.

See merge request pleroma/pleroma-fe!130
2017-11-08 07:02:16 +00:00
Tibike
d6c89a9c09 Added Hungarian translation 2017-11-08 02:14:18 +02:00
eal
608d1e6776 Add blocks. 2017-11-07 22:38:28 +02:00
lambda
7ab7ac7be6 Merge branch 'feature/ger-translation' into 'develop'
Add DE translation

See merge request pleroma/pleroma-fe!128
2017-11-07 17:50:39 +00:00
Roger Braun
5cf972b348 Update ja translation. 2017-11-07 18:44:43 +01:00
Sebastian Huebner
0320f03cd2
make linter happy 2017-11-07 18:43:28 +01:00
Sebastian Huebner
1b281303b5 Merge branch 'feature/ger-translation' of git.pleroma.social:pleroma/pleroma-fe into feature/ger-translation 2017-11-07 18:38:25 +01:00
Sebastian Huebner
8a3118d1a7 added ger translation 2017-11-07 18:37:51 +01:00
Roger Braun
33ad62bf72 Japanese is ja. 2017-11-07 18:34:12 +01:00
Sebastian Huebner
708a338855
rebase 2017-11-07 18:33:53 +01:00