HJ
|
b65ac128c1
Merge branch 'remove_favorite_hacks' into 'develop'
|
6 years ago |
Shpuld Shpludson
|
c54b1fd0c5
Merge branch 'fix_defaults' into 'develop'
|
6 years ago |
Henry Jameson
|
5c2030e467
no more "broken favorite"
|
6 years ago |
Henry Jameson
|
c7514be46f
Fixed some settings not using defaults from instance config. Made some parts of
|
6 years ago |
shpuld
|
640a287892
Merge branch 'develop' into feature/replace-panel-switcher
|
6 years ago |
HJ
|
562c68a51c
Merge branch 'user-profile-overhault' into 'develop'
|
6 years ago |
Henry Jameson
|
81c83566cd
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
|
6 years ago |
Shpuld Shpludson
|
f62ff2d894
Merge branch 'feature/bigger-icons-for-mobile' into 'develop'
|
6 years ago |
Shpuld Shpludson
|
67c2a607aa
Feature/bigger icons for mobile / #211
|
6 years ago |
lambda
|
2f28bf95fd
Merge branch 'feature/new-user-routes' into 'develop'
|
6 years ago |
lambda
|
c1ff17ebb0
Merge branch 'clean-profile' into 'develop'
|
6 years ago |
Maxim Filippov
|
63ad08050e
Fix oauth url
|
6 years ago |
Henry Jameson
|
485a531d57
clean up the unused stuff
|
6 years ago |
Henry Jameson
|
be27494ca1
Make user profile page cleaner
|
6 years ago |
Henry Jameson
|
56fdbf18c5
missing string and unification with counters (order)
|
6 years ago |
Henry Jameson
|
bf805361d0
collateral fix for tab display
|
6 years ago |
Henry Jameson
|
292ac59d08
Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
|
6 years ago |
Henry Jameson
|
23d434c40c
collateral fixes for user-card: use still-image, styles for custom emoji
|
6 years ago |
Henry Jameson
|
8f255fbad4
Refactor follower/friends out of statuses/timeline into user_profile where it
|
6 years ago |
Shpuld Shpludson
|
b124dbf44e
Merge branch 'captcha' into 'develop'
|
6 years ago |
Maxim Filippov
|
f671adae37
Redirect to /main/all
|
6 years ago |
Maxim Filippov
|
ea6977cd4d
Move userProfile link to methods
|
6 years ago |
Maxim Filippov
|
5f10c5e786
Fix user profile test
|
6 years ago |
Maxim Filippov
|
2211c533dd
Merge branch 'develop' into feature/new-user-routes
|
6 years ago |
Maxim Filippov
|
5fc0fe28e4
Add temporary redirects
|
6 years ago |
Maxim Filippov
|
b524e73a65
Add local profile test
|
6 years ago |
Ekaterina Vaartis
|
d2984b9bc5
Fix style
|
6 years ago |
Ekaterina Vaartis
|
ab6f1904fa
Add a way to get new captcha on click
|
6 years ago |
Ekaterina Vaartis
|
3c9c8052f7
Fix style
|
6 years ago |
Ekaterina Vaartis
|
a525df32c9
Separate captcha into the backendInteractor
|
6 years ago |
Shpuld Shpludson
|
ada4bd0d98
Merge branch 'fix-tab-scroll' into 'develop'
|
6 years ago |
Henry Jameson
|
1b9a5a3efe
more visual fixes
|
6 years ago |
Henry Jameson
|
a1d00b9398
changed bottom-shadow hiding method to be more compatible with overflow
|
6 years ago |
Henry Jameson
|
fc7cd6eaf6
small fix for overflowing tab-switcher
|
6 years ago |
shpuld
|
bd2ed617a7
Remove panel switcher, add rudimentary drawer
|
6 years ago |
Maxim Filippov
|
828b1c78f9
Implement user_profile.spec.js
|
6 years ago |
HJ
|
eaf065c751
Merge branch 'fix-name' into 'develop'
|
6 years ago |
Henry Jameson
|
7d3385f349
fix
|
6 years ago |
Ekaterina Vaartis
|
92de235f4e
Support disabling captcha
|
6 years ago |
Ekaterina Vaartis
|
9303bd5d36
Base support for CAPTCHA (kocaptcha)
|
6 years ago |
Shpuld Shpludson
|
4b30ce64c9
Merge branch 'async_follow' into 'develop'
|
6 years ago |
HJ
|
10a0296aac
Merge branch 'fix-hide-network' into 'develop'
|
6 years ago |
Henry Jameson
|
7346c54df4
oof
|
6 years ago |
Henry Jameson
|
13fbef4550
slightly changed the code to have less mutations, added comments
|
6 years ago |
HJ
|
70ff9ce2b5
Merge branch 'fix-preload-nsfw' into 'develop'
|
6 years ago |
Henry Jameson
|
d7973b0b80
Merge remote-tracking branch 'upstream/develop' into async_follow
|
6 years ago |
HJ
|
a158e75a04
Merge branch 'search-mobile-fixes' into 'develop'
|
6 years ago |
Henry Jameson
|
b4b819f4f4
more damage control
|
6 years ago |
Henry Jameson
|
bd745543b6
Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes
|
6 years ago |
HJ
|
5b6c1aa97c
Merge branch 'fix-chrome' into 'develop'
|
6 years ago |