Henry Jameson
ccb1682379
Add userId property to timelines so that we don't overwrite user timeline meant
...
for another user
2018-12-03 09:29:33 +03:00
lambda
ff60a9e631
Merge branch 'fix/user-search-profile-link' into 'develop'
...
Fix user search profile link
See merge request pleroma/pleroma-fe!382
2018-11-30 19:51:50 +00:00
lambda
fdd8cb619a
Merge branch 'logout_on_password_change' into 'develop'
...
Logout user on password change
Closes #185
See merge request pleroma/pleroma-fe!384
2018-11-30 19:49:48 +00:00
lambda
7d12a65b3b
Merge branch 'fix/switch-to-timeline-on-mobile' into 'develop'
...
Switch to timeline view on mobile when clicking relevant actions
See merge request pleroma/pleroma-fe!383
2018-11-30 19:49:09 +00:00
raeno
59b84c2a06
Do not use underscore at the beginning of the method
2018-11-30 18:53:59 +04:00
raeno
0c3cd05965
Logout user on password change
2018-11-30 17:30:55 +04:00
Maxim Filippov
bee6a0273b
Route user to the correct profile URL
2018-11-28 19:24:50 +03:00
Maxim Filippov
21b600d5e1
Typo
2018-11-28 19:24:19 +03:00
Henry Jameson
b948234aec
whoops
2018-11-26 04:44:54 +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
eal
668087a29e
Switch to timeline on nav panel actions
2018-11-25 19:00:24 +02:00
Roger Braun
c34eebff6c
Add actual user search.
2018-11-14 20:31:06 +01:00
Roger Braun
c7d469249e
Always show dm panel.
2018-11-13 22:30:00 +01:00
Roger Braun
b37a0f4f23
Add direct message tab.
2018-11-13 20:34:56 +01:00
Roger Braun
9f64c96721
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into oauth
2018-11-10 11:00:09 +01:00
Roger Braun
2c2c4452b9
Fix posting.
2018-11-08 19:34:59 +01: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
Roger Braun
6f668df697
Count spoiler text in the character count. Fixes #135 .
2018-11-07 17:20:33 +01:00
Roger Braun
50264410f5
Add login form back in.
2018-11-07 16:56:12 +01:00
Roger Braun
bcbaf5d7ee
Linting.
2018-11-06 21:51:22 +01:00
Roger Braun
4d9680e797
Re-activate registration, use oauth password flow to fetch token.
2018-11-06 21:48:05 +01:00
Roger Braun
60b3e4f40f
Fix linting.
2018-10-26 15:20:39 +02:00
Roger Braun
9af204b293
Move login to oauth.
2018-10-26 15:16:23 +02:00
scarlett
d6ad08050a
Fall back to instance settings consistently
2018-10-21 18:04:23 +01:00
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
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
455cd0d028
settings for scope/subject
2018-09-25 14:47:02 +03:00
William Pitcock
1af5c8fd39
add support for disabling rich text formatting
2018-09-22 03:54:05 +00:00
Henry Jameson
a61ad0544a
small thing to display instance-provided default
2018-09-20 17:21:11 +03:00
Henry Jameson
394153380d
more missing stuff
2018-09-17 17:51:39 +03:00
Henry Jameson
1245d7917f
translations
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
Henry Jameson
89f9b3a468
fixed autocomplete
2018-09-12 11:46:02 +03:00
Hakaba Hitoyo
207c188c16
Debug
2018-09-09 15:22:55 +00: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
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
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
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