2fe0af2af1
Merge branch 'update-japanese-translation' into 'develop'
...
Update japanese translation
See merge request pleroma/pleroma-fe!435
2018-12-25 09:03:05 +00:00
8ae3518a9a
Update japanese translation
2018-12-25 09:03:05 +00:00
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
ed2393c970
fix inconsistencies within who_to_follow_panel
2018-12-25 01:32:20 +00:00
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
18d7684f32
fix for non-shrinking main post form
2018-12-25 04:25:19 +03:00
6fa993c122
remove unneeded numbered variables who_to_follow
2018-12-25 00:34:33 +00:00
e59b67e119
Merge branch 'captcha' into 'develop'
...
Make captcha stateless
See merge request pleroma/pleroma-fe!434
2018-12-22 06:17:56 +00:00
10642df528
Add a translation to the captcha strings in the registration form
2018-12-21 15:12:46 +03:00
661efc51b7
Small UI improvements for the CAPTCHA field
2018-12-21 00:25:36 +03:00
8470856045
Add encrypted captcha_answer_data for stateless captcha
2018-12-21 00:25:09 +03:00
2921a25cb4
Merge branch 'fix_followers' into 'develop'
...
fixes many problems related to user profile
Closes #239
See merge request pleroma/pleroma-fe!432
2018-12-20 06:12:14 +00:00
b7962a224c
fixes many problems related to user profile
2018-12-20 07:54:55 +03:00
5970bf4e85
fixed incorrect height when empty text
2018-12-20 07:27:29 +03:00
afa2baec0c
I suppose SOME browsers don't do this by default...
2018-12-20 07:17:54 +03:00
ae7b96abbf
Fix resize not working properly for textareas
2018-12-20 07:17:54 +03:00
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
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
5c2030e467
no more "broken favorite"
2018-12-19 01:55:53 +03:00
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
562c68a51c
Merge branch 'user-profile-overhault' into 'develop'
...
Small refactor for followers/friends, change display to use tabs instead of "leaky brains"
Closes #111
See merge request pleroma/pleroma-fe!427
2018-12-18 19:48:05 +00:00
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
f62ff2d894
Merge branch 'feature/bigger-icons-for-mobile' into 'develop'
...
Feature/bigger icons for mobile / #211
See merge request pleroma/pleroma-fe!423
2018-12-18 18:26:14 +00:00
67c2a607aa
Feature/bigger icons for mobile / #211
2018-12-18 18:26:14 +00:00
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
c1ff17ebb0
Merge branch 'clean-profile' into 'develop'
...
Make user profile page cleaner
Closes #225
See merge request pleroma/pleroma-fe!428
2018-12-17 19:57:16 +00:00
63ad08050e
Fix oauth url
2018-12-17 21:58:16 +03:00
485a531d57
clean up the unused stuff
2018-12-17 21:02:16 +03:00
be27494ca1
Make user profile page cleaner
2018-12-17 20:42:14 +03:00
56fdbf18c5
missing string and unification with counters (order)
2018-12-17 19:21:05 +03:00
bf805361d0
collateral fix for tab display
2018-12-17 19:18:57 +03:00
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
23d434c40c
collateral fixes for user-card: use still-image, styles for custom emoji
2018-12-17 19:17:03 +03:00
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
b124dbf44e
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma-fe!424
2018-12-17 13:36:56 +00:00
f671adae37
Redirect to /main/all
2018-12-17 03:01:24 +03:00
ea6977cd4d
Move userProfile link to methods
2018-12-17 02:52:27 +03:00
5f10c5e786
Fix user profile test
2018-12-17 02:45:40 +03:00
2211c533dd
Merge branch 'develop' into feature/new-user-routes
2018-12-17 02:39:37 +03:00
5fc0fe28e4
Add temporary redirects
2018-12-17 02:26:40 +03:00
b524e73a65
Add local profile test
2018-12-17 01:53:21 +03:00
d2984b9bc5
Fix style
2018-12-16 22:55:11 +03:00
ab6f1904fa
Add a way to get new captcha on click
2018-12-16 22:47:52 +03:00
3c9c8052f7
Fix style
2018-12-16 20:55:09 +03:00
a525df32c9
Separate captcha into the backendInteractor
2018-12-16 20:53:41 +03:00
ada4bd0d98
Merge branch 'fix-tab-scroll' into 'develop'
...
Fix tab scroll
See merge request pleroma/pleroma-fe!426
2018-12-16 07:56:29 +00:00
1b9a5a3efe
more visual fixes
2018-12-16 02:40:32 +03:00
a1d00b9398
changed bottom-shadow hiding method to be more compatible with overflow
2018-12-16 02:07:32 +03:00
fc7cd6eaf6
small fix for overflowing tab-switcher
2018-12-16 02:02:49 +03:00
828b1c78f9
Implement user_profile.spec.js
2018-12-15 06:16:44 +03:00
Shpuld Shpludson