Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2206 commits 59 branches 16 tags 15 MiB
Commit graph

2206 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
HJ
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
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
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
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
lambda
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
Maxim Filippov
63ad08050e Fix oauth url 2018-12-17 21:58:16 +03: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
f671adae37 Redirect to /main/all 2018-12-17 03:01:24 +03:00
Maxim Filippov
ea6977cd4d Move userProfile link to methods 2018-12-17 02:52:27 +03:00
Maxim Filippov
5f10c5e786 Fix user profile test 2018-12-17 02:45:40 +03:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Maxim Filippov
5fc0fe28e4 Add temporary redirects 2018-12-17 02:26:40 +03:00
Maxim Filippov
b524e73a65 Add local profile test 2018-12-17 01:53:21 +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
Shpuld Shpludson
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
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
shpuld
bd2ed617a7 Remove panel switcher, add rudimentary drawer 2018-12-15 19:13:01 +02:00
Maxim Filippov
828b1c78f9 Implement user_profile.spec.js 2018-12-15 06:16:44 +03:00
HJ
eaf065c751 Merge branch 'fix-name' into 'develop' 
Fix impossible to change name

See merge request pleroma/pleroma-fe!425
 2018-12-15 00:38:47 +00:00
Henry Jameson
7d3385f349 fix 2018-12-15 03:30:39 +03:00
Ekaterina Vaartis
92de235f4e Support disabling captcha 2018-12-15 03:06:21 +03:00
Ekaterina Vaartis
9303bd5d36 Base support for CAPTCHA (kocaptcha) 2018-12-15 03:05:47 +03:00
Shpuld Shpludson
4b30ce64c9 Merge branch 'async_follow' into 'develop' 
Better "follow" button behavior

Closes #133

See merge request pleroma/pleroma-fe!396
 2018-12-14 17:33:11 +00:00
HJ
10a0296aac Merge branch 'fix-hide-network' into 'develop' 
oof

See merge request pleroma/pleroma-fe!422
 2018-12-14 14:51:59 +00:00
Henry Jameson
7346c54df4 oof 2018-12-14 17:47:48 +03:00
Henry Jameson
13fbef4550 slightly changed the code to have less mutations, added comments 2018-12-14 17:33:48 +03:00
HJ
70ff9ce2b5 Merge branch 'fix-preload-nsfw' into 'develop' 
Fix preload images option being always disabled

See merge request pleroma/pleroma-fe!421
 2018-12-14 14:25:16 +00:00
Henry Jameson
d7973b0b80 Merge remote-tracking branch 'upstream/develop' into async_follow 
* upstream/develop: (45 commits)
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  added condition to check for logined user
  fix gradients and minor artifacts
  keep track of new instance options
  fix old MR
  oof
  get rid of slots
  fix timeago font
  added hide_network option, fixed properties naming
  Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
  improve notification subscription
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  Write a unit test for fileSizeFormatService
  add checkbox to disable web push
  I am dumb
  Handle errors from server
  Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
  ...
 2018-12-14 17:17:58 +03:00
HJ
a158e75a04 Merge branch 'search-mobile-fixes' into 'develop' 
Fixes for user-finder on mobile

Closes #188 and #179

See merge request pleroma/pleroma-fe!389
 2018-12-14 14:15:26 +00:00