Commit Graph

1728 Commits

Author SHA1 Message Date
Henry Jameson 7d15720339 fix notifications? 2019-01-16 17:30:47 +03:00
hakabahitoyo fc83d76ab5 update japanese translation 2019-01-16 18:14:15 +09:00
Hakaba Hitoyo 05ead45fb7 Show who to follow in the mobile view 2019-01-16 02:33:08 +00:00
lambda 502a76be0a Merge branch 'summary-html' into 'develop'
Sync with backend: Use summary_html.

See merge request pleroma/pleroma-fe!463
2019-01-15 20:16:11 +00:00
Henry Jameson d7bd294666 migrated some tests to normalizer, fixed some potential bug, fixed tests to use
normalized naming instead of raw qvitter api objects. needs more tests tho.
2019-01-15 18:39:24 +03:00
Henry Jameson 966a9e78af cleanup 2019-01-14 22:59:44 +03:00
Henry Jameson fd27c78c4b fixes, guards 2019-01-14 22:58:23 +03:00
Henry Jameson 790fcf37d2 notifications now also undergo some parsing, hypothetically could use MastoAPI
notifications, maybe.
2019-01-14 22:38:37 +03:00
shpuld 17735943d5 Add media viewer module and media module component, modify attachment behavior 2019-01-14 19:23:13 +02:00
Henry Jameson e0fd6d12ed user normalizer works 2019-01-14 15:30:14 +03:00
Henry Jameson 5a3c9cfc9b post-merge fix 2019-01-13 22:25:48 +03:00
Henry Jameson f9fb85ee42 Merge remote-tracking branch 'upstream/develop' into favorites
* upstream/develop:
  Add Korean translation
  Change emptlyTl to take userId
  better fix
  fixes #265 and also that thin line below gradient on chrome (UGH)
  fix #262 part of user profiles not being able to load previous posts
  Retain userId on clearing user timeline, don't flush when empty timeline
2019-01-13 22:21:09 +03:00
Henry Jameson 519f49e29b separated normalization into a another file, removed catchall and added more stuff 2019-01-13 22:14:55 +03:00
scarlett de8dfef252 Remove reply detection hack 2019-01-13 13:41:02 +00:00
scarlett 0fd7e7eb68 Sync with backend: Use summary_html. 2019-01-13 13:38:00 +00:00
Henry Jameson 4be737b4df moved some stuff from statuses to api service. added initial adapter (currently
mastoapi status -> qvitter status, would change some naming in the future)

favorites timeline works somewhat, notifications are broken because they are
fetched using same code to fetch usual timeline/using old architechture
2019-01-13 01:26:24 +03:00
Henry Jameson 039a407400 some initial work to make it possible to use "unregistered" timelines, i.e. not
reserving a timeline by name, instead just passing timeline object itself.
2019-01-12 23:33:45 +03:00
Henry Jameson 22e0686395 fix lint 2019-01-11 03:41:57 +03:00
Henry Jameson b18e27c6d4 fix tests, removed one unused function, fix real problem that tests helped to
surface
2019-01-11 03:38:23 +03:00
Henry Jameson 48e811e6ed added some more explicit to string conversion since BE seem to be sending
numbers and it could cause an issue.
2019-01-11 03:00:11 +03:00
Henry Jameson ef2585e32b Remove all explicit and implicit conversions of statusId to number, changed
explicit ones so that they convert them to string
2019-01-11 02:40:17 +03:00
kjwon15 d4eb3cb36b Add Korean translation 2019-01-10 14:56:05 +09:00
Shpuld Shpludson a51167fa72 Merge branch 'fix-265-fix-user-profiles-again' into 'develop'
fixes #265 and also that thin line below gradient on chrome (UGH)

Closes #265

See merge request pleroma/pleroma-fe!456
2019-01-09 20:57:00 +00:00
Shpuld Shpludson 499c6b85d4 Merge branch 'fix/user-timeline-not-loading' into 'develop'
Fix #262 user timelines bugging

Closes #262

See merge request pleroma/pleroma-fe!454
2019-01-09 20:56:09 +00:00
shpuld b8b18b198d Change emptlyTl to take userId 2019-01-09 22:19:02 +02:00
Henry Jameson f4b499b044 better fix 2019-01-09 16:31:53 +03:00
Henry Jameson d13f36a2ad fixes #265 and also that thin line below gradient on chrome (UGH) 2019-01-09 15:36:09 +03:00
Henry Jameson 0b8f616af1 fix #262 part of user profiles not being able to load previous posts 2019-01-09 14:18:36 +03:00
shpuld a8f6099be2 Retain userId on clearing user timeline, don't flush when empty timeline 2019-01-08 23:09:03 +02:00
Hakaba Hitoyo a60fc390a0 Add instance information page for mobile 2019-01-07 17:26:47 +00:00
Hakaba Hitoyo 702f013225 [Debug] Avoid duplicates in the who to follow panel 2019-01-04 08:43:00 +00:00
Shpuld Shpludson 35d75be1d6 Merge branch 'develop' into 'develop'
updated German translation

See merge request pleroma/pleroma-fe!449
2019-01-03 21:00:21 +00:00
Vinzenz Vietzke 681b4e665d updated German translation
* added theme settings
 * added various missing single strings
2019-01-03 19:53:53 +01:00
rinpatch c25cf29533 Fix translation typo in registration.vue 2019-01-03 19:42:43 +01:00
Shpuld Shpludson 76cfb15b3c Merge branch 'feature/replace-panel-switcher' into 'develop'
Mobile side drawer

See merge request pleroma/pleroma-fe!443
2018-12-31 17:35:31 +00:00
Shpuld Shpludson fb8f774383 Fix profiles without statuses not loading 2018-12-31 01:57:22 +00:00
shpuld 354fd32e7b Fix conflicting styles 2018-12-30 22:41:31 +02:00
shpuld ace042015e Remove commented out back button 2018-12-29 23:42:01 +02:00
shpuld 16c7bd0199 merge develop, fix conflicts, fix logged out bug 2018-12-29 16:25:45 +02:00
lambda 1555a5fef3 Merge branch 'restore-routes' into 'develop'
Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
2018-12-29 13:27:59 +00:00
shpuld 747e4090ca Cleanup and remove divider element in side drawer 2018-12-29 12:44:21 +02:00
shpuld 650655709d fix conflict in user card content 2018-12-28 21:44:09 +02:00
shpuld 85c058e95c New routes, notifications, other impovements in side drwaer 2018-12-28 21:39:54 +02:00
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