01d26a389d
forgot about the fill icons
2023-03-11 13:52:11 -08:00
11e1977a21
chore: phosphor 2.0.2
...
adds woff2 as of 2.0.2 (my pr)
2023-03-11 13:44:57 -08:00
731b761e16
style: inlie-flex on ph-fw
2023-03-11 13:36:40 -08:00
8721fbe8b5
fix?
2023-03-11 13:07:51 -08:00
5e79069c4a
Clean up auth.vue
2023-03-11 16:02:35 -05:00
b7ffa05848
Enable multipart for masto oauth endpoints to fix Ivory
2023-03-11 16:02:35 -05:00
3de967393b
icons
2023-03-11 13:01:04 -08:00
90969b7512
refactor: ⬆️ phosphor 2, sorta
...
thank you sammy
2023-03-11 13:00:52 -08:00
7449b8b840
chore: apps
2023-03-11 12:22:54 -08:00
a432661e3c
Expand caption limit to 1500 characters
2023-03-05 16:51:44 +10:00
edaf7dbb61
chore: notes --> posts
2023-03-03 22:12:11 -08:00
f46445038a
fix mobile navbar
2023-03-03 22:09:57 -08:00
1120818f47
fix: post button text alignment
2023-03-03 22:01:08 -08:00
f2ce0ef273
Merge pull request 'Add divider to header' ( #9678 ) from Freeplay/calckey:a into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9678
2023-03-04 03:25:49 +00:00
0ceb272fbf
Add divider to header
2023-02-28 17:12:29 -05:00
05acb51da2
more mastodon work
2023-02-28 17:23:04 +01:00
aaaa58a8db
change continue thread text
2023-02-27 09:42:11 -05:00
f4449cfafd
Don't think that needed a reverse
2023-02-27 09:32:24 -05:00
1763e2083f
Only use regular reply icon
2023-02-26 11:33:38 -05:00
c2dde63813
fix indents on this ?
2023-02-25 21:51:37 -05:00
790dcccc6e
don't know why that was like that oops
2023-02-25 21:49:41 -05:00
5c1ca3ac29
fix small window sizes
2023-02-25 21:22:23 -05:00
f8d26e3e3d
Tweak reaction animation
2023-02-25 20:36:00 -05:00
4278bd1e54
fix subnote body clip area™
2023-02-25 20:22:17 -05:00
1310fa277e
increase clip area of subnote body
2023-02-25 20:08:53 -05:00
a0720231a8
padding tweaks
2023-02-25 19:59:58 -05:00
8cb3a25245
change line height
2023-02-25 19:48:10 -05:00
404f7986e1
remove unneeded bit
2023-02-25 15:51:51 -05:00
a538b2ea84
a
2023-02-25 15:38:36 -05:00
1c57ba6242
Only animate in if newly added
2023-02-25 15:36:35 -05:00
5d391bd198
add some animations to reactions
2023-02-25 13:50:24 -05:00
233408569b
style fixes
2023-02-25 12:36:57 -05:00
65de7b89e7
Remove content-visibility oh god that did not work as I expected
2023-02-25 12:15:35 -05:00
be15764e2d
sort of fix replies count ?
2023-02-25 11:57:16 -05:00
0914a7fbd9
fix line alignment
2023-02-25 11:10:48 -05:00
161594d4bc
Fix 'close' button in posts not sticking to bottom
...
thanmk you overlfow clip
2023-02-25 01:18:21 -05:00
5177fdeef1
allow mfm to overflow w/out it blocking any buttons
2023-02-25 01:15:42 -05:00
de97032eab
add footer hover thingy to subnote too
2023-02-25 00:39:43 -05:00
0f94a62198
comment out unneeded bit (maybe for now)
2023-02-25 00:21:37 -05:00
c81a75cd1f
change reply hover
2023-02-25 00:19:39 -05:00
7a2d1e7a07
fix alignment
2023-02-24 22:37:17 -05:00
5c076893c6
increase size when indents decrease
2023-02-24 22:35:37 -05:00
92b8aed3e2
style view thread continuation button + fix link underline
2023-02-24 22:33:21 -05:00
5eee718750
larger pfp's for first column of replies on mobile
2023-02-24 20:37:36 -05:00
6d71195acc
Merge pull request 'fix: multiple Ads' bugs & feat: Ads widget' ( #9668 ) from yawhn/elreqkey:9080_ads_widget into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9668
2023-02-24 17:22:46 +00:00
b34b6de71f
Reduce detailed note spacing on mobile
2023-02-24 11:55:51 -05:00
fce27471ab
fix: multiple Ads' bugs.
...
feat: Ads widget
https://codeberg.org/calckey/calckey/issues/9138
https://codeberg.org/calckey/calckey/issues/9080
2023-02-24 13:58:45 +02:00
2311956dfa
Change reply order from oldest to newest
2023-02-23 22:45:12 -05:00
842d48c4a8
also add hover to link previews
2023-02-23 22:03:38 -05:00
eca6a784a1
fix not being able to click around there are new posts button
2023-02-23 20:50:58 -05:00
5fe9ee27ef
smaller reply avatars on mobile
2023-02-23 20:46:48 -05:00
041d3997cd
Make quotes clickable
2023-02-23 20:37:26 -05:00
5a4a3a536b
fix click events
2023-02-23 20:14:43 -05:00
b0ceb9385c
change line color
2023-02-23 18:28:32 -05:00
42532ce168
line alignment fixes
2023-02-23 18:22:51 -05:00
eb30b8460d
bruh why didn't I just do that
2023-02-23 16:44:15 -05:00
9d1c08d322
Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements
2023-02-23 16:21:54 -05:00
bc761610d3
fix: visibility picker
2023-02-21 16:04:00 -08:00
dd907f2f46
fix: 🐛 url slicing
2023-02-21 15:51:46 -08:00
795950a754
*Might* be something that can improve performance
2023-02-20 23:29:34 -05:00
62246796b1
Prevent mention avatars from wrapping
2023-02-20 22:24:06 -05:00
e68d8b8a6d
refactor: max 5 url previews
...
Closes #9654
2023-02-20 12:01:17 -08:00
294d940800
Revert footer changes
2023-02-20 13:30:15 -05:00
514cc3d8d2
Use bolder font on active reaction
2023-02-20 13:19:12 -05:00
1235a1cdb8
use accent color for lines
2023-02-20 13:18:37 -05:00
d6c10891b7
back to the smaller avatars
2023-02-19 20:56:28 -05:00
6639d7d42c
Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements
2023-02-19 20:24:33 -05:00
e32bab700d
add reply connectors, a
2023-02-19 20:12:01 -05:00
66c3ac0654
new threading, still wip
2023-02-19 18:31:16 -05:00
eb3a3e3c36
make css module
2023-02-18 20:13:24 -08:00
0a3e39b6ec
testing
2023-02-18 20:09:14 -08:00
19c88fc68b
fix broken style
2023-02-18 20:02:58 -08:00
1d2e638571
style
2023-02-18 20:01:00 -08:00
b8499df5eb
fix MkUpdated
2023-02-18 19:58:42 -08:00
cc7be70bdf
fix
2023-02-18 19:55:18 -08:00
302e452572
fix
2023-02-18 19:48:25 -08:00
f625e4c40b
chore: rm dead code
2023-02-18 16:39:38 -08:00
8d352e4582
chore: 🔥 remove ability to add Twitter integration
2023-02-18 16:37:25 -08:00
3118825fa9
will fix?
2023-02-18 16:28:50 -08:00
7132ad2285
fix??
2023-02-18 16:16:24 -08:00
3e87ca0e94
formatting
2023-02-18 15:53:19 -08:00
0f9daa4ac4
fix?
2023-02-18 15:48:46 -08:00
9c5dc7b3f2
fix: dialog
2023-02-18 15:34:41 -08:00
a1a6937785
feat: new modal
2023-02-18 15:27:12 -08:00
77eb5c984d
fix: city validation
2023-02-18 11:42:37 -08:00
2d59e363c0
feat: ✨ Show time for users
2023-02-18 11:33:25 -08:00
c644a08d39
Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements
2023-02-17 15:39:30 -05:00
b654add6b3
fix
2023-02-17 12:36:16 -08:00
9ed34f3704
add isActiveTab method
2023-02-17 11:54:33 -08:00
4ed1b80d68
perf: ⚡ MkPageHeader perf
2023-02-17 11:40:12 -08:00
eac3699bd2
Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements
2023-02-17 13:24:08 -05:00
650a62953d
Add more to subnotecontent if detailed
2023-02-17 11:31:48 -05:00
cdf9a03604
chore: formatting
2023-02-17 00:19:29 -08:00
da648e1517
Add buttons & link previews to subnotes, start of new thread design
...
Should've made them separate commits but eeek I started working on them at the same time D:
2023-02-17 00:06:49 -05:00
0cb8918778
Add URL previews to subnote
2023-02-16 17:06:36 -05:00
b62249b77f
formatting
2023-02-15 12:46:27 -08:00
694ce70d6e
Revert "refactor: use MkAvatars for mods"
...
This reverts commit dbe74ed098
2023-02-15 12:45:41 -08:00
020101a2fc
notes for admin heatmap by default
2023-02-15 10:45:33 -08:00
3ddfb28082
bg
2023-02-15 10:39:30 -08:00
dbe74ed098
refactor: use MkAvatars for mods
2023-02-15 10:37:39 -08:00
92572157fa
adjust MkNumber tween time
2023-02-15 10:34:17 -08:00
96311b597c
fix: more readable icon bgs
2023-02-15 10:33:00 -08:00
8490b00609
type errors
2023-02-15 10:29:49 -08:00
be44679420
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-02-15 10:28:03 -08:00
79f3052907
icons for dashboard
2023-02-15 10:27:49 -08:00
a704192b73
refactor please signin component
2023-02-14 11:03:05 +01:00
688368e4e1
chore: formatting
2023-02-13 20:25:31 -08:00
81cc4b3f49
fix: 💄 admin overview style
2023-02-13 20:21:42 -08:00
e02fe02f35
fix import
2023-02-13 20:05:49 -08:00
6fb2fc3906
fix
2023-02-13 20:04:34 -08:00
b5a03e40f1
MkNumber
2023-02-13 20:02:41 -08:00
24e49e39db
rm retention heatmap
2023-02-13 19:59:40 -08:00
186f2494fd
add needed script
2023-02-13 19:58:33 -08:00
d706b80e37
fix import
2023-02-13 19:55:37 -08:00
ac90543382
MkFolder
2023-02-13 19:54:06 -08:00
1b69006040
?
2023-02-13 19:53:39 -08:00
3def9ab3b7
test
2023-02-13 19:51:56 -08:00
22188b9709
attempt fix
2023-02-13 19:48:57 -08:00
0e8c30d3fa
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-02-13 19:40:39 -08:00
21e7529725
feat: ✨ new admin panel data from Mk v13
2023-02-13 19:40:31 -08:00
9093319906
Top nav fixes ( #9634 )
...
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-02-13 21:14:06 +00:00
4e84d45a20
Hopefully fix performance of topbar nav ( #9631 )
...
Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9631
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-02-13 18:57:33 +00:00
46d4327fce
fix: correctly use note.emojis
2023-02-12 20:54:46 -08:00
0094ba8a2d
fix wrong import
2023-02-12 20:50:36 -08:00
085de45d02
fix
2023-02-12 20:46:56 -08:00
edc5638385
remove defaultStore check in MFM
2023-02-12 20:29:34 -08:00
fa23360f13
feat: ✨ add position, scale , fg, and bg MFM from v13
2023-02-12 20:25:23 -08:00
e118a28542
feat: ✨ Add in Misskey v13's reacted users view
2023-02-12 20:14:05 -08:00
256fd485fd
apply mobile nav styling to desktop, maybe also fix misalignment ? ( #9623 )
...
Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9623
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-02-12 23:41:54 +00:00
4c0d30c368
increase number of remote featured posts from 30 to 60
2023-02-12 15:38:19 -08:00
3185512753
tab performance ( #9621 )
...
Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9621
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-02-12 22:49:38 +00:00
813bea02ab
fix
2023-02-12 12:40:47 -08:00
5f2ca1f957
fix
2023-02-12 12:15:21 -08:00
9f8bebf5f8
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-02-12 12:07:15 -08:00
4fe24fec1a
feat: ✨ remote featured notes
2023-02-12 12:07:07 -08:00
d8512d5485
fix navbar hover thingy ( #9616 )
...
Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9616
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-02-12 18:42:21 +00:00
3fbeaf0e9e
serialize outgoing searches returning out of order
2023-02-12 01:51:26 +00:00
69da6fa295
chore: formatting
2023-02-11 17:22:05 -08:00
4ca445b587
Implementation of an instances wide antenna source. ( #9604 )
...
This PR contains new source for antenna posts, which is a list of instance hostnames to process all posts from.
Using this mode, a user can filter for keywords on an instance wide basis.
This change includes a new antenna source called `instances` and a new database column in the `antenna` table called `instances` to store the instance names.
On the antenna editor, there's also an "Add an instance" finder dialog to allow users to search through the known instance hostnames.
Co-authored-by: Kaity A <supakaity@blahaj.zone>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9604
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
2023-02-12 01:20:17 +00:00
653c71dad5
Enable reply update/display in detailed view. ( #9606 )
...
This PR establishes a new replied note stream update for subscribed notes, which gets fired off whenever a note receives a reply and the user is subscribed to the note for updates.
It specifically does not provide note details as part of the update, just the note id of the reply, so that they must go and retrieve the note and be subject to the proper permission and visibility checks.
The detailed note component has then been updated to watch for the replied notification so it can add new replies to the thread as they are created.
This allows both seeing new replies while on the page, and also to see your own replies appear after you post them without having to reload the page.
This PR relies on https://codeberg.org/calckey/calckey.js/pulls/2 to add the replied type to the calkey.js module.
Co-authored-by: Kaity A <supakaity@blahaj.zone>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9606
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
2023-02-12 01:19:43 +00:00
b02f62dba4
Formatting
2023-02-11 17:14:50 -08:00
474a02bfe0
Hide inactive tab labels on mobile ( #9609 )
...
Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9609
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-02-12 01:11:11 +00:00
3de2617d6b
Remove hardcoding of sounds ( #9510 ) ( #9607 )
...
Co-authored-by: Kio-td <kio.thedev@gmail.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9607
Co-authored-by: daikei <daikei@noreply.codeberg.org>
Co-committed-by: daikei <daikei@noreply.codeberg.org>
2023-02-11 21:09:43 +00:00
4ddb65410b
chore: up calckey.js
2023-02-11 13:04:22 -08:00
2f2fd293dc
feat: ✨ don't depend on an external service for urn:ietf:wg:oauth:2.0:oob ( #9602 )
...
Co-authored-by: GeopJr <evan@geopjr.dev>
Co-committed-by: GeopJr <evan@geopjr.dev>
2023-02-11 20:08:12 +00:00
fcc59cd35f
chore: Rome Formatting
2023-02-10 15:41:19 -08:00
f9c0d91865
chore: 🎨 new dummy images
2023-02-10 15:17:56 -08:00
23ad352088
fix(client): use proxied image for instance icon
2023-02-10 22:46:56 +00:00
b54b8d4d2e
fix(client): use proxied image for instance icon
2023-02-10 22:46:08 +00:00
72e5b4f487
make build work after calcks merge
2023-02-10 20:50:42 +01:00
f7564d87b0
fix: 🔒 prevent issues
2023-02-10 11:14:33 -08:00
96e1a93216
fix(client): validate urls to improve security
2023-02-10 11:08:08 -08:00
6554b2eb9a
lower build targets to support mobile ui stuff, eh
2023-02-10 01:11:11 +01:00
b197464638
Merge branch 'feature/masto-api' into develop
2023-02-10 00:13:20 +01:00
cca72dfbac
undo
2023-02-09 15:06:01 -08:00
f500086a0e
fix iconOnly for home tl
2023-02-09 15:01:31 -08:00
7571e96bd0
feature/help_menu ( #9587 )
...
Co-authored-by: ThatOneCalculator <kainoa@t1c.dev>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9587
2023-02-09 22:48:25 +00:00
c2fe849e14
Merge pull request 'feat: Blocking someone should mute them, and disable the ability to mute/unmute them' ( #9581 ) from Feinzer/calckey:issue/9509 into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9581
2023-02-09 22:45:47 +00:00
717aa899b1
feat: ✨ v1 Mastodon API
...
This commit adds (maybe unstable) support for Mastodons v1 api
also some v2 endpoints, maybe I miss stuff, I dont know.
We will need to test this but it should be kinda stable
and work like (old) butter.
Co-authored-by: Natty <natty.sh.git@gmail.com>
Co-authored-by: cutls <web-pro@cutls.com>
2023-02-09 23:21:50 +01:00
3c2a8bec80
chore: update credits
2023-02-09 11:19:54 -08:00
52e6bf7f4c
Merge pull request 'Add labels to mobile top nav' ( #9579 ) from Freeplay/calckey:mobile-navbar into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9579
2023-02-09 19:17:07 +00:00
d9b4ce79ac
fix: Use theme --bg instead of a hardcoded color
2023-02-09 14:18:42 -04:00
3c340b5142
feat: Unblock with follow button
...
* refresh user when changed
2023-02-09 13:47:50 -04:00
569136b87c
fix: Hide unmute option when the user is blocked
2023-02-09 13:46:32 -04:00
135860cc68
feat: Mute and unfollow when blocking a user
2023-02-09 13:17:14 -04:00
ad27cb20ec
use fixed color fox blockquotes + other styling
2023-02-09 06:31:49 -05:00
9eec56f486
Add labels to mobile top nav
2023-02-09 05:09:40 -05:00
c68c01a09e
wip masto api
...
co-authored-by: cutls <web-pro@cutls.com>
2023-02-07 22:56:39 +01:00
f2dc07522b
chore: up vite
2023-02-06 20:06:50 -08:00
6acde3f034
Merge pull request 'build: ⚡ reduce container size by removing dev dependencies from final image' ( #9534 ) from asrael/calckey:Dockerfile-optimization into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9534
2023-02-07 04:00:48 +00:00
21a59dc497
Merge remote-tracking branch 'upstream/develop' into Dockerfile-optimization
2023-02-06 01:08:40 -08:00
32ab681714
Allow interacting with subnote w/out opening post
2023-02-05 20:26:38 -05:00
78921387b3
feat: ✨ dialog to remove follower
...
co-authored-by: atsu1125 <atsu1125@github>
2023-02-04 12:46:48 -08:00
4bd399f321
chore: formatting
2023-02-04 12:41:25 -08:00
44f593945c
build: ⚡ reduce container size by removing dev dependencies from final image
...
This change moves many of the dependencies into devDependencies, by analyzing what is used in the runtime files. Additionally, NPM and apk cache are eliminated with multi-stage builds
2023-02-03 21:38:40 -08:00
48d4b5a726
fix: Use ❤️ instead of ♥️
2023-02-04 02:30:43 +01:00
d1e53259fa
Change note context position ( #9550 )
...
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-02-04 01:12:55 +00:00
ba4ed1652c
Fix status buttons text wrapping in webkit
2023-02-03 10:02:31 +00:00
26a0ed1aba
fix: margin on tab button
2023-02-01 12:19:01 -08:00
10e2f3e62a
2px
2023-02-01 12:15:59 -08:00
dc0243b8ea
fix
2023-02-01 11:55:45 -08:00
d44cb14615
styling
2023-02-01 11:51:19 -08:00
83b56f4ad5
Merge pull request 'note-improvements but this time fix boosted avatars' ( #9535 ) from Freeplay/calckey:note-improvements into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9535
2023-02-01 19:48:34 +00:00
be3ec48511
Fix avatars using boosted pfp's
2023-02-01 14:43:58 -05:00
6c4432aeba
fix: update dialog
2023-02-01 11:06:34 -08:00
55133fcedd
fix wrong locale
2023-02-01 10:58:48 -08:00
8683037677
fix
2023-02-01 10:50:07 -08:00
654f31bc83
fix: show mfm cheat sheet as popup instead of new window
2023-02-01 10:45:32 -08:00
d169ea1905
Merge pull request 'Proper support for image types in notes, opengraph images and videos.' ( #9524 ) from Skystryder/chakey:feature/opengraph into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9524
2023-01-30 04:52:01 +00:00
80f48f4dd5
Merge pull request 'Show MFM Cheatsheet on note dialogue.' ( #9528 ) from Skystryder/chakey:feature/formattingtips into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9528
2023-01-30 04:51:15 +00:00
8aa0b8093f
up vite
2023-01-29 19:47:40 -08:00
0e26e0c1a1
Show MFM Cheatsheet on note dialogue.
2023-01-28 18:56:48 -08:00
fd6b1b10fd
Proper support for image types in notes, opengraph images and videos.
...
Progress toward https://codeberg.org/calckey/calckey/issues/9373
2023-01-28 16:47:26 -08:00
fb33687157
Padding & alignment improvements
2023-01-28 16:10:45 -05:00
41bfd0cc8c
rEMOVE THAT HECM PINNED NOTE SPACE AGAIN
2023-01-28 14:57:14 -05:00
ed3ba64525
Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements
2023-01-28 14:51:08 -05:00
84cb921573
fix style
2023-01-24 19:31:38 -08:00
ed85d065b0
style: 💄 ticker improvements
...
premature partial from #9415
2023-01-24 19:20:38 -08:00
ce3308a290
hide "RN" on MkNoteDetailed
2023-01-24 18:59:07 -08:00
b3b97f0866
style: border radius on instance ticker icon
2023-01-24 18:57:00 -08:00
ThatOneCalculator
Luna
Kaity A
Freeplay
Cleo John
yawhn
Kaity A
daikei
GeopJr
Cleo
syuilo
Daniel Hernández
Asrael
Skystryder