Commit Graph

1504 Commits

Author SHA1 Message Date
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