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
Henry Jameson
29082e9aee
fixed checkbox styles, optimized default shadows
2018-11-23 00:24:16 +03:00
Henry Jameson
379144f4ab
fix for zero-state for shadow-control
2018-11-22 03:55:45 +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
621ab806e6
more default shadows, replaced original shadows with generated ones. maybe gotta
...
update fallbacks...
2018-11-21 21:23:07 +03:00
Henry Jameson
dc3df7bc4e
fixes
2018-11-21 18:22:05 +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
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
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
Roger Braun
c34eebff6c
Add actual user search.
2018-11-14 20:31:06 +01: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
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
Henry Jameson
1723f427f5
updates
2018-11-13 16:30:01 +03:00
Roger Braun
4d9680e797
Re-activate registration, use oauth password flow to fetch token.
2018-11-06 21:48:05 +01:00
Roger Braun
9af204b293
Move login to oauth.
2018-10-26 15:16:23 +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
William Pitcock
1af5c8fd39
add support for disabling rich text formatting
2018-09-22 03:54:05 +00: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
William Pitcock
9a43ba73e6
add the ability to select a post's content type
2018-08-31 03:42:11 +00:00
scarlett
a7811e7bd9
Add a checkbox for marking a post's attachments as NSFW
2018-08-25 22:18:43 +01:00
kaniini
fe906cc3f0
Merge branch 'develop' into 'notifications'
...
# Conflicts:
# src/main.js
2018-08-24 23:00:56 +00: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
Henry Jameson
13acdc4a00
fixed error not displaying for 500 error.
2018-08-22 15:51:03 +03: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
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
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
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
2018-08-16 13:59:01 +03:00
Henry Jameson
ef04a78634
added workaround for broken favorites
2018-08-16 13:12:31 +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 Jameson
63650aec29
Added support for qvitter api fetching of notifications
2018-08-12 14:14:34 +03:00
Henry Jameson
9cebb00faa
the missing piece for invites system
2018-08-05 10:01:38 +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
Hakaba Hitoyo
5900bccff3
debug
2018-08-02 18:34:12 +09: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
Francis Dinh
d05fcfa1a8
Add unretweet support
2018-06-14 05:00:11 -04:00
lambda
6ea5cfe71e
Merge branch 'feature/locked-accounts' into 'develop'
...
Feature/locked accounts
See merge request pleroma/pleroma-fe!274
2018-06-12 16:57:18 +00:00
Astra
92a8ca0011
crt's compose box changes
2018-06-07 05:03:50 -04:00
William Pitcock
b8d0a6a0ba
backend interactor service: add approveUser and denyUser functions
2018-06-07 00:29:13 +00:00
William Pitcock
2cf28acfd1
api: add approveUser and denyUser functions
2018-06-07 00:29:01 +00:00
William Pitcock
4efb528a52
backend interactor service: implement fetchFollowRequests()
2018-06-06 22:29:02 +00:00
William Pitcock
4e64514aa9
api: add fetchFollowRequests()
2018-06-06 22:26:24 +00:00
William Pitcock
7a08ba43e2
user settings: enable locking/unlocking an account
2018-05-29 14:19:28 +00:00
Syldexia
e0ba6a5876
Added change password to user settings
2018-05-21 23:01:09 +01:00
Syldexia
327b6fb5dc
Added delete account section to user settings
2018-05-13 15:24:42 +01:00
Henry Jameson
dc33c0aaac
alternate usercard
2018-05-12 16:17:04 +03:00
Henry Jameson
a6fa913f45
Input fields separate radii
2018-05-12 15:19:53 +03:00
Henry Jameson
2b64432f9a
semi-transparent inputbox style
2018-05-12 15:19:53 +03:00
Henry Jameson
c46795c692
use semi-transparent faint color + fix
2018-05-12 15:19:53 +03:00
shpuld
a0e7803e42
change timeline min/max id updating behavior to not get stuck with 20 wrong type of activities on fetch older.
2018-04-13 22:35:55 +03:00
shpuld
ee883d0f88
Remove some commented lines and logs
2018-04-11 19:40:59 +03:00
shpuld
a1f6ef1dca
Loads of fixes: notifs, autoload setting, overflow, faint text, reply form, status fadein.
2018-04-11 19:34:40 +03:00
Henry Jameson
cc02672e14
made alerts use red with transparent theme red. some UI improvs
2018-04-08 03:22:03 +03:00
Henry Jameson
b23bd076c3
raddi customization UI
2018-04-08 02:39:39 +03:00
Henry Jameson
65f82cf294
<select> styling (abeit somewhat not pretty code-wise), default colors for
...
default schemes.
2018-04-07 21:58:29 +03:00
Henry Jameson
33b1d85921
border-radii moved to variables, made rgbo colors use theme data, customizable
...
from settings screen.
2018-04-07 16:40:08 +03:00
Henry Jameson
acdb5e5c7a
cleanup. added fallback mechanism for IE11 and unsupported browsers.
2018-04-07 16:36:35 +03:00
Henry Jameson
aa0564406a
getting rid of baseXX, some small fixes. Seems to be usable.
2018-04-07 16:34:11 +03:00
Ekaterina Vaartis
cfde2fe439
Always include bio in updates, because it might be empty (optional)
2018-02-21 23:33:04 +03:00
eal
a058941aed
Add follow import to user settings.
2017-12-23 17:08:45 +02:00
eal
f4f63d32e2
Fix basicauth base64 encoding for unicode passwords.
2017-12-04 23:15:03 +02:00
lambda
2431d35277
Merge branch 'feature/flush-timeline-with-holes' into 'develop'
...
Clear timeline when there's holes between old and new
Closes #54
See merge request pleroma/pleroma-fe!171
2017-11-24 07:30:17 +00:00
lambda
38cab5e4b6
Merge branch 'fix/better-icon-colors' into 'develop'
...
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
See merge request pleroma/pleroma-fe!174
2017-11-24 07:29:49 +00:00
shpuld
6b773902e8
Fix mistake in flushMarker init, make startFetching behave properly with older statuses existing.
2017-11-23 13:46:37 +02:00
shpuld
10be553910
Update icons to use base09 where appropriate, calculate base09 by averaging bg and text colors.
2017-11-22 01:00:25 +02:00
shpuld
fc1736618b
attempt to recognize when holes in timeline for various reasons, clear timeline and fetch older when showing new to get rid of holes
2017-11-21 16:12:47 +02:00
shpuld
f6b2f6eaee
Fix usercard from breaking with certain colors, clean up code structure a bit.
2017-11-20 22:45:09 +02:00
shpuld
3534a9a62f
Make defaulting to pleroma-dark work when config.json has an invalid theme. Remove logging.
2017-11-18 13:27:37 +02:00
shpuld
d65d6e5da4
Clean up, use translations, persist theme, add more presets.
2017-11-18 13:13:51 +02:00
shpuld
21b31cf599
Move custom theming from settings to style-switcher, remove usage of custom .css files, use styles.json instead.
2017-11-17 17:24:42 +02:00
shpuld
e13c8c3fd2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme
2017-11-17 02:17:47 +02:00
shpuld
44073e72fd
Update theme editor to have 4 colors, rewrite the color setter, change a LOT of base16 assignments for better consistency.
2017-11-17 02:17:36 +02:00
eal
07057043d9
Use state object for user view instead of timeline.
...
Also fetch user if not in the state already.
2017-11-14 18:08:03 +02:00
shpuld
ed84c6acc0
First version with naive color extrapolation.
2017-11-14 01:37:49 +02:00
eal
608d1e6776
Add blocks.
2017-11-07 22:38:28 +02:00
eal
784eb8426c
Send credentials when fetching remote profile.
2017-11-07 00:20:51 +02:00
eal
2162ef20b0
Add emoji completion.
2017-09-19 22:43:20 +03:00
eal
9abfcb34ef
Add tag timeline view.
2017-09-17 14:26:35 +03:00
eal
298bf5cfca
Revert "Include cookie in every request"
...
This reverts commit 00589a9af1
2017-09-02 21:12:55 +03:00
eal
00589a9af1
Include cookie in every request
2017-09-02 19:29:45 +03:00
eal
2b0811dddc
Make sure options exists every time on fetch()
2017-09-02 19:29:16 +03:00
eal
522110c0bc
Set cookies on fetch
2017-08-31 11:23:17 +03:00
Shpuld Shpuldson
2bc261afba
Merge branch 'feature/follow-lists' into 'develop'
...
Feature/follow lists
See merge request !106
2017-08-23 12:40:39 -04:00
eal
ccfc2e57d0
Add follower and following views
2017-08-23 19:14:06 +03:00
Shpuld Shpuldson
d3169b057c
Visual indicator for when posting is happening, as well as disabling the button to prevent double-posts.
2017-08-21 15:35:14 +03:00
Shpuld Shpuldson
42fb65e274
Add error message in post status form when failing to post and don't get rid of post/attachments when failing.
2017-08-20 13:16:41 +03:00
Shpuld Shpuldson
c4920f2d86
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/profile-editing
2017-08-16 00:15:00 +03:00
Shpuld Shpuldson
acf3fd5d91
Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service.
2017-08-02 22:09:40 +03:00
Roger Braun
b1d9cbaebd
Add fetch polyfill.
2017-07-31 16:35:07 +02:00
Shpuld Shpuldson
3785a863cb
Update branch and fix conflicts.
2017-06-19 11:32:40 +03:00
Shpuld Shpuldson
e0e8965c08
update branch and fix merge conflicts
2017-06-15 23:25:19 +03:00
Roger Braun
48a6d2e987
Don't use too advanced features.
2017-06-12 17:35:04 +02:00
