shpuld
16c7bd0199
merge develop, fix conflicts, fix logged out bug
2018-12-29 16:25:45 +02:00
lambda
1555a5fef3
Merge branch 'restore-routes' into 'develop'
...
Restore old routes, enable user route as fallback.
See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
shpuld
747e4090ca
Cleanup and remove divider element in side drawer
2018-12-29 12:44:21 +02:00
shpuld
650655709d
fix conflict in user card content
2018-12-28 21:44:09 +02:00
shpuld
85c058e95c
New routes, notifications, other impovements in side drwaer
2018-12-28 21:39:54 +02:00
Lambda
f35dbaf064
Treat reserved users like external users in the frontend.
2018-12-26 14:50:48 +01:00
HJ
fa8ecb1c39
User Card Content fixes and updates
2018-12-26 09:19:25 +00:00
Lambda
24eba26c5b
Restore old routes, enable user route as fallback.
2018-12-25 18:43:52 +01:00
HJ
a80c8fd24c
Merge branch 'refactor-recommendations' into 'develop'
...
remove unneeded numbered variables who_to_follow
See merge request pleroma/pleroma-fe!436
2018-12-25 02:35:30 +00:00
Hannah Ward
ed2393c970
fix inconsistencies within who_to_follow_panel
2018-12-25 01:32:20 +00:00
HJ
698328dfbe
Merge branch 'fix_textfields' into 'develop'
...
Fix textarea not resizing correctly and probably cursor position
Closes #230
See merge request pleroma/pleroma-fe!430
2018-12-25 01:29:18 +00:00
Henry Jameson
18d7684f32
fix for non-shrinking main post form
2018-12-25 04:25:19 +03:00
Hannah Ward
6fa993c122
remove unneeded numbered variables who_to_follow
2018-12-25 00:34:33 +00:00
shpuld
4752081818
Add closed-check for touchmove
2018-12-23 20:14:40 +02:00
shpuld
e46b560ead
move closing logic to drawer, add swipe to close
2018-12-23 19:50:19 +02:00
shpuld
f72b1d048e
Merge branch 'develop' into feature/replace-panel-switcher
2018-12-22 17:32:35 +02:00
shpuld
4836c8ac74
Add some more routes to side drawer
2018-12-22 17:32:07 +02:00
Ekaterina Vaartis
10642df528
Add a translation to the captcha strings in the registration form
2018-12-21 15:12:46 +03:00
Ekaterina Vaartis
661efc51b7
Small UI improvements for the CAPTCHA field
2018-12-21 00:25:36 +03:00
Ekaterina Vaartis
8470856045
Add encrypted captcha_answer_data for stateless captcha
2018-12-21 00:25:09 +03:00
shpuld
67263cde05
works but hacky
2018-12-20 22:20:04 +02:00
Henry Jameson
b7962a224c
fixes many problems related to user profile
2018-12-20 07:54:55 +03:00
Henry Jameson
5970bf4e85
fixed incorrect height when empty text
2018-12-20 07:27:29 +03:00
Henry Jameson
afa2baec0c
I suppose SOME browsers don't do this by default...
2018-12-20 07:17:54 +03:00
Henry Jameson
ae7b96abbf
Fix resize not working properly for textareas
2018-12-20 07:17:54 +03:00
HJ
b65ac128c1
Merge branch 'remove_favorite_hacks' into 'develop'
...
no more "broken favorite"
Closes #218 and #145
See merge request pleroma/pleroma-fe!431
2018-12-19 14:57:25 +00:00
Shpuld Shpludson
c54b1fd0c5
Merge branch 'fix_defaults' into 'develop'
...
Fixed some settings not using defaults from instance config.
Closes #228
See merge request pleroma/pleroma-fe!429
2018-12-19 04:51:21 +00:00
Henry Jameson
5c2030e467
no more "broken favorite"
2018-12-19 01:55:53 +03:00
Henry Jameson
c7514be46f
Fixed some settings not using defaults from instance config. Made some parts of
...
code more readable
2018-12-18 23:31:10 +03:00
shpuld
640a287892
Merge branch 'develop' into feature/replace-panel-switcher
2018-12-18 22:09:27 +02:00
Henry Jameson
81c83566cd
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
...
* upstream/develop: (24 commits)
Feature/bigger icons for mobile / #211
Fix oauth url
Make user profile page cleaner
Redirect to /main/all
Move userProfile link to methods
Fix user profile test
Add temporary redirects
Add local profile test
Implement user_profile.spec.js
Use babel polyfill in karma
Use 'userProfileLink' to generate user-profile link
Rollback disableDotRule
Use "-1" in indexOf
Add generateProfileLink
Use "~" as a route namespace symbol
Disable dot rule
Pass userName instead of userId
Typo in tests
Fix redirect paths
Fix typo
...
2018-12-18 22:43:26 +03:00
Shpuld Shpludson
67c2a607aa
Feature/bigger icons for mobile / #211
2018-12-18 18:26:14 +00:00
lambda
2f28bf95fd
Merge branch 'feature/new-user-routes' into 'develop'
...
Make domain.com/username routes work
Closes pleroma#395
See merge request pleroma/pleroma-fe!392
2018-12-18 15:26:00 +00:00
Henry Jameson
485a531d57
clean up the unused stuff
2018-12-17 21:02:16 +03:00
Henry Jameson
be27494ca1
Make user profile page cleaner
2018-12-17 20:42:14 +03:00
Henry Jameson
56fdbf18c5
missing string and unification with counters (order)
2018-12-17 19:21:05 +03:00
Henry Jameson
bf805361d0
collateral fix for tab display
2018-12-17 19:18:57 +03:00
Henry Jameson
292ac59d08
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
...
* upstream/develop:
Fix style
Add a way to get new captcha on click
Fix style
Separate captcha into the backendInteractor
more visual fixes
changed bottom-shadow hiding method to be more compatible with overflow
small fix for overflowing tab-switcher
Support disabling captcha
Base support for CAPTCHA (kocaptcha)
2018-12-17 19:18:35 +03:00
Henry Jameson
23d434c40c
collateral fixes for user-card: use still-image, styles for custom emoji
2018-12-17 19:17:03 +03:00
Henry Jameson
8f255fbad4
Refactor follower/friends out of statuses/timeline into user_profile where it
...
belongs. Changed display of profile to single panel with tabs.
2018-12-17 19:14:38 +03:00
Shpuld Shpludson
b124dbf44e
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma-fe!424
2018-12-17 13:36:56 +00:00
Maxim Filippov
ea6977cd4d
Move userProfile link to methods
2018-12-17 02:52:27 +03:00
Maxim Filippov
2211c533dd
Merge branch 'develop' into feature/new-user-routes
2018-12-17 02:39:37 +03:00
Ekaterina Vaartis
d2984b9bc5
Fix style
2018-12-16 22:55:11 +03:00
Ekaterina Vaartis
ab6f1904fa
Add a way to get new captcha on click
2018-12-16 22:47:52 +03:00
Ekaterina Vaartis
3c9c8052f7
Fix style
2018-12-16 20:55:09 +03:00
Ekaterina Vaartis
a525df32c9
Separate captcha into the backendInteractor
2018-12-16 20:53:41 +03:00
Henry Jameson
1b9a5a3efe
more visual fixes
2018-12-16 02:40:32 +03:00
Henry Jameson
a1d00b9398
changed bottom-shadow hiding method to be more compatible with overflow
2018-12-16 02:07:32 +03:00
Henry Jameson
fc7cd6eaf6
small fix for overflowing tab-switcher
2018-12-16 02:02:49 +03:00