Henry Jameson
|
aea00310c6
|
fix lint
|
2018-09-09 16:01:44 +03:00 |
|
lambda
|
af47d51cd1
|
Merge branch 'develop' into 'patch-1'
# Conflicts:
# src/i18n/messages.js
|
2018-06-08 13:30:49 +00:00 |
|
|
lambda
|
e2c5e4eb46
|
Merge branch 'develop' into 'develop'
Hebrew Translation
See merge request pleroma/pleroma-fe!277
|
2018-06-08 13:28:57 +00:00 |
|
Roger Braun
|
8c2a0191a5
|
Merge branch 'dr1ft/pleroma-fe-develop' into develop
|
2018-06-08 15:26:13 +02:00 |
|
|
Roger Braun
|
d64293506c
|
Make scope options optional, refactoring.
|
2018-06-08 15:25:48 +02:00 |
|
Astra
|
ee1b60c9c5
|
Merge branch 'develop' of https://git.pleroma.social/dr1ft/pleroma-fe into develop
|
2018-06-07 17:33:28 -04:00 |
|
|
Astra
|
ca95a108e3
|
should resolve a 3/4 things
|
2018-06-07 17:33:06 -04:00 |
|
|
Astra
|
d62e702994
|
should resolve a 3/4 things
|
2018-06-07 17:31:43 -04:00 |
|
Artik Banana
|
72d9322c02
|
Update messages.js
|
2018-06-07 20:37:06 +00:00 |
|
|
Artik Banana
|
24eddeb3e1
|
Update messages.js
|
2018-06-07 20:28:43 +00:00 |
|
|
Artik Banana
|
da0dcdaaf8
|
Update messages.js
|
2018-06-07 20:28:16 +00:00 |
|
|
Artik Banana
|
17aa44862b
|
Update messages.js
|
2018-06-07 20:20:20 +00:00 |
|
|
Artik Banana
|
da444e85ee
|
Update messages.js
|
2018-06-07 19:56:25 +00:00 |
|
|
Roger Braun
|
72d7693f56
|
Update translation.
|
2018-06-07 19:53:08 +02:00 |
|
|
Astra
|
a759378b4d
|
more lint fixes
|
2018-06-07 05:18:54 -04:00 |
|
|
Astra
|
f49229974a
|
correct linter problems
|
2018-06-07 05:08:39 -04:00 |
|
|
Astra
|
92a8ca0011
|
crt's compose box changes
|
2018-06-07 05:03:50 -04:00 |
|
|
Artik Banana
|
8a49174171
|
Update messages.js
|
2018-06-06 17:43:36 +00:00 |
|
|
Artik Banana
|
dd437222d0
|
Update messages.js
|
2018-06-05 09:09:30 +00:00 |
|
|
lambda
|
648f31f44c
|
Merge branch 'feature/change-password' into 'develop'
Feature/change password
See merge request pleroma/pleroma-fe!268
|
2018-05-24 17:23:44 +00:00 |
|
Syldexia
|
5ae7fb871e
|
Fix formatting
|
2018-05-21 23:01:33 +01:00 |
|
|
Syldexia
|
e0ba6a5876
|
Added change password to user settings
|
2018-05-21 23:01:09 +01:00 |
|
|
Roger Braun
|
f06fef26b1
|
Display visibility if available.
|
2018-05-20 18:28:01 +02:00 |
|
|
Roger Braun
|
959b2d9d66
|
Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion
|
2018-05-20 13:16:49 +02:00 |
|
|
lambda
|
28c60832c7
|
Merge branch 'i18n-fixes' into 'develop'
Pass the "Collapse" label throught the translation function
Closes #105
See merge request pleroma/pleroma-fe!266
|
2018-05-20 11:08:28 +00:00 |
|
chip
|
fcc1ab1d85
|
Pass the "Collapse" label throught the translation function
|
2018-05-19 20:35:14 +02:00 |
|
|
lambda
|
a9dbb8c0c2
|
Merge branch 'l10n-french-20180518' into 'develop'
Correct small typo in french translation
See merge request pleroma/pleroma-fe!265
|
2018-05-19 08:37:42 +00:00 |
|
|
chip
|
8bd561c285
|
Correct typo in french translation
|
2018-05-18 21:39:21 +02:00 |
|
|
lambda
|
5da881e98d
|
Merge branch 'develop' into 'develop'
use es6 notation for exportFollows
See merge request pleroma/pleroma-fe!263
|
2018-05-18 10:45:08 +00:00 |
|
aka
|
3c525d6a3b
|
use es6 notation for exportFollows
|
2018-05-18 07:34:36 -03:00 |
|
|
lambda
|
166d9294c4
|
Merge branch 'feature/follows-export' into 'develop'
Adds an option to export follows (fixed)
See merge request pleroma/pleroma-fe!261
|
2018-05-18 07:51:00 +00:00 |
|
pizzaiolo
|
9b86fc4dcd
|
cleaning up some translations that broke the building
|
2018-05-17 13:24:48 +00:00 |
|
|
aka
|
fed8781583
|
fix linting
|
2018-05-16 19:51:52 -03:00 |
|
|
Roger Braun
|
954e6e0763
|
Make nsfw image easier to understand.
|
2018-05-16 13:01:17 +02:00 |
|
|
pizzaiolo
|
c8cdfda01c
|
fix trailing comma
|
2018-05-16 10:56:46 +00:00 |
|
|
lambda
|
c9e14d7eab
|
Merge branch 'patch-5' into 'develop'
[i18n]Update messages.js
See merge request pleroma/pleroma-fe!259
|
2018-05-16 10:54:40 +00:00 |
|
|
lambda
|
59690670f9
|
Merge branch 'patch-7' into 'develop'
Added inputRadius french translation and improved french translation as discussed with Chip.
See merge request pleroma/pleroma-fe!260
|
2018-05-16 10:51:39 +00:00 |
|
Azurolu
|
fc2bb10444
|
Improved french translation thanks to Chip's suggestions, added inputRadius' french translation.
|
2018-05-16 01:42:54 +00:00 |
|
|
Azurolu
|
1487474c18
|
Added inputRadius french translation and improved french translation as discussed with Chip.
|
2018-05-15 11:17:32 +00:00 |
|
Exilat
|
1ff089a175
|
Update messages.js
|
2018-05-15 05:14:59 +00:00 |
|
|
aka
|
fae7a40aeb
|
Adds an option to export follows
|
2018-05-13 20:47:08 -03:00 |
|
|
Syldexia
|
327b6fb5dc
|
Added delete account section to user settings
|
2018-05-13 15:24:42 +01:00 |
|
|
lambda
|
8f58526bbc
|
Merge branch 'fix/moreCssFixesAndStuff' into 'develop'
Fix/more css fixes and stuff
Closes #77
See merge request pleroma/pleroma-fe!234
|
2018-05-13 12:27:28 +00:00 |
|
|
Henry Jameson
|
dc33c0aaac
|
alternate usercard
|
2018-05-12 16:17:04 +03:00 |
|
|
Henry Jameson
|
4c3d62da04
|
fixed autocomplete lacking highlight
|
2018-05-12 15:19:53 +03:00 |
|
|
Henry Jameson
|
55aeb5b4b2
|
fix
|
2018-05-12 15:19:53 +03:00 |
|
|
Henry Jameson
|
e93ce99198
|
small fix + white color for user-card + opaque outline for text
|
2018-05-12 15:19:53 +03:00 |
|
|
Henry Jameson
|
fc1283da83
|
fixed nsfw hider having very small height, some border-radii for consistency
|
2018-05-12 15:19:53 +03:00 |
|
|
Henry Jameson
|
57e91bc783
|
fix jumping inputbox's height
|
2018-05-12 15:19:53 +03:00 |
|
|
Henry Jameson
|
15a7151ade
|
Entire area around user counters are clickable now, not just the header-link
|
2018-05-12 15:19:53 +03:00 |
|