コミットグラフ

215 コミット

作成者 SHA1 メッセージ 日付
Henry Jameson 500b4bd374 fix 2018-12-25 14:28:49 +03:00
Henry Jameson a4f0902926 small refactor, added push unsub notice for BE 2018-12-25 03:46:19 +03:00
Henry Jameson 957b2a6f7e simplified some code, made it possible to unregister serviceworker altogether 2018-12-20 09:17:59 +03:00
Henry Jameson 5c2030e467 no more "broken favorite" 2018-12-19 01:55:53 +03: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
Maxim Filippov 2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Ekaterina Vaartis a525df32c9 Separate captcha into the backendInteractor 2018-12-16 20:53:41 +03:00
Maxim Filippov 828b1c78f9 Implement user_profile.spec.js 2018-12-15 06:16:44 +03:00
Maxim Filippov 1341a7bb9c Use babel polyfill in karma 2018-12-13 20:27:03 +03:00
Maxim Filippov e4a34cc4d4 Use 'userProfileLink' to generate user-profile link 2018-12-13 19:57:11 +03:00
Rinpatch 6de4dcc7c9 Resolve merge conflict 2018-12-13 17:22:19 +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
Maxim Filippov 24caa2cfcd Add generateProfileLink 2018-12-13 05:00:01 +03:00
Egor Kislitsyn 02c0e15781 add checkbox to disable web push 2018-12-13 00:03:50 +07: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
Rinpatch 6a00854189 Count in binary bytes and remove i18 from file size format service 2018-12-10 17:06:32 +03:00
Rinpatch c69a8dc197 Add file size formating 2018-12-10 09:50:04 +03:00
Egor Kislitsyn 73b17d70ec improve push notifications code 2018-12-09 19:25:43 +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
Egor Kislitsyn 09147cacea add service worker and push notifications 2018-12-06 20:34:00 +07: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
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 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 bee738c815 making inset shadows work on avatars again 2018-12-02 08:47:55 +03:00
Henry Jameson 406df4399b avatars shadows, also allows drop-shadow use 2018-11-30 16:39:53 +03:00
rinpatch cddb173089 Fix filetype detection 2018-11-27 18:44:49 +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 1a65895bfd initial font support 2018-11-25 21:48:16 +03:00
Henry Jameson e8536f3d95 clean up 2018-11-25 19:15:54 +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