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

2085 commits

Author SHA1 Message Date
Maxim Filippov
0f530de397 Add "noAttachmentLinks" to src/modules/instance.js 2018-12-27 19:59:56 +03:00
Maxim Filippov
85c487b933 Make "noAttachmentLinks" configurable 2018-12-27 13:25:11 +03:00
Maxim Filippov
13855f46e2 No attachment links 2018-12-27 02:37:36 +03:00
HJ
754cb23f35 Merge branch 'improve_push' into 'develop' 
Improve web push notifications

Closes #231

See merge request pleroma/pleroma-fe!438
 2018-12-26 13:58:11 +00: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
Egor Kislitsyn
c5847349e0 improve web push notifications 2018-12-25 20:43:18 +07:00
HJ
0ad837846a Merge branch 'push_fix' into 'develop' 
Fixes for push notifications

Closes #235

See merge request pleroma/pleroma-fe!433
 2018-12-25 11:33:00 +00:00
Henry Jameson
500b4bd374 fix 2018-12-25 14:28:49 +03:00
Hakaba Hitoyo
8ae3518a9a Update japanese translation 2018-12-25 09:03:05 +00: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
Henry Jameson
e3cac42cc7 Merge remote-tracking branch 'upstream/develop' into push_fix 
* upstream/develop:
  Add a translation to the captcha strings in the registration form
  Small UI improvements for the CAPTCHA field
  Add encrypted captcha_answer_data for stateless captcha
  fixes many problems related to user profile
 2018-12-25 03:46:51 +03:00
