Elian Doran d5c1bd1085

Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7 ...

; Conflicts:
;	package-lock.json
;	src/routes/api/files.ts
;	src/services/build.js
;	src/services/notes.ts

2024-07-13 18:36:04 +03:00

..

app_info.ts

server-ts: Convert routes/api/app_info

2024-04-05 20:12:54 +03:00

attachments.ts

server-ts: Convert routes/api/attachments

2024-04-05 20:16:46 +03:00

attributes.ts

server-ts: Fix getAttribute permitting null

2024-04-09 21:43:42 +03:00

autocomplete.ts

server-ts: Convert routes/api/autocomplete

2024-04-05 20:26:45 +03:00

backend_log.ts

server-ts: Convert routes/api/bulk_action

2024-04-05 20:36:10 +03:00

branches.ts

server-ts: Convert routes/api/branches

2024-04-05 20:33:04 +03:00

bulk_action.ts

server-ts: Convert routes/api/bulk_action

2024-04-05 20:36:10 +03:00

clipper.ts

server-ts: Port routes/routes

2024-04-11 23:00:24 +03:00

cloning.ts

server-ts: Convert routes/api/cloning

2024-04-05 20:47:07 +03:00

database.ts

server-ts: Convert routes/api/consistency_checks

2024-04-05 20:55:21 +03:00

etapi_tokens.ts

server-ts: Convert routes/api/etapi_tokens

2024-04-05 20:56:23 +03:00

export.ts

server-ts: Port routes/routes

2024-04-11 23:00:24 +03:00

files.ts

Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7

2024-07-13 18:36:04 +03:00

fonts.ts

server-ts: Convert routes/api/fonts

2024-04-05 22:24:21 +03:00

image.ts

server-ts: Convert etapi/notes

2024-04-07 16:56:45 +03:00

import.ts

server-ts: Remove use of (req as any)

2024-04-07 14:29:08 +03:00

keys.ts

server-ts: Convert routes/api/keys

2024-04-06 21:31:09 +03:00

login.ts

server-ts: Remove use of (req as any)

2024-04-07 14:29:08 +03:00

note_map.ts

server-ts: Convert routes/api/note_map

2024-04-06 21:45:58 +03:00

notes.ts

server-ts: Fix "Missing or incorrect type for target branch ID"

2024-04-06 22:17:47 +03:00

options.ts

server-ts: Convert routes/api/options

2024-04-06 21:57:26 +03:00

other.ts

server-ts: Convert routes/api/other

2024-04-06 21:58:32 +03:00

password.ts

server-ts: Convert routes/api/password

2024-04-06 22:00:03 +03:00

recent_changes.ts

server-ts: Convert routes/api/recent_changes

2024-04-06 22:07:03 +03:00

recent_notes.ts

server-ts: Convert routes/api/recent_notes

2024-04-06 22:07:58 +03:00

relation-map.ts

server-ts: Convert routes/api/relation-map

2024-04-06 22:13:47 +03:00

revisions.ts

server-ts: Convert routes/api/revisions

2024-04-06 22:32:03 +03:00

script.ts

server-ts: Convert routes/api/script

2024-04-06 22:38:17 +03:00

search.ts

server-ts: Convert routes/api/search

2024-04-06 22:48:20 +03:00

sender.ts

server-ts: Convert etapi/notes

2024-04-07 16:56:45 +03:00

setup.ts

server-ts: Convert routes/api/setup

2024-04-06 23:08:41 +03:00

similar_notes.ts

server-ts: Convert routes/api/similar_notes

2024-04-06 23:09:32 +03:00

special_notes.ts

server-ts: Convert routes/api/special_notes

2024-04-06 23:11:02 +03:00

sql.ts

server-ts: Convert routes/api/sql

2024-04-06 23:12:22 +03:00

stats.ts

server-ts: Convert routes/api/stats

2024-04-06 23:15:00 +03:00

sync.ts

server-ts: Convert routes/api/sync

2024-04-06 23:28:51 +03:00

tree.ts

server-ts: Fix regression

2024-04-15 21:20:59 +03:00