Henry Jameson
a4f0902926 small refactor, added push unsub notice for BE 2018-12-25 03:46: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
957b2a6f7e simplified some code, made it possible to unregister serviceworker altogether 2018-12-20 09:17:59 +03:00
Henry Jameson
d0b47488fb default webPush to false, because having it at true leads to some problems with 
local dev mode. Instances can re-enable it, and BE can default it to true in config.exs
 2018-12-20 09:17:51 +03: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
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
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
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
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
Henry Jameson
b4b819f4f4 more damage control 2018-12-14 17:14:55 +03:00
Henry Jameson
bd745543b6 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes 
* upstream/develop: (176 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
  Fix typo that prevented scope copy from working.
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  ...
 2018-12-14 17:10:26 +03:00
Henry Jameson
ac80cf868f fix chrome 2018-12-14 14:35:56 +03:00
HJ
99b2b7a203 Merge branch 'feature/file-size-checking' into 'develop' 
[pleroma#36] Add errors when file uploading fails

See merge request pleroma/pleroma-fe!405
 2018-12-13 21:02:17 +00:00
ValD
e2f825266a added condition to check for logined user 2018-12-13 23:20:59 +05:30
Henry Jameson
cc259411a7 fix gradients and minor artifacts 2018-12-13 20:41:23 +03:00
Henry Jameson
e1b523016b keep track of new instance options 2018-12-13 20:41:01 +03:00
Maxim Filippov
1341a7bb9c Use babel polyfill in karma 2018-12-13 20:27:03 +03:00
Henry Jameson
f87001c22f fix old MR 2018-12-13 20:25:46 +03:00
Maxim Filippov
e4a34cc4d4 Use 'userProfileLink' to generate user-profile link 2018-12-13 19:57:11 +03:00
Shpuld Shpludson
ac60550e07 Merge branch 'mobile-back' into 'develop' 
Back button for mobile

Closes #197

See merge request pleroma/pleroma-fe!403
 2018-12-13 15:12:27 +00:00
Shpuld Shpludson
915487072b Merge branch 'fix/reset-follows-export' into 'develop' 
Reset enableFollowsExport when an export file is available to download

See merge request pleroma/pleroma-fe!412
 2018-12-13 15:06:50 +00:00
Shpuld Shpludson
aa7cff92aa Merge branch 'feature/configurable-nsfw-censor-image' into 'develop' 
make nsfw censor image configurable

See merge request pleroma/pleroma-fe!243
 2018-12-13 15:04:55 +00:00
Rinpatch
dd6a9ae645 oof 2018-12-13 17:51:29 +03:00
Shpuld Shpludson
25a88da17a Merge branch 'fix_loading_flicker' into 'develop' 
Throttle fetching old statuses to prevent spam, especially during scroll

Closes #176

See merge request pleroma/pleroma-fe!393
 2018-12-13 14:51:27 +00:00
Henry Jameson
610724ffcd Merge remote-tracking branch 'upstream/develop' into mobile-back 
* upstream/develop: (142 commits)
  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
  Fix typo that prevented scope copy from working.
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  removed counters from left panel
  added router-links to all relavent links
  added activatePanel onclick for timeago button
  added PR comments
  add checkbox to disable web push
  removed brackets from condition
  resolved lint issue
  renamed config to preload images and add ident to config
  added config for preload and made attachment responsive to it
  preload nsfw image
  fix
  ...
 2018-12-13 17:50:36 +03:00
rinpatch
457132fb37 get rid of slots 2018-12-13 15:44:37 +01:00
Shpuld Shpludson
dbe79a3c26 Merge branch 'dev-qol' into 'develop' 
Several fixes to make life of contributors a tiny bit easier.

See merge request pleroma/pleroma-fe!409
 2018-12-13 14:42:58 +00:00
Shpuld Shpludson
c824d25378 Merge branch 'fix_empty_profiles' into 'develop' 
Improved user profile display

Closes #82

See merge request pleroma/pleroma-fe!414
 2018-12-13 14:41:57 +00:00
Shpuld Shpludson
ad905576fc Merge branch 'hide_network' into 'develop' 
FE part of pleroma!490

See merge request pleroma/pleroma-fe!415
 2018-12-13 14:40:49 +00:00
Rinpatch
6de4dcc7c9 Resolve merge conflict 2018-12-13 17:22:19 +03:00
Henry Jameson
ff36d34186 fix timeago font 2018-12-13 17:20:31 +03:00
Henry Jameson
fa7c3c2097 Merge remote-tracking branch 'upstream/develop' into fix_empty_profiles 
* upstream/develop: (121 commits)
  improve notification subscription
  Fix typo that prevented scope copy from working.
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  removed counters from left panel
  added router-links to all relavent links
  added activatePanel onclick for timeago button
  added PR comments
  add checkbox to disable web push
  removed brackets from condition
  resolved lint issue
  renamed config to preload images and add ident to config
  added config for preload and made attachment responsive to it
  preload nsfw image
  fix
  fixed wrong height for selects
  better layouting for import-export, error display fixes
  added keep-colors option
  ...
 2018-12-13 17:11:22 +03:00
Henry Jameson
9dfff10717 Merge remote-tracking branch 'upstream/develop' into async_follow 
* upstream/develop: (131 commits)
  Fix typo that prevented scope copy from working.
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  removed counters from left panel
  added router-links to all relavent links
  added activatePanel onclick for timeago button
  added PR comments
  removed brackets from condition
  resolved lint issue
  renamed config to preload images and add ident to config
  added config for preload and made attachment responsive to it
  preload nsfw image
  fix
  fixed wrong height for selects
  better layouting for import-export, error display fixes
  added keep-colors option
  separated preview and exported from style_switcher
  revert that, it's actually used, i'm an idiot
  ...
 2018-12-13 16:15:47 +03:00
Henry Jameson
c52b8019ae added hide_network option, fixed properties naming 2018-12-13 16:04:22 +03:00
Henry Jameson
42bb348219 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.
 2018-12-13 15:34:51 +03:00
Egor Kislitsyn
a8521fc8d9 Merge commit 'e443716bcd616ad61efae161624dd970841a935c' into feature/push-subscriptions 
# Conflicts:
#	src/i18n/en.json
#	src/modules/interface.js
#	src/modules/users.js
#	yarn.lock
 2018-12-13 18:22:15 +07:00
Egor Kislitsyn
b3455649c5 improve notification subscription 2018-12-13 18:04:09 +07:00
Maxim Filippov
7ffb7e6795 Use "-1" in indexOf 2018-12-13 13:51:47 +03:00
HJ
e443716bcd Merge branch 'fix-scope-copy' into 'develop' 
Fix typo that prevented scope copy from working.

Closes #214

See merge request pleroma/pleroma-fe!413
 2018-12-13 10:39:50 +00:00
Henry Jameson
9f48055261 Fix typo that prevented scope copy from working. 2018-12-13 13:34:47 +03:00
Rinpatch
48edc0c8fc Refactor arrays to individual options 2018-12-13 11:25:03 +03:00
Maxim Filippov
24caa2cfcd Add generateProfileLink 2018-12-13 05:00:01 +03:00
link0ff
33c2d21bb7 Reset enableFollowsExport to true after 2 sec when an export file is available to download 2018-12-12 22:00:04 +02:00
HJ
2077927ff3 Merge branch 'dev_vald_fe/user_name_panel' into 'develop' 
activate panel on user screen click

See merge request pleroma/pleroma-fe!408
 2018-12-12 19:31:15 +00:00
ValD
ce6d75331b added check for activatePanel is function or not 2018-12-13 00:56:04 +05:30
HJ
7325ff2e7a Merge branch 'dev_vald_fe/nsfw_preload' into 'develop' 
preload nsfw image

Closes #193

See merge request pleroma/pleroma-fe!411
 2018-12-12 19:01:53 +00:00
HJ
f0fb6e6015 Merge branch 'dev_vald_fe/timeago_panel' into 'develop' 
added activatePanel onclick for timeago button

See merge request pleroma/pleroma-fe!407
 2018-12-12 18:47:56 +00:00
ValD
481c5ecba8 addressed PR comments 2018-12-13 00:14:47 +05:30
ValD
e3848f6efb activate panel on user screen click 2018-12-13 00:13:47 +05:30
ValD
b271957b4c added not preload check so hidden toggles asap 2018-12-13 00:11:01 +05:30
ValD
33b962b13e removed counters from left panel 2018-12-12 23:56:12 +05:30
ValD
7556efa04f added router-links to all relavent links 2018-12-12 23:34:22 +05:30
ValD
1623dcb417 added activatePanel onclick for timeago button 2018-12-12 23:34:22 +05:30
ValD
7c6c2cfb22 added PR comments 2018-12-12 23:29:13 +05:30
Egor Kislitsyn
02c0e15781 add checkbox to disable web push 2018-12-13 00:03:50 +07:00
Rinpatch
9c24ac1d05 I am dumb 2018-12-12 20:01:37 +03:00
Rinpatch
5ca2e75df3 Handle errors from server 2018-12-12 19:31:16 +03:00
ValD
6d3bd95bfe removed brackets from condition 2018-12-12 15:07:07 +00:00
Rinpatch
bf8bb9ce13 Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n 2018-12-12 16:38:01 +03:00
ValD
de5d846ebd resolved lint issue 2018-12-12 03:44:45 +05:30
ValD
139659d42c renamed config to preload images and add ident to config 2018-12-12 03:42:29 +05:30
ValD
7b4e08dd93 added config for preload and made attachment responsive to it 2018-12-12 03:33:53 +05:30
ValD
b195ce12e1 preload nsfw image 2018-12-12 02:28:36 +05:30
Henry Jameson
c54eb1ecad fix 2018-12-11 19:01:08 +03:00
Henry Jameson
b839ba7870 Quality of Frontend Developer's Life: here to stay 2018-12-11 18:45:25 +03:00
Henry Jameson
c3f8b713a7 fixed wrong height for selects 2018-12-11 16:37:03 +03:00
Henry Jameson
83b85cd412 better layouting for import-export, error display fixes 2018-12-11 16:36:27 +03:00
Henry Jameson
c189a08dff added keep-colors option 2018-12-11 16:36:06 +03:00
Rinpatch
25a04f2294 Avatar, background, banner filesize errors 2018-12-11 16:02:35 +03:00
Henry Jameson
51dccb7887 separated preview and exported from style_switcher 2018-12-11 02:46:17 +03:00
Henry Jameson
a17ac74df7 revert that, it's actually used, i'm an idiot 2018-12-11 02:05:22 +03:00
Henry Jameson
90a5670661 removed unused function from color_convert 2018-12-11 01:41:19 +03:00
Henry Jameson
73aa9153d9 cleanup 2018-12-11 01:40:19 +03:00
Henry Jameson
4b25475b57 setColors -> applyTheme. For sanity. Also disabled export because nobody uses it 
and should not use anyway.
 2018-12-11 01:39:18 +03:00
Henry Jameson
fe2fe09236 fixed v2 setting as default theme 2018-12-11 01:38:20 +03:00
Henry Jameson
3452864260 Merge remote-tracking branch 'upstream/develop' into feature/theming2 
* upstream/develop:
  Fix color fallback order
  Use console.warn instead of console.log
  Get rid of mutation_types file, use inline approach. Minor fixes
  Add fallback color rule.
  Change english validation error messages
  Clean up the code
  Validate name presence on client-side as well
  Better styling for client-side validation. Add I18n for validation errors.
  Fix broken ToS link. Fix linter errors
  Add client validation for registration form
  Use Array.reduce instead of lodash.reduce
  Humanize validation errors returned on registration
  Added user option to hide instance-specific panel, rearranged config screen to better categorize it / adjustments to language selector
  fix
 2018-12-11 01:01:16 +03:00
Henry Jameson
aeecd2b09b separate font control js 2018-12-11 00:56:15 +03:00
Egor Kislitsyn
ee70ec4c7e fix race condition 2018-12-10 22:36:25 +07:00
Rinpatch
6a00854189 Count in binary bytes and remove i18 from file size format service 2018-12-10 17:06:32 +03:00
Rinpatch
88145c5934 Add a space between filesizes 2018-12-10 10:04:42 +03:00
Rinpatch
5c7a316df9 Lint 2018-12-10 09:56:07 +03:00
Rinpatch
c69a8dc197 Add file size formating 2018-12-10 09:50:04 +03:00
Maxim Filippov
ae8f0f36d8 Use "~" as a route namespace symbol 2018-12-10 01:21:52 +03:00
Egor Kislitsyn
73b17d70ec improve push notifications code 2018-12-09 19:25:43 +07:00
rinpatch
4fde987e34 Fix formating 2018-12-08 22:39:58 +01:00
rinpatch
f69331e49d Improve error messages 2018-12-08 22:36:54 +01:00
rinpatch
788383d8a1 Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content 2018-12-08 21:56:00 +01:00
Rinpatch
ba188eddab [pleroma#36] Add upload errors 2018-12-08 18:23:21 +03:00
lambda
fb5261b926 Merge branch 'hideISP' into 'develop' 
Add user configuration option to hide instance-specific panel

Closes #196

See merge request pleroma/pleroma-fe!402
 2018-12-08 10:05:16 +00:00
Egor Kislitsyn
11716a7a53 second attempt to add subscribe module and fix race condition 2018-12-07 20:13:36 +07:00
Egor Kislitsyn
a85d128d37 Revert "add subscribe module and fix race condition" 
This reverts commit 07f1b8523e.
 2018-12-07 18:53:40 +07:00
Egor Kislitsyn
07f1b8523e add subscribe module and fix race condition 2018-12-07 18:13:04 +07:00
Egor Kislitsyn
264da19f69 fix typo 2018-12-07 15:21:19 +07:00
Egor Kislitsyn
bbae2e10f3 Add configuration to enable/disable web push notifications 2018-12-07 15:15:31 +07:00
Egor Kislitsyn
ebe2a95140 improve web push notifications 2018-12-07 14:57:35 +07:00
Maxim Filippov
c1dc69a038 Pass userName instead of userId 2018-12-06 22:10:46 +03:00
Maxim Filippov
7d5794b9fa Fix redirect paths 2018-12-06 22:10:46 +03:00
Maxim Filippov
54c6438b17 Fix typo 2018-12-06 22:09:54 +03:00
Maxim Filippov
eb4cd64152 Fix avatar styles 2018-12-06 22:09:54 +03:00
Maxim Filippov
6532462b95 Move old routes to /p, use /nickname for user profiles 2018-12-06 22:09:54 +03:00
Maxim Filippov
79d864c3f2 Move routes to the separate file -> make it testable 2018-12-06 22:09:54 +03:00
Egor Kislitsyn
09147cacea add service worker and push notifications 2018-12-06 20:34:00 +07:00
raeno
8987c3025d Fix color fallback order 2018-12-05 23:35:15 +04:00
raeno
e3d0917db8 Use console.warn instead of console.log 2018-12-05 23:13:08 +04:00
raeno
a3e19cbafa Get rid of mutation_types file, use inline approach. Minor fixes 2018-12-05 23:07:58 +04:00
raeno
636be3b681 Add fallback color rule. 2018-12-05 23:05:43 +04:00
raeno
c03cc3ae83 Change english validation error messages 2018-12-05 20:29:59 +04:00
raeno
f1d1fd64d3 Clean up the code 2018-12-05 20:19:39 +04:00
raeno
91a72d51ff Validate name presence on client-side as well 
* remove email address validation, we have it covered by html itself and it's quite annoying
* add shakeError animation
* fix styles a bit
 2018-12-05 19:42:33 +04:00
raeno
f9ff839b1a Better styling for client-side validation. Add I18n for validation errors. 2018-12-05 19:17:29 +04:00
Henry Jameson
403c86e4d1 back button for mobile 2018-12-05 15:01:56 +03:00
raeno
2b903f790d Fix broken ToS link. Fix linter errors 2018-12-05 13:47:42 +04:00
raeno
0029313775 Add client validation for registration form 
* also extract registration logic to users.js module
 2018-12-05 13:44:12 +04:00
raeno
02e000b53e Use Array.reduce instead of lodash.reduce 2018-12-05 13:44:12 +04:00
raeno
822559afd8 Humanize validation errors returned on registration 2018-12-05 13:44:12 +04:00
Henry Jameson
6636c0f551 mobile fixes 2018-12-05 12:01:24 +03:00
Henry Jameson
47b0b385f4 Added user option to hide instance-specific panel, rearranged config screen to 
better categorize it / adjustments to language selector
 2018-12-05 11:37:01 +03:00
Henry Jameson
c241de4634 fix 2018-12-05 10:51:11 +03:00
Henry Jameson
51cf4dc298 Merge remote-tracking branch 'upstream/develop' into feature/theming2 
* upstream/develop:
  Fix iOS Safari from making videos play fullscreen by default
  added PR comments
  resolved the lint
  used the deleted data param as condition in status template
  Switch to "timeline" when pressing user-settings
  Added user setting tooltip
  made links in user bio always open in new tabs
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
  Do not use underscore at the beginning of the method
  Logout user on password change
  Route user to the correct profile URL
  Typo
  Fix filetype detection
  Switch to settings when touching settings
  Switch to timeline on nav panel actions
 2018-12-05 10:43:03 +03:00
Henry
9143862707 Merge branch 'fix/user-settings-switch' into 'develop' 
Switch to "timeline" when pressing user-settings

See merge request pleroma/pleroma-fe!397
 2018-12-05 07:34:27 +00:00
Mark Felder
75879621b1 Fix iOS Safari from making videos play fullscreen by default 
This works in iOS 10+.
 2018-12-04 17:05:38 -06:00
ValD
57366ff0cc added PR comments 2018-12-05 00:38:53 +05:30
ValD
88aa0f1245 resolved the lint 2018-12-05 00:19:00 +05:30
ValD
da3adff5a8 used the deleted data param as condition in status template 2018-12-05 00:15:08 +05:30
eal
5eced8bf09 Switch to "timeline" when pressing user-settings 2018-12-04 18:24:31 +02:00
lambda
f146562d70 Merge branch 'target_blank_profile' into 'develop' 
Made links in user bio always open in new tabs

Closes #169

See merge request pleroma/pleroma-fe!394
 2018-12-04 12:10:35 +00:00
ValD
ea4fafb27e Added user setting tooltip 2018-12-04 15:24:01 +05:30
Henry Jameson
ca19025187 Added support for async following including delayed confirmation if we followed 
user or not
 2018-12-04 12:50:29 +03:00
Henry Jameson
6d6d1102d9 made links in user bio always open in new tabs 2018-12-04 11:38:00 +03:00
Henry Jameson
8b1e1b182a throttle fetching old statuses to prevent spam, especially during scroll 2018-12-04 11:04:46 +03:00
Henry Jameson
7a13c530c7 Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes 
* upstream/develop:
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
 2018-12-04 09:56:45 +03:00
ValD
c142f7b7b6 addressed PR comments 2018-12-04 00:45:31 +05:30
ValD
c40bda7c2a added tooltip 2018-12-04 00:45:31 +05:30
lambda
b851b8dd02 Merge branch 'fix-vimium' into 'develop' 
fixes vimium not giving retweet button a hint

Closes #166

See merge request pleroma/pleroma-fe!385
 2018-12-03 17:56:21 +00:00
lambda
9e78eddf2a Merge branch 'subject-line-entry-auto' into 'develop' 
Added option to auto-hide subject field when it's empty.

Closes #174

See merge request pleroma/pleroma-fe!388
 2018-12-03 14:55:43 +00:00
lambda
ea28aa62f0 Merge branch 'ss-read' into 'develop' 
Server-side read marking

See merge request pleroma/pleroma-fe!386
 2018-12-03 14:47:27 +00:00
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
Henry Jameson
6b3489a4d3 search button for user finder 2018-12-03 08:03:11 +03:00
Henry Jameson
ea805bbbe6 hide logo when opening search bar on small screens 2018-12-03 07:49:14 +03:00
Henry Jameson
b34097a5c1 Added option to auto-hide subject field when it's empty. 2018-12-03 06:47:35 +03:00
Henry Jameson
e95b6c7e53 fix 2018-12-02 15:20:25 +03:00
Henry Jameson
fad19c3c2f fix 2018-12-02 15:10:18 +03:00
Henry Jameson
dd4deae66e fallback for some weird case on my phone 2018-12-02 15:03:51 +03:00
Henry Jameson
b555d617e4 removes hacks from notifications storage, adds api call to let server update 
is_seen attribute
 2018-12-02 13:36:11 +03:00
Henry Jameson
8174248b98 fixes vimium not giving retweet button a hint 2018-12-02 13:05:18 +03:00
Henry Jameson
d756455c34 todo 2018-12-02 12:56:02 +03:00
Henry Jameson
1e56cec2aa missing string 2018-12-02 10:23:41 +03:00
Henry Jameson
80c0745558 some more themes, fixes 2018-12-02 10:22:25 +03:00
Henry Jameson
67ca21b2e6 localization strings, fixes 2018-12-02 09:38:40 +03:00
Henry Jameson
bee738c815 making inset shadows work on avatars again 2018-12-02 08:47:55 +03:00
Henry Jameson
77ac42d919 fix retweeter avatar not getting proper shadow 2018-12-01 14:59:22 +03:00
lambda
e15b9bddbb Merge branch 'file-type-service-fix' into 'develop' 
Modify filetype service to accept more generic mimetypes

See merge request pleroma/pleroma-fe!381
 2018-12-01 08:35:51 +00: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
Henry Jameson
406df4399b avatars shadows, also allows drop-shadow use 2018-11-30 16:39:53 +03: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
rinpatch
cddb173089 Fix filetype detection 2018-11-27 18:44:49 +03:00
Henry Jameson
b45fc6c652 updated preview window 2018-11-27 05:01:18 +03:00
Henry Jameson
f8e17cbdc5 lint fix 2018-11-27 05:01:18 +03:00
Henry Jameson
2ebc06e30f fixed keep checkboxes working when exporting 2018-11-26 21:07:22 +03:00
Henry Jameson
f039b79e5a unbreak user profiles 2018-11-26 20:25:14 +03:00
Henry Jameson
d64f4ab363 fix preview input text using wrong string 2018-11-26 20:14:53 +03:00
Henry Jameson
bb39b99d65 fix panel link color, fix broken user profiles 2018-11-26 20:13:56 +03:00
Henry Jameson
a806d43f05 Merge remote-tracking branch 'upstream/develop' into feature/theming2 
* upstream/develop: (60 commits)
  whoops
  whoops
  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
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  On logout switch to public timeline.
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Put oauth text into description.
  Display OAuth login on login form button.
  ...
 2018-11-26 05:21:58 +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
Henry Jameson
9a9dc47fc5 better preview, collateral fixes 2018-11-26 03:19:04 +03:00
Henry Jameson
572c874f5c theme separation 2018-11-26 02:29:08 +03:00
Henry
f1a23f2b6e Merge branch 'update-japanese-translation' into 'develop' 
Update Japanese translation

See merge request pleroma/pleroma-fe!378
 2018-11-25 22:53:21 +00:00
Henry Jameson
d7eec4c30d more styles 2018-11-26 00:23:07 +03:00
Henry Jameson
94b481fa9c cosmetic fixes 2018-11-26 00:19:28 +03:00
Henry Jameson
1087741b0d font control args to allow passing an option list of fonts, for future use 2018-11-25 22:39:06 +03:00
Henry Jameson
707441ffe6 more fonts 2018-11-25 22:06:49 +03:00
Henry Jameson
1a65895bfd initial font support 2018-11-25 21:48:16 +03:00
eal
2d48292683 Switch to settings when touching settings 2018-11-25 19:18:16 +02:00
eal
668087a29e Switch to timeline on nav panel actions 2018-11-25 19:00:24 +02:00
Henry Jameson
e8536f3d95 clean up 2018-11-25 19:15:54 +03:00
Henry Jameson
883a76147a validity checks, no longer exploding when something is invalid 2018-11-25 19:12:38 +03:00
eal
3ed05693de DM timeline: stream new statuses 2018-11-25 18:11:57 +02:00
Henry Jameson
2f1070deb6 collateral fixes 2018-11-25 17:42:41 +03:00
Henry Jameson
698ebf7003 fixed indentation 2018-11-25 17:24:58 +03:00
Henry Jameson
1a8d24d649 some help strings 2018-11-25 17:21:53 +03:00
Henry Jameson
b07d7d7229 reset buttons, better disabled for shadows 2018-11-23 11:36:36 +03:00
Henry Jameson
26b9f787bb added "keep opacity" option, fixed opacity loading, fixed missing shadows not 
affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
 2018-11-23 10:17:01 +03:00
Henry Jameson
652b98b13c fix v1->v2 transition for localstorage 2018-11-23 09:14:52 +03:00
Henry Jameson
1059d9b602 radii v1 fixes 2018-11-23 09:02:10 +03:00
Henry Jameson
754d71ec19 added checkboxes to keep current roundness and shadows, also cleaned up how 
shadows/roundness are reset when switching themes
 2018-11-23 08:24:55 +03:00
Henry Jameson
91ea9b7b0e checkbox radius 2018-11-23 07:28:53 +03:00
Henry Jameson
d2f3b6d244 more styles, temporarily in one file, fix for panel header box-shadow affecting 
the user-card one
 2018-11-23 01:45:08 +03:00
Henry Jameson
7af6be84bb fake borders fallback 2018-11-23 00:30:28 +03:00
Henry Jameson
29082e9aee fixed checkbox styles, optimized default shadows 2018-11-23 00:24:16 +03:00
Henry Jameson
d6f7cb469c small tab-switcher tweak 2018-11-22 05:13:09 +03:00
Henry Jameson
631b8433c0 bundling v2 themes works 2018-11-22 04:37:49 +03:00
Henry Jameson
324aadb7c1 fix 2018-11-22 04:25:15 +03:00
Henry Jameson
379144f4ab fix for zero-state for shadow-control 2018-11-22 03:55:45 +03:00
Henry Jameson
cd6c5b3e33 fix for tab-switcher 2018-11-21 23:30:47 +03:00
Henry Jameson
b8b5dbf63e fix 2018-11-21 22:08:27 +03:00
Henry Jameson
92afd6af12 layout fixes 2018-11-21 22:01:34 +03:00
Henry Jameson
18e0828ee7 last shadow override i wanted to make for now. also small tweak 2018-11-21 21:40:45 +03:00
Henry Jameson
b3ec3d450c fixup! better default pleroma shadows, matches original borders more closely 2018-11-21 21:35:18 +03:00
Henry Jameson
017fa60a82 better default pleroma shadows, matches original borders more closely 2018-11-21 21:32:51 +03:00
Henry Jameson
de88cfb94d compensate tab-switcher for fake borders 2018-11-21 21:28:22 +03:00
Henry Jameson
621ab806e6 more default shadows, replaced original shadows with generated ones. maybe gotta 
update fallbacks...
 2018-11-21 21:23:07 +03:00
Henry Jameson
3bdcdefc9b better tooltips, localized, too 2018-11-21 20:18:49 +03:00
Henry Jameson
dc3df7bc4e fixes 2018-11-21 18:22:05 +03:00
Henry Jameson
acf414e451 changed the way tab-switcher works to avoid removing/adding nodes since that 
seems to cause issues, instead hiding nodes with css.
 2018-11-21 07:38:00 +03:00
Henry Jameson
50562eb6b7 fix lint, for shadows, it's now possible to refer css variables as colors 2018-11-21 04:26:45 +03:00
Henry Jameson
3d6547001e panels now have shadow-overlay so that it's possible to have inset shadow all 
over the panel, without header overlapping it
 2018-11-21 04:14:32 +03:00
Henry Jameson
a79d9d9774 attempted fix^W workaround for tab-switcher bug 2018-11-21 04:14:10 +03:00
Henry Jameson
c3d8ff65bd fix notification unseen display rendering underneath the highlight 2018-11-21 03:52:12 +03:00
Henry Jameson
aa93664fd6 fix coldboot 2018-11-21 03:51:57 +03:00
Henry Jameson
b7fb720c19 cleanup, cold-boot issue fixed 2018-11-21 03:23:02 +03:00
Henry Jameson
73a9370710 fixed and updated roundness tab 2018-11-21 03:14:59 +03:00
Henry Jameson
0184d5fff0 whoops 2018-11-20 23:34:04 +03:00
Henry Jameson
d7af2c8419 mentioned bug in tab-switcher, made shadow-control work in zero-state 2018-11-20 23:25:38 +03:00
Henry Jameson
2609c0d0d2 unification of stylings 2018-11-20 22:14:49 +03:00
Henry Jameson
32132e225c localization and small fixes 2018-11-20 20:58:20 +03:00
Henry Jameson
cb8218c3c1 consolelog 2018-11-19 21:01:46 +03:00
Henry Jameson
56fec664a9 cleanup and optimization 2018-11-19 20:22:46 +03:00
Henry Jameson
a8180d03be it works, now to clean it up 2018-11-19 18:15:27 +03:00
Henry Jameson
a5b4f31c12 shadow control initial stuff. not done yet tho 2018-11-19 04:40:25 +03:00
Henry Jameson
edb429e307 cleanup and fixes 2018-11-15 17:17:20 +03:00
Hakaba Hitoyo
7044bf2bd7 update-japanese-translation 2018-11-15 11:39:08 +09:00
Roger Braun
c34eebff6c Add actual user search. 2018-11-14 20:31:06 +01:00
Henry Jameson
2369f2e4cb fixed webkit appearance of the UI 2018-11-14 22:20:42 +03:00
Henry Jameson
75f0c191dd some initial work for user highlight v2 2018-11-14 21:53:51 +03:00
Henry Jameson
e7fe2dc9f9 collateral fixes, removed alpha control for alerts, added contrast text 
generation for alerts, updated getTextColor to also have fallback to black/white
if resulting contrast isn't passable (only when inverting lightness!), updated
UI to use tabs.
 2018-11-14 19:39:17 +03:00
William Pitcock
1ad642c598 incorporate most translation changes from MR 368 2018-11-14 15:43:27 +00:00
William Pitcock
d0a4152f3c update french translation 2018-11-14 15:36:55 +00: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
7f13cbc493 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tab 2018-11-13 20:21:04 +01:00
Roger Braun
ffb9d4faf5 api service url 2018-11-13 20:20:46 +01:00
lambda
11f8a4f312 Merge branch 'oauth' into 'develop' 
Move login to oauth.

See merge request pleroma/pleroma-fe!367
 2018-11-13 18:42:07 +00:00
Henry Jameson
1723f427f5 updates 2018-11-13 16:30:01 +03:00
lambda
2a61f2b24c Merge branch 'i18n/irish' into 'develop' 
Added Irish (Gaeilge) Language

See merge request pleroma/pleroma-fe!370
 2018-11-13 06:59:46 +00:00
Vinzenz Vietzke
ae927f8628 updated and completed German translation 2018-11-12 22:39:55 +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
cf581b7d5a On logout switch to public timeline. 2018-11-10 10:43:25 +01:00
Starmancer
4c5073a66c minor modification of Chinese translation 2018-11-09 14:29:14 +08:00
Starmancer
819e9ce6a3 update Chinese translation 2018-11-09 14:15:55 +08:00
Nebula
e1d21512a9 Add Chinese language 2018-11-09 05:42:32 +00: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
b6cd4ff32a Fix typo. 2018-11-06 21:47:11 +01:00
dgold
4f258b4940
Added Irish (Gaeilge) Language 
All translations checked with tearma.ie & acmhainn.ie for language use
and technical accuracy.
 2018-11-02 20:08:11 +00:00
Roger Braun
fbe30b4922 Merge remote-tracking branch 'origin/develop' into oauth 2018-10-26 16:13:05 +02:00
Roger Braun
0aa5fe9d0d Remove gonsole.logg :DD 2018-10-26 16:05:27 +02: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
hakabahitoyo
630c6e3e44 simplify code 2018-10-26 15:08:51 +09:00
Hakaba Hitoyo
01aba3f9c6 adapt to destructive change of api 2018-10-26 10:13:53 +09:00
Henry
7f0e140a4f Merge branch 'patch-1' into 'develop' 
Updated italian translation

See merge request pleroma/pleroma-fe!364
 2018-10-25 13:03:49 +00:00
silkevicious
c61e658c1d Updated italian translation 2018-10-25 09:36:15 +00:00
Exilat
d1614c432f Update oc.json 2018-10-25 05:54:35 +00:00
Exilat
68d90684c4 Update oc.json 2018-10-24 05:50:49 +00:00
Exilat
8c585b0291 Update of the oc.json file 
Actualizacion del fichièr oc.json
 2018-10-23 19:19:11 +00:00
Henry
48d6483700 Merge branch 'instance-setting-fallback' into 'develop' 
Fall back to instance settings consistently

See merge request pleroma/pleroma-fe!361
 2018-10-21 21:01:22 +00:00
fadelkon
ec7b7ab49c Sort messages object by language code so that it's easier from the UI to browse them. 2018-10-21 22:18:38 +02:00
scarlett
c02a9089e1 explicitly set collapseMessageWithSubject to undefined 2018-10-21 19:42:38 +01:00
scarlett
d6ad08050a Fall back to instance settings consistently 2018-10-21 18:04:23 +01:00
Henry
82cc37a55e Merge branch 'i18n/arabic' into 'develop' 
Add arabic translation

See merge request pleroma/pleroma-fe!360
 2018-10-21 12:43:30 +00:00
ButterflyOfFire
131526373f Adding arabic to messages.js 2018-10-21 15:38:56 +03:00
ButterflyOfFire
373d6ca990 Adding arabic translation. 2018-10-21 15:37:44 +03:00
Henry Jameson
7b657fcccd added contrasts for rgbo 2018-10-21 15:25:21 +03:00
Henry
d81887e34f Merge branch 'catalan' into 'develop' 
Create catalan translation

See merge request pleroma/pleroma-fe!355
 2018-10-17 18:36:35 +00:00
fadelkon
bf3e3f8b9a Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text. 2018-10-16 18:11:49 +02: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
fadelkon
0c2f4b925e Add catalan require to messages.js 2018-10-14 11:25:20 +02:00
morguldir
7c4790d1bc Update norwegian translation 2018-10-14 06:22:04 +02:00
fadelkon
59dec1b43f Finish general and timeago catalan strings. Glossary: 
* bio: presentació
* timeline: flux [d'entrades]
* post/status: entrada
* settings: configuració
* user: usuari/a
* users: usuàries
* background: fons de pantalla
* banner: fons de perfil
* follower: seguidor/a
* follow: contacte/a qui segueixo
* avatar: avatar
* [visibility] scope: abast de la publicació

Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ .
 2018-10-13 18:17:00 +02:00
Henry Jameson
4b7b7d9905 cleanup, documentation, contrast taking alpha into account. 2018-10-10 05:39:02 +03:00
Henry Jameson
87e98772b0 initial contrast display support 2018-10-10 00:07:28 +03:00
Henry Jameson
4d77b0c86b Transparency works without exploding now. All nice. 2018-10-07 22:03:34 +03:00
Henry Jameson
96804d42f0 Some themeing is working!! 2018-10-07 19:59:22 +03:00
Henry Jameson
5441766c3c fix 2018-10-04 18:27:27 +03:00
Henry Jameson
0a4b07652a trying to fix transition 2018-10-04 18:16:14 +03:00
Henry Jameson
fb29e7c73d more workings and even less explosions. 2018-10-03 21:21:48 +03:00
Henry Jameson
f78a5158e1 something works without exploding and i'm tired already 2018-10-02 21:43:58 +03:00
fadelkon
f8323b72ae Translate some strings to catalan. Most part of block "settings" is not translated yet 2018-10-02 20:33:07 +02:00
fadelkon
0beba08618 Add placeholder catalan translation file to be able to see the work in progress in further commits 2018-10-02 20:31:02 +02:00
kaniini
65c03f1a0b Merge branch 'i18n/no_rich_text' into 'develop' 
Less confusing description for no_rich_text_formatting

See merge request pleroma/pleroma-fe!351
 2018-09-27 21:24:23 +00:00
Henry Jameson
b66d7901f1 forgot to actually handle the instance config. this part needs a rewrite... 2018-09-25 16:31:06 +03: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
6165b7366a Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences 
* upstream/develop:
  i think it's due to my shitty js-to-json regex
 2018-09-25 14:48:02 +03:00
Henry Jameson
455cd0d028 settings for scope/subject 2018-09-25 14:47:02 +03:00
Henry Jameson
85235981d1 i think it's due to my shitty js-to-json regex 2018-09-25 14:30:05 +03:00
Henry Jameson
11f1bac502 Less confusing description 2018-09-25 14:01:01 +03:00
Haelwenn (lanodan) Monnier
8cb62fae70
src/i18n/fr.json: More accurate translation 2018-09-24 16:55:19 +02:00
hakabahitoyo
86528d84e2 update Japanese translation 2018-09-23 10:27:05 +09:00
William Pitcock
2f674eb13d update french translation 2018-09-22 04:46:09 +00:00
William Pitcock
1af5c8fd39 add support for disabling rich text formatting 2018-09-22 03:54:05 +00:00
Henry Jameson
1c2f0029e4 Merge remote-tracking branch 'upstream/develop' into betterStorage 
* upstream/develop:
  More languages
  added usage
  a tool to check what's missing from a language
  all other languages which do not have MRs related to them separated
  seems to be working
 2018-09-21 12:14:20 +03:00
Henry Jameson
a61ad0544a small thing to display instance-provided default 2018-09-20 17:21:11 +03:00
Henry Jameson
537b1ff2d8 Merge remote-tracking branch 'upstream/develop' into translations-separation 
* upstream/develop:
  Update Hebrew translation
  fixed autocomplete
  Debug
 2018-09-20 16:12:00 +03:00
Henry Jameson
419744080f console.log cleanup 2018-09-17 19:16:58 +03:00
Henry Jameson
03f28d3fa6 Fixed "user.id is undefined" or something error more sane by properly handling 
HTTP errors
 2018-09-17 18:55:11 +03:00
Henry Jameson
e53f238278 undo rename because it makes less sense now. 2018-09-17 18:54:48 +03:00
Henry Jameson
9467462ef0 made FE work even without either api or static config 2018-09-17 18:54:08 +03:00
Henry Jameson
40a175389a Removed warning. Added support for working without static/config.json 2018-09-17 18:00:56 +03:00
Henry Jameson
394153380d more missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson
136add8a2f fix some missing stuff 2018-09-17 17:51:39 +03:00
Henry Jameson
1245d7917f translations 2018-09-17 17:51:39 +03:00
Henry Jameson
580aae1b54 Added more stuff that's actually being added to instanceConfig, simplified the whitelist. 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
Artik Banana
9b95c4c7b5 Update Hebrew translation 2018-09-12 16:16:55 +00:00
Henry
c94b9796ae Merge branch 'debug-who-to-follow-panel' into 'develop' 
Small debug for Who to follow panel

See merge request pleroma/pleroma-fe!342
 2018-09-12 08:53:13 +00:00
Henry Jameson
89f9b3a468 fixed autocomplete 2018-09-12 11:46:02 +03:00
Henry Jameson
0c14dd9575 More languages 2018-09-09 18:54:23 +03:00
Henry Jameson
28a26ceab7 Merge remote-tracking branch 'upstream/develop' into translations-separation 
* upstream/develop:
  fix lint
  Revert "Revert "Update messages.js""
  i18n/messages.js: changed Folgende back to Follower
  updated german translation
  updated german translation
  cleaning up some translations that broke the building
  fix trailing comma
  Update and fix messages.js (pt, eo)
 2018-09-09 18:44:03 +03:00
Henry
4bff6f12ed Merge branch 'feature/update-de-translation' into 'develop' 
updated german translation

See merge request pleroma/pleroma-fe!293
 2018-09-09 15:41:24 +00:00
Hakaba Hitoyo
207c188c16 Debug 2018-09-09 15:22:55 +00:00
Henry
dda0effd65 Merge branch 'pizzaiolo/pleroma-fe-patch-1' into 'develop' 
Update and fix messages.js (pt, eo)

See merge request pleroma/pleroma-fe!341
 2018-09-09 13:27:19 +00:00
Henry Jameson
aea00310c6 fix lint 2018-09-09 16:01:44 +03:00
Henry
8455936cd6 Merge branch 'develop' into 'develop' 
Update the Occitan language - Fixed Linting

See merge request pleroma/pleroma-fe!339
 2018-09-09 12:58:09 +00:00
Henry Jameson
0656e0ef32 Merge remote-tracking branch 'upstream/develop' into translations-separation 
* upstream/develop: (21 commits)
  use prime number step for Who to follow panel
  fix
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  remove formatting options
  Remove outdated settings
  features panel i18n
  features panes supports chat & gopher
  fix collapse link being too small
  small fix for non-square gif avatars
  Fixed collapseMessageWithSubjectLocal always using instance-provided config.
  Fix last place with usercard having wrong width
  Fixed non-masked image looking weird in chrome.
  Kinda went back to using align-items: stretch. Fixed error message floating.
  Simplified image sensitivity label
  show features panel only if not login
  update
  debug
  update
  debug
  ...
 2018-09-09 15:55:43 +03: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
369fd648f6 Merge branch 'remove-outdated-settings' into 'develop' 
Remove outdated settings

See merge request pleroma/pleroma-fe!335
 2018-09-09 11:56:34 +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
Henry Jameson
5726be6830 fix 2018-09-08 05:16:25 +03:00
Artik Banana
78e12bc812 Revert "Revert "Update messages.js"" 
This reverts commit 385484566a
 2018-09-07 16:51:25 +00:00
Henry
2eab0cb115 Merge branch 'feature/features-panel' into 'develop' 
Features panel

See merge request pleroma/pleroma-fe!331
 2018-09-07 16:37:24 +00:00
Henry
385484566a Revert "Update messages.js" 
This reverts commit 5e1f0d9416
 2018-09-07 16:22:59 +00:00
Artik Banana
5e1f0d9416 Update messages.js 
Update the Occitan language - Fixed Linting
 2018-09-07 16:18:01 +00:00
Henry Jameson
e6adddbba6 added usage 2018-09-06 22:10:41 +03:00
Henry Jameson
dbd010abd4 a tool to check what's missing from a language 2018-09-06 21:59:20 +03:00
Henry Jameson
b4a5fddea8 all other languages which do not have MRs related to them separated 2018-09-06 21:29:39 +03:00
Henry Jameson
9f84f4ea05 seems to be working 2018-09-06 19:39:56 +03:00
hakabahitoyo
8b94ea28ec remove formatting options 2018-09-04 14:50:02 +09:00
hakabahitoyo
dbf24e1fbf Remove outdated settings 2018-09-04 11:15:00 +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
scarlett
699ee0891d Changeable defaults for hideUserStats and hidePostStats 2018-09-04 00:48:14 +01:00
scarlett
bdcbd110e4 Add option for hiding post statistics (e.g. repeats, favs) 2018-09-04 00:41:52 +01:00
scarlett
dcb7e1ecf4 Add option for disabling counts (followers, statuses) in user profiles. 2018-09-04 00:32:25 +01:00
Henry Jameson
dc0b47e8bd fix collapse link being too small 2018-09-03 23:30:07 +03:00
Henry Jameson
f9eb9e0b70 small fix for non-square gif avatars 2018-09-03 22:49:46 +03:00
Henry Jameson
6e64324d37 Fixed collapseMessageWithSubjectLocal always using instance-provided config. 2018-09-03 22:40:45 +03:00
Henry Jameson
d4f9d21857 Fix last place with usercard having wrong width 2018-09-03 22:23:53 +03:00
Henry Jameson
08b044c365 Fixed non-masked image looking weird in chrome. 2018-09-03 22:18:59 +03:00
Henry Jameson
a6047e0ad5 Kinda went back to using align-items: stretch. Fixed error message floating. 2018-09-03 22:12:18 +03:00
Henry Jameson
36101abc22 Simplified image sensitivity label 2018-09-03 18:52:07 +03:00
Dingdreher
900aaefb98 Update users.js 2018-09-03 12:01:05 +00:00
hakabahitoyo
fa477dd41f show features panel only if not login 2018-09-03 16:02:06 +09:00
hakabahitoyo
38b683b30c update 2018-09-03 15:57:22 +09:00
Hakaba Hitoyo
049e2397b1 update 2018-09-03 15:23:09 +09:00
hakabahitoyo
07ef43c7b5 debug 2018-09-03 14:55:40 +09:00
Hakaba Hitoyo
52fe01e4d8 mock features panel 2018-09-03 14:43:10 +09:00
Shpuld Shpludson
20b0ffc0b9 Merge branch 'imvomitingasicodethisshit' into 'develop' 
Made showing format selection optional and default to false

See merge request pleroma/pleroma-fe!329
 2018-09-01 05:57:58 +00:00
Henry Jameson
d6240c25cf small fix 2018-08-31 17:24:46 +03:00
Henry Jameson
17f30190e0 Made showing format selection optional and default to false 2018-08-31 17:00:41 +03:00
shpuld
77e8933b2e Fix mistakes 2018-08-31 16:13:43 +03:00
shpuld
384c80e238 Change styles a bit, make pre-formatted blocks not overflow but scroll 2018-08-31 16:04:52 +03:00
shpuld
f07e6b271c Add styles for h1/2/3/4/5 tags in status html 2018-08-31 15:11:27 +03:00
William Pitcock
f9bfe2ea37 post status form: styling fixes for content-type selector, align icons with selector 2018-08-31 04:23:06 +00:00
kaniini
958acbab8d Merge branch 'polish' into 'develop' 
Another one of those MR that fixes many many small-to-medium things

Closes #92, #75, #122, #52, #72, and #87

See merge request pleroma/pleroma-fe!324
 2018-08-31 04:10:17 +00:00
meireikei
2e37e8cf39 Pass user id to fetchFriends 
It looks like the API that fetchFriends expects was changed, to require
an ID.
 2018-08-31 04:07:25 +00:00
kaniini
e71b0411aa Merge branch 'post-button-labels' into 'develop' 
Add labels to post buttons

See merge request pleroma/pleroma-fe!323
 2018-08-31 04:04:44 +00:00
William Pitcock
cabcb5c81b i18n: make "plain text" translatable 2018-08-31 03:42:12 +00:00
William Pitcock
9a43ba73e6 add the ability to select a post's content type 2018-08-31 03:42:11 +00:00
Henry Jameson
8c07e63f77 fix 2018-08-31 04:39:07 +03:00
Henry Jameson
46d8b55d44 Merge remote-tracking branch 'upstream/develop' into polish 
* upstream/develop:
  i18n: make "plain text" translatable
  add the ability to select a post's content type
 2018-08-31 04:20:40 +03:00
Henry Jameson
e99534ef71 added option for logo in navbar to follow color scheme of the rest of the site 
also fixed potential mess-up between api/static configs
 2018-08-31 04:06:00 +03:00
William Pitcock
20a67e6809 i18n: make "plain text" translatable 2018-08-31 00:44:25 +00:00
William Pitcock
38e3c2493d add the ability to select a post's content type 2018-08-31 00:42:42 +00:00
Henry Jameson
63fdad8703 fix 2018-08-30 22:59:52 +03:00
Henry Jameson
1461a52ade vodka translations 2018-08-30 20:45:50 +03:00
Henry Jameson
065d1c7f49 fix 2018-08-30 20:16:36 +03:00
Henry Jameson
3b9cb1384a fix 2018-08-30 19:53:13 +03:00
Henry Jameson
fa4c4c9122 fixed #87 2018-08-30 18:23:43 +03:00
Henry Jameson
fa1116249d fixup! panel styling cleanup 2018-08-30 17:13:54 +03:00
Henry Jameson
507d5bc444 fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing. 2018-08-30 16:27:35 +03:00
Henry Jameson
1246463f96 fixes broken nsfw hider in notifications 2018-08-30 16:21:10 +03:00
Henry Jameson
fb7f65481e restored "progress" cursor indicator for loading nsfw images 2018-08-30 16:11:31 +03:00
Henry Jameson
e58221fb87 fixed #72 2018-08-30 16:02:53 +03:00
Henry Jameson
b0e0686c7f Added ability to hide certain types of notifications 2018-08-28 21:21:29 +03:00
Henry Jameson
66a22762c2 fixup! Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-28 16:22:49 +03:00
Henry Jameson
da362b2b88 minor style tweaks 2018-08-28 16:20:04 +03:00
Henry Jameson
330288b4cd panel styling cleanup 2018-08-28 16:14:32 +03:00
Henry Jameson
c3b27ab4c2 moved replies filtering to "filter" category in settings, made it more consistent 2018-08-28 15:47:42 +03:00
Henry Jameson
cff4177bf3 settings page update 2018-08-28 15:38:07 +03:00
Henry Jameson
b48a3210a3 tabs for settings 2018-08-28 14:28:05 +03:00
Henry Jameson
8e560676f1 allow multiple file upload 2018-08-28 14:05:03 +03:00
Henry Jameson
68d15f665e Show lock icon instead of hiding repeat button, tusky-style. Added hint 
explaining what's going on. Fixes favorite button jumping left and right
depending on post visibility
 2018-08-28 13:42:44 +03:00
Henry Jameson
226849b26e Added logic to process reply to favorite request and update likes counter 
accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
 2018-08-27 23:15:58 +03:00
Henry Jameson
fd604dfd2a fixed still-image not preserving original aspect ratio and resolution. 2018-08-27 22:40:30 +03:00
Henry Jameson
eacbd9b500 Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-27 22:22:25 +03:00
Ekaterina Vaartis
d2640d4bb5 Add titles to source/expand buttons 2018-08-27 12:55:46 +03:00
Ekaterina Vaartis
14c1704ea1 Add titles to post visibility icons 2018-08-27 12:55:46 +03:00
scarlett
74a6df8a55 Match users using startsWith instead of match. 2018-08-26 13:51:21 +01:00
scarlett
b68ebf3056 Match emoji using startsWith instead of match. 2018-08-26 13:50:36 +01:00
kaniini
bc4f09b775 Merge branch 'serverside-frontend-configuration-2' into 'develop' 
serverside-frontend-configuration-2

See merge request pleroma/pleroma-fe!312
 2018-08-26 06:20:19 +00:00
scarlett
54ac0dfefd Preserve subject in replies. 2018-08-26 01:50:11 +01:00
kaniini
a7c6007d54 Merge branch 'attachment-collapse' into 'develop' 
When a post with a subject is collapsed, hide its attachments.

See merge request pleroma/pleroma-fe!316
 2018-08-26 00:02:32 +00:00
kaniini
5bb5ef43ef Merge branch 'language-override' into 'develop' 
Make interface language configurable from settings

Closes #36

See merge request pleroma/pleroma-fe!315
 2018-08-26 00:01:33 +00:00
scarlett
52ce86ed57 Don't use nsfw clickthrough if the post is collapsed by default. 2018-08-26 00:21:54 +01:00
Hakaba Hitoyo
c6913e3909 correct /static/config.json decoding 2018-08-26 07:01:56 +09:00
Hakaba Hitoyo
8b9e973a55 save /api/statusnet/config.json connection 2018-08-26 07:00:23 +09:00
Hakaba Hitoyo
a3cc78115c rename apiStatusnetConfigSitePleromafe to apiConfig 2018-08-26 06:56:52 +09:00
Hakaba Hitoyo
a81c3b1324 fix typo 2018-08-26 06:54:03 +09:00
scarlett
a7811e7bd9 Add a checkbox for marking a post's attachments as NSFW 2018-08-25 22:18:43 +01:00
scarlett
d50440d802 When a post with a subject is collapsed, hide its attachments. 2018-08-25 20:33:44 +01:00
Ekaterina Vaartis
c1e4bfa90f Make interface language configurable from settings 
The locale can now be configured in settings and is stored in
Vuex. The changes are applied immidiately after selection. The list of
languages is taken from the messages file, which contains all the
available locales (and a new value, `interfaceLanguage`, to control
the translation of this option in the options menu)

Closes #36
 2018-08-25 13:29:49 +03:00
William Pitcock
30a6b7be5b attachment: add support for rendering alt text on images 2018-08-25 00:32:10 +00:00
kaniini
fe906cc3f0 Merge branch 'develop' into 'notifications' 
# Conflicts:
#   src/main.js
 2018-08-24 23:00:56 +00:00
scarlett
da96294866 Don't hide replies when inConversation. 2018-08-24 21:46:45 +01:00
scarlett
60b115320f Fix indentation 2018-08-24 20:19:22 +01:00
scarlett
50b3bd22e6 Remove old implementation of isReply. 2018-08-24 20:08:49 +01:00
scarlett
296ab54301 Add settings for changing the visibility of replies in the timeline. 2018-08-24 20:04:26 +01:00
kaniini
14db3f279d Merge branch 'feature/who-to-follow-panel-uses-suggestions-api' into 'develop' 
Who to follow panel uses suggestions api

See merge request pleroma/pleroma-fe!294
 2018-08-24 18:46:23 +00:00
kaniini
0429963e63 Merge branch 'easy-japanese' into 'develop' 
Easy Japanese translation

See merge request pleroma/pleroma-fe!305
 2018-08-24 18:45:22 +00:00
kaniini
71576947ed Merge branch 'feature/update-russian-translation' into 'develop' 
Update Russian translations

See merge request pleroma/pleroma-fe!313
 2018-08-24 18:43:54 +00:00
kaniini
b0568ca5c3 Merge branch 'center-bios' into 'develop' 
Centre-align profile bios.

See merge request pleroma/pleroma-fe!311
 2018-08-24 18:42:09 +00:00
dtluna
81c04fac17 Update Russian translations 2018-08-24 21:21:14 +03:00
tsukada-ecsec
dfc5f170c6 update 2018-08-24 18:46:14 +09:00
Henry Jameson
13acdc4a00 fixed error not displaying for 500 error. 2018-08-22 15:51:03 +03:00
tsukada-ecsec
0647c1bb72 debug 2018-08-22 15:15:15 +09:00
tsukada-ecsec
54166c3ad3 update settings 2018-08-22 11:47:36 +09:00
tsukada-ecsec
41256045f2 revert main.js 2018-08-22 11:38:04 +09:00
scarlett
2596f22814 Centre-align profile bios. 2018-08-21 19:16:03 +01:00
Henry Jameson
a196c3551a Revert "Drop the entire thing about hidden "own" timeline since it doesn't necessarily" 
This reverts commit 612aa56c8b.
 2018-08-21 00:21:35 +03:00
William Pitcock
95e6bccec5 Revert "Unify button styles and use min-width" 
This reverts commit 8f79193883.
 2018-08-20 18:06:29 +00:00
Henry Jameson
b97db4912d error display 2018-08-20 20:45:54 +03:00
Henry Jameson
f9b0a95969 removed style for rounding bottom part of notifications because there's now 
always "load more" footer
 2018-08-20 20:08:21 +03:00
Henry Jameson
3ccea3442e fix custom emoji in username, fix gif avatar not being animated when hovering on 
the notification
 2018-08-20 20:05:12 +03:00
Henry Jameson
35b912bce4 Merge remote-tracking branch 'upstream/develop' into notifications 
* upstream/develop: (23 commits)
  Rename expandCW to collapseMessageWithSubject.
  fix indent
  Add support for configurable CW clickthrough.
  Merge upstream
  fix lint issues
  allow default visibility scope to be configured
  Revert "storing entire config instead of each separate thing of it, so that future"
  fixes hella ton of annoyances with file upload display
  using custom ascend value as suggested here: https://github.com/fontello/fontello/issues/513#issuecomment-237551101 helped.
  disable hinting because it breaks alignment on some icons (namely - locks)
  fix for timeago being ass when post has replies. added hover colors for clickable icons on the right side. Reverted line-height to its original value
  Configurable video looping, option to not to loop silent videos. Updated localization strings.
  added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
  Made pausing TL updating configurable. Added styles for disabled checkboxes. Shuffled settings a bit b/c all the settings are in "Attachments" section depsite the fact not all of them are attachments-related.
  storing entire config instead of each separate thing of it, so that future options won't be lost during reloads because developer forgot to update that list of settings to be persisted
  fix potential stretched spurdo
  fixed custom emoji in nickname. changed icons on right side to be more streamlined. adjusted CSS so that all text in header of post is on same baseline and all icons/images are middle-aligned.
  Add validation of the imported theme and the corresponding warning message
  Unify button styles and use min-width
  Add German localization for theme import/export
  ...
 2018-08-20 20:04:54 +03:00
Henry Jameson
9e78c64d5e Hide initial desktop notifications spam when FE is opened and there's a lot of 
unseen notifications.
 2018-08-20 19:58:49 +03:00
Henry Jameson
fa66385c5b Updated localization files 2018-08-20 19:06:04 +03:00
Henry Jameson
612aa56c8b Drop the entire thing about hidden "own" timeline since it doesn't necessarily 
contain all of the users posts (it doesn't contain DMs) even though it's "us".
Since this is a workaround anyway just fetch home timeline instead. It could end
up making more queries if user doesn't post that often.
 2018-08-20 19:01:54 +03:00
ensra
3ec8e43a97 Rename expandCW to collapseMessageWithSubject. 
Add option to config.json, disabled by default.
 2018-08-20 03:41:40 +01:00
ensra
671db023da fix indent 2018-08-20 03:08:39 +01:00
ensra
1121f32c48 Add support for configurable CW clickthrough. 2018-08-20 02:59:06 +01:00
kaniini
9982376f9a Merge branch 'feature/theme-export-import' into 'develop' 
Theme import & export

Closes #119

See merge request pleroma/pleroma-fe!290
 2018-08-20 00:03:35 +00:00
kaniini
702dfcec10 Merge branch 'develop' into 'fixes-and-tweaks' 
# Conflicts:
#   src/i18n/messages.js
 2018-08-19 23:59:15 +00:00
Foxhkron
56ddeec8f3
Merge upstream 2018-08-19 01:23:03 +02:00
William Pitcock
fe06beae18 fix lint issues 2018-08-18 17:06:07 +00:00
William Pitcock
61d40f40ae allow default visibility scope to be configured 2018-08-18 17:06:06 +00:00
Henry Jameson
99f849bd8c Revert "storing entire config instead of each separate thing of it, so that future" 
This reverts commit 18117c3bfa.

b/c something else uses same field but i want to fix that in another MR
 2018-08-18 13:56:45 +03:00
Henry Jameson
0b6f9c62a1 fix 2018-08-18 13:41:23 +03:00
Henry Jameson
23a1000298 fix post search query to have id +1 because search is exclusive 2018-08-16 18:13:31 +03:00
Henry Jameson
6454837ea4 Merge remote-tracking branch 'upstream/develop' into notifications 
* upstream/develop: (26 commits)
  Update status.vue
  Update retweet_button.js
  Update retweet_button.vue
  Use serverside html rendering in usernames and bios if available.
  Update status.vue
  Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
  Hide all status actions if not logged in
  hopefully, fix linter
  Fixes broken custom emoji in autocomplete when proxying to remote BE
  Made it so that unfocused tab doesn't autostream posts when scrolled to the top
  Remove trailing whitespace
  Textarea is now focused when replying
  the missing piece for invites system
  Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are
  fixed lint
  cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
  added ability to pick the style of highlighting
  post-rebase fix, backported d7d787b84c
  notifs fix
  maybe i should actually add myself to contributors list?
  ...
 2018-08-16 13:59:01 +03:00
Henry Jameson
decc209fdc fix lint 2018-08-16 13:57:16 +03:00
Henry Jameson
693eb4b717 cleanup, updated broken favorites look + localization strings 2018-08-16 13:41:45 +03:00
Henry Jameson
e8f7491003 fixed favoriting from notification column 2018-08-16 13:20:29 +03:00
Henry Jameson
ef04a78634 added workaround for broken favorites 2018-08-16 13:12:31 +03:00
Henry Jameson
627e227076 fixes hella ton of annoyances with file upload display 2018-08-15 14:53:40 +03:00
Henry Jameson
d94b77b863 fix for timeago being ass when post has replies. added hover colors for 
clickable icons on the right side. Reverted line-height to its original value
 2018-08-15 13:02:39 +03:00
Henry Jameson
0e5b74e3dd Configurable video looping, option to not to loop silent videos. Updated 
localization strings.
 2018-08-15 12:51:21 +03:00
Sebastian Huebner
45478d4bed
i18n/messages.js: changed Folgende back to Follower 2018-08-15 10:29:19 +02:00
Henry Jameson
d2ec70c323 added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click 2018-08-15 11:20:40 +03:00
Sebastian Huebner
1dddce5624 updated german translation 2018-08-15 10:18:16 +02:00
Henry Jameson
87eee191b8 Made pausing TL updating configurable. Added styles for disabled checkboxes. 
Shuffled settings a bit b/c all the settings are in "Attachments" section
depsite the fact not all of them are attachments-related.
 2018-08-13 17:07:45 +03:00
Henry Jameson
18117c3bfa storing entire config instead of each separate thing of it, so that future 
options won't be lost during reloads because developer forgot to update that
list of settings to be persisted
 2018-08-13 16:17:00 +03:00
Henry Jameson
d417cb35bb fix potential stretched spurdo 2018-08-13 15:36:10 +03:00
Henry Jameson
4d112b70fd fixed custom emoji in nickname. changed icons on right side to be more 
streamlined. adjusted CSS so that all text in header of post is on same
baseline and all icons/images are middle-aligned.
 2018-08-13 14:46:28 +03:00
Henry Jameson
ef515056b5 missing files and a plug for bad favs 2018-08-13 13:17:10 +03:00
lambda
ce88f351f7 Merge branch 'invites' into 'develop' 
FE part of invites system

See merge request pleroma/pleroma-fe!297
 2018-08-12 16:15:27 +00:00
Henry
27adde9887 Merge branch 'develop' into 'feature/accountHighlight' 
# Conflicts:
#   src/components/user_card_content/user_card_content.vue
 2018-08-12 12:05:08 +00:00
Henry Jameson
d085cc8584 undo test condition 2018-08-12 14:15:09 +03:00
Henry Jameson
63650aec29 Added support for qvitter api fetching of notifications 2018-08-12 14:14:34 +03:00
lambda
db6ff4824a Merge branch 'feature/focus_reply_form' into 'develop' 
Focus textarea when clicking "reply"

See merge request pleroma/pleroma-fe!298
 2018-08-12 10:48:08 +00:00
lambda
a64fbe661f Merge branch 'fixSelectOptionStyling' into 'develop' 
Fixes selects having unreadable text on some browsers/OSes.

Closes #123

See merge request pleroma/pleroma-fe!296
 2018-08-12 10:47:19 +00:00
lambda
e21f78e519 Merge branch 'doNotAutoFetchOnUnfocusedTab' into 'develop' 
Made it so that unfocused tab doesn't autostream posts when scrolled to the top

See merge request pleroma/pleroma-fe!299
 2018-08-12 10:45:36 +00:00
lambda
eeddceee6b Merge branch 'fixRelativeEmojis' into 'develop' 
Fixes broken custom emoji in autocomplete when proxying to remote BE

See merge request pleroma/pleroma-fe!300
 2018-08-12 10:44:39 +00:00
lambda
01c5bae594 Merge branch 'feature/emoji-in-profiles' into 'develop' 
Use serverside html rendering in usernames and bios if available.

See merge request pleroma/pleroma-fe!304
 2018-08-12 10:40:57 +00:00
Hakaba Hitoyo
d1b3d7e90f debug 2018-08-11 14:54:30 +09:00
Hakaba Hitoyo
e2dae87772 update 2018-08-11 14:50:40 +09:00
Hakaba Hitoyo
b7d1bb39e0 update 2018-08-11 14:35:04 +09:00
Hakaba Hitoyo
23cfec4332 Update messages.js 2018-08-10 07:04:25 +00:00
Toromino
895ef525d2 Update status.vue 2018-08-09 16:47:08 +00:00
Toromino
01652fc252 Update retweet_button.js 2018-08-09 16:46:18 +00:00
Toromino
316692ee85 Update retweet_button.vue 2018-08-09 16:45:52 +00:00
eal
876f7633fe Use serverside html rendering in usernames and bios if available. 2018-08-09 12:52:34 +03:00
Hakaba Hitoyo
6cc1083287 フォロワーはインポートできない。 2018-08-09 07:30:22 +00:00
Hakaba Hitoyo
f8834ba1fb Update messages.js 2018-08-09 07:20:35 +00:00
Hakaba Hitoyo
3398303c9b Update messages.js 2018-08-09 06:59:23 +00:00
Toromino
e60fde233b Update status.vue 2018-08-08 14:39:22 +00:00
dtluna
5cfc247c6b Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'" 
This reverts merge request !301
 2018-08-06 09:08:50 +00:00
dtluna
da36cd11e8 Hide all status actions if not logged in 2018-08-06 11:57:27 +03:00
Henry Jameson
d5efa10946 hopefully, fix linter 2018-08-06 09:52:07 +03:00
Henry Jameson
976444064f Fixes broken custom emoji in autocomplete when proxying to remote BE 2018-08-06 09:45:22 +03:00
Henry Jameson
d3d5a84868 Made it so that unfocused tab doesn't autostream posts when scrolled to the top 2018-08-06 07:58:34 +03:00
Toromino
88a81406e3 Remove trailing whitespace 2018-08-05 19:41:34 +00:00
Toromino
fd484a1a62 Textarea is now focused when replying 2018-08-05 19:17:11 +00:00
Henry Jameson
9cebb00faa the missing piece for invites system 2018-08-05 10:01:38 +03:00
Henry Jameson
3373d28701 Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme 
switcher select now has styled options that show preview of what theme's bg/fg
colors are
 2018-08-05 09:18:04 +03:00
Henry Jameson
3d72c2b964 fixed lint 2018-08-05 05:44:02 +03:00
Henry Jameson
b04a9d1229 cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling 2018-08-05 05:41:37 +03:00
Henry Jameson
6a81aa2745 added ability to pick the style of highlighting 2018-08-05 05:18:04 +03:00
hakabahitoyo
5e47c59615 debug 2018-08-02 19:16:48 +09:00
Hakaba Hitoyo
19e310fc67 lint 2018-08-02 18:38:43 +09:00
Hakaba Hitoyo
5900bccff3 debug 2018-08-02 18:34:12 +09:00
Hakaba Hitoyo
bcd499c372 who to follow panel uses /api/v1/suggestions 2018-08-02 17:57:00 +09:00
lambda
17f6eb18e7 Revert "Merge branch 'cw-clickthrough' into 'develop'" 
This reverts merge request !291
 2018-07-12 07:20:39 +00:00
Henry Jameson
d886ab752c post-rebase fix, backported d7d787b84c 2018-07-06 20:19:02 +03:00
Henry Jameson
38d5226ad1 notifs fix 2018-07-06 20:14:39 +03:00
Henry Jameson
0714391aba UI update 2018-07-06 20:14:36 +03:00
Henry Jameson
398eaaf79b fixed the UI 2018-07-06 20:12:09 +03:00
Henry Jameson
8ccebbe156 both bugs fixed. it's reactive and no more conflicting cards 2018-07-06 20:12:09 +03:00
Henry Jameson
fa8c221f3a moved style generator into separate file. notifications are highlighted too now. 2018-07-06 20:12:09 +03:00
Henry Jameson
f911182a2f working, somewhat 2018-07-06 20:12:09 +03:00
Henry Jameson
148e691199 initial vers 2018-07-06 20:12:09 +03:00
Ole Bertram
2a87e29180
Add validation of the imported theme and the corresponding warning message 2018-07-04 14:25:40 +02:00
Ole Bertram
8f79193883
Unify button styles and use min-width 
This seemed to be the same across multiple components anyway.

Switched to min-width to allow for buttons with longer text, e.g.
from other languages.
 2018-07-04 13:49:31 +02:00
Vivian Lim
158342fc39 Fix lint warnings 2018-06-29 00:10:17 -07:00
Vivian Lim
b0cf050797 Add configuration option to enable click-through content warnings 2018-06-28 23:39:55 -07:00
Vivian Lim
ab86e87e85 Also hide attachments behind clickthrough. 2018-06-28 23:39:01 -07:00
Vivian Lim
65edcaf4b9 Differentiate content warning block if it is on lightbg 2018-06-28 23:39:01 -07:00
Vivian Lim
b3e122d31f Carry forward content warnings in replies 2018-06-28 23:39:01 -07:00
Vivian Lim
0554cac113 Add click-to-show content warnings on posts 2018-06-28 23:39:01 -07:00
Ole Bertram
fdc64cfa8a
Add German localization for theme import/export 2018-06-28 03:28:33 +02:00
Ole Bertram
d2b79856c6
Add theme import feature 2018-06-28 03:28:23 +02:00
Ole Bertram
f36984c4a4
Refactor theme settings state initialization 2018-06-28 02:07:50 +02:00
Ole Bertram
29f69de240
Add theme export feature 2018-06-28 01:23:19 +02:00
lambda
c07adb7121 Merge branch 'patch-1' into 'develop' 
Update messages.js / tiny typofix in fr version

See merge request pleroma/pleroma-fe!288
 2018-06-25 06:07:47 +00:00
goofy
c2f6227092 Update messages.js / tiny typofix in fr version 2018-06-24 14:18:43 +00:00
Haelwenn (lanodan) Monnier
6da86599a9
src/i18n/messages.js: French Translation for Post Scope UI tooltips 
Co-authored-by: goofy
 2018-06-24 16:14:47 +02:00
Ole Bertram
44428e8b09
Add warning/info text on appriopriate status scopes 2018-06-23 22:10:15 +02:00