Commit Graph

214 Commits

Author SHA1 Message Date
7ae3d06aae stupid file 2022-07-12 12:50:13 +02:00
7b1a076f80 Undo time 2022-07-12 12:49:33 +02:00
cc17cf287c Merge branch 'main' of https://git.james-things.com/DNDs/talon-one
# Conflicts:
#	.gitattributes
#	.gitignore
#	.obsidian/app.json
#	.obsidian/appearance.json
#	.obsidian/community-plugins.json
#	.obsidian/core-plugins.json
#	.obsidian/graph.json
#	.obsidian/hotkeys.json
#	.obsidian/plugins/obsidian-git/data.json
#	.obsidian/plugins/obsidian-image-toolkit/data.json
#	.obsidian/plugins/table-editor-obsidian/data.json
2022-07-12 12:37:33 +02:00
05fe89cfb6 Affected files:
.obsidian/plugins/obsidian-git/data.json
.obsidian/workspace
2022-07-12 12:23:01 +02:00
2546795817 vault backup: 12.07.2022 - 12:20:30
Affected files:
.obsidian/workspace
README.md
2022-07-12 12:20:30 +02:00
0ee3ad7450 vault auto-backup: 12.07.2022 - 11:42:05
Affected files:
.obsidian/workspace
Private/Rapha/Phantasialand.md
2022-07-12 11:42:05 +02:00
4b2498013f Merge remote-tracking branch 'origin/main' 2022-07-12 11:24:34 +02:00
2fd1a5e902 puahing movule 2022-07-12 11:23:43 +02:00
ad83a04fd9 updated 2022-07-12 11:20:49 +02:00
c7b0f6d14d modified Regelungen.md 2022-07-12 10:42:38 +02:00
26ec743e56 Added plugins 2022-07-12 10:42:24 +02:00
60d35e8700 vault auto-backup: 12.07.2022 - 10:35:18
Affected files:
.obsidian/app.json
.obsidian/appearance.json
.obsidian/plugins/obsidian-git/data.json
.obsidian/themes/Deep Work.css
.trash/Zum Ruhigen Start.md
Regelungen.md
Session 0/Akt 1 - Der Brief/Intro.md
Session 0/Akt 1 - Der Brief/Jenkins Abschiedsbrief.md
Session 0/Akt 2 - Rogueport/Ankunft in Rogueport.md
Session 0/Akt 2 - Rogueport/Die Lightseeker.md
Session 0/Akt 2 - Rogueport/Rogueport.md
Session 0/Akt 2 - Rogueport/Taschendiebaktionen/Doris haut ab.md
Session 0/Akt 2 - Rogueport/Taschendiebaktionen/Doris.md
Session 0/Akt 2 - Rogueport/Taschendiebaktionen/Einschüchterung von Doris.md
Session 0/Akt 2 - Rogueport/Taschendiebaktionen/Kampf mit Doris.md
Session 0/Akt 2 - Rogueport/Taschendiebaktionen/Zum Ruhigen Start.md
Session 0/Alter Jenkins.md
Session 0/Der Brieftragende Kutscher.md
To Test.md
Todo.md
readme.md
2022-07-12 10:35:18 +02:00
ca8273c800 added plugins 2022-07-12 10:11:51 +02:00
e88c1e60b9 vault auto-backup: 12.07.2022 - 09:55:09
Affected files:
Attachment/Dodn.png
Attachment/o.png
2022-07-12 09:55:09 +02:00
bfdef48707 edited 2022-07-11 13:23:54 +02:00
9373b992a8 changed rules 2022-07-10 23:00:11 +02:00
42f8341639 added moving things 2022-07-10 15:56:54 +02:00
9c1c89c99b vault auto-backup: 05.07.2022 - 16:29:21
Affected files:
.obsidian/workspace
Periodische Notizen/Täglich/12.07.2022.md
2022-07-05 16:29:21 +02:00
aaa6efc361 vault auto-backup: 05.07.2022 - 16:02:12
Affected files:
.obsidian/workspace
Periodische Notizen/Täglich/05.07.2022.md
2022-07-05 16:02:12 +02:00
cbda9558a8 vault auto-backup: 05.07.2022 - 14:45:15
Affected files:
Firmen/Steinemann Technology/Tickets/Monica Garcia/Erstellung der Penta Belege.md
2022-07-05 14:45:15 +02:00
caecb10bf2 vault auto-backup: 05.07.2022 - 14:29:54
Affected files:
.obsidian/appearance.json
.obsidian/workspace
2022-07-05 14:29:54 +02:00
925e86f090 vault auto-backup: 05.07.2022 - 13:42:56
Affected files:
.obsidian/workspace
Firmen/Steinemann Technology/Tickets/Monica Garcia/Erstellung der Penta Belege.md
2022-07-05 13:42:56 +02:00
93738206dd vault backup: 05.07.2022 - 13:22:45
Affected files:
.obsidian/appearance.json
.obsidian/community-plugins.json
.obsidian/hotkeys.json
.obsidian/plugins/advanced-cursors/main.js
.obsidian/plugins/advanced-cursors/manifest.json
.obsidian/plugins/advanced-cursors/styles.css
.obsidian/workspace
Firmen/Steinemann Technology/Tickets/Monica Garcia/Erstellung der Penta Belege.md
2022-07-05 13:22:45 +02:00
363a6c2018 vault auto-backup: 05.07.2022 - 09:39:33
Affected files:
.obsidian/workspace
2022-07-05 09:39:33 +02:00
4cd3047dbf Revert "added aufgabenteilung"
This reverts commit a4bc191d16.
2022-07-05 09:34:04 +02:00
0cf8067c7e added church 2022-07-04 23:11:08 +02:00
a4bc191d16 added aufgabenteilung 2022-07-04 23:10:51 +02:00
561e3eb171 untitlet commit 2022-07-04 19:10:51 +02:00
eef9d01991 vault auto-backup: 03.07.2022 - 23:33:07
Affected files:
.obsidian/workspace
Untitled.md
2022-07-04 19:10:09 +02:00
99c8b2705c Modified 2022-07-04 16:36:10 +02:00
2a7d5a36f3 Empty 2022-07-04 16:35:56 +02:00
e1bb551c83 Merge branch 'main' of https://git.james-things.com/James/private_notes
# Conflicts:
#	.obsidian/community-plugins.json
#	.obsidian/workspace
#	Periodische Notizen/Täglich/03.07.2022.md
2022-07-04 16:17:24 +02:00
94bb1521c0 added two day things 2022-07-04 16:13:47 +02:00
4fd897a372 vault auto-backup: 04.07.2022 - 15:51:39
Affected files:
Periodische Notizen/Täglich/04.07.2022.md
2022-07-04 15:51:39 +02:00
4aa4719222 vault auto-backup: 04.07.2022 - 14:59:56
Affected files:
Periodische Notizen/Täglich/04.07.2022.md
2022-07-04 14:59:56 +02:00
895eaf18a6 vault auto-backup: 04.07.2022 - 14:43:56
Affected files:
.obsidian/starred.json
.obsidian/workspace
Firmen/Steinemann Technology/Notes/Auswertungen K2H.md
Firmen/Steinemann Technology/Notes/Penta/Penta Übersicht.md
Firmen/Steinemann Technology/Tickets/Monica Garcia/Erstellung der Penta Belege.md
Firmen/Steinemann Technology/Tickets/Monica Garcia/Penta Belege termin definieren.md
Periodische Notizen/Täglich/04.07.2022.md
2022-07-04 14:43:56 +02:00
d55a62117b vault auto-backup: 04.07.2022 - 14:08:55
Affected files:
.obsidian/command-palette.json
.obsidian/community-plugins.json
.obsidian/core-plugins.json
.obsidian/plugins/periodic-notes/data.json
.obsidian/plugins/periodic-notes/main.js
.obsidian/plugins/periodic-notes/manifest.json
.obsidian/plugins/periodic-notes/styles.css
.obsidian/plugins/table-editor-obsidian/data.json
.obsidian/workspace
Periodische Notizen/Täglich/01.07.2022.md
Periodische Notizen/Täglich/04.07.2022.md
Periodische Notizen/Täglich/05.07.2022.md
Periodische Notizen/Täglich/06.07.2022.md
Periodische Notizen/Täglich/27.06.2022.md
Periodische Notizen/Täglich/28.06.2022.md
Periodische Notizen/Täglich/30.06.2022.md
Periodische Notizen/Wöchentlich/KW27-2022.md
Templates/t_DailyNote.md
2022-07-04 14:08:55 +02:00
4f094fe344 vault auto-backup: 04.07.2022 - 08:32:58
Affected files:
.obsidian/workspace
Daily/01.07.2022.md
Daily/04.07.2022.md
Daily/05.07.2022.md
Daily/27.06.2022.md
Daily/28.06.2022.md
Daily/30.06.2022.md
Firmen/Steinemann Technology/Notes/infomails/Infomail Letzte Erinnerung für Badge Übertragung.md
Firmen/Steinemann Technology/Tickets/Monica Garcia/Absprache mit CRO über das Erstellen der Belege.md
Firmen/Steinemann Technology/Tickets/Monica Garcia/Erstellung der Penta Belege.md
Firmen/Steinemann Technology/Tickets/Monica Garcia/Penta Belege termin definieren.md
Firmen/Steinemann Technology/Tickets/Stefanie Weilenmann/Installation von Monitor.md
Templates/t_DailyNote.md
2022-07-04 08:32:58 +02:00
8e4afb03ab vault auto-backup: 04.07.2022 - 07:31:02
Affected files:
.obsidian/workspace
Daily/04.07.2022.md
2022-07-04 07:31:02 +02:00
11970e8cac vault auto-backup: 04.07.2022 - 07:14:21
Affected files:
Daily/04.07.2022.md
2022-07-04 07:14:21 +02:00
96adafd785 Merge branch 'main' of https://git.james-things.com/DNDs/talon-one 2022-07-03 22:49:33 +02:00
ae31f4bbcb vault auto-backup: 03.07.2022 - 14:02:35
Affected files:
attachment/maps/cities/blackwyche/submaps/blackwyche_entrance_bridge.jpg.png
2022-07-03 22:49:25 +02:00
830a2af0c6 vault auto-backup: 03.07.2022 - 14:02:35
Affected files:
attachment/maps/cities/blackwyche/submaps/blackwyche_entrance_bridge.jpg.png
2022-07-03 14:02:36 +02:00
3f7207f4e5 vault auto-backup: 03.07.2022 - 13:23:38
Affected files:
.obsidian/community-plugins.json
.obsidian/graph.json
.obsidian/plugins/obsidian-discordrpc/data.json
.obsidian/plugins/obsidian-discordrpc/main.js
.obsidian/plugins/obsidian-discordrpc/manifest.json
.obsidian/workspace
2022-07-03 13:23:38 +02:00
89db094816 vault auto-backup: 03.07.2022 - 13:02:48
Affected files:
.obsidian/appearance.json
.obsidian/workspace
Daily/03.07.2022.md
2022-07-03 13:02:49 +02:00
909f4872f7 vault auto-backup: 01.07.2022 - 14:53:40
Affected files:
Daily/01.07.2022.md
Firmen/Steinemann Technology/Notes/infomails/Letzte Erinnerung für Badge Übertragung.md
2022-07-01 14:53:40 +02:00
ad53076eba vault auto-backup: 01.07.2022 - 14:23:48
Affected files:
.obsidian/workspace
Daily/01.07.2022.md
2022-07-01 14:23:48 +02:00
060405352a vault auto-backup: 01.07.2022 - 09:51:21
Affected files:
.obsidian/appearance.json
.obsidian/plugins/calendar/data.json
.obsidian/workspace
Attachment/BELEGE .msg
Daily/01.07.2022.md
Daily/05.07.2022.md
Daily/30.06.2022.md
Templates/t_DailyNote.md
2022-07-01 09:51:21 +02:00
5cef9516ff vault auto-backup: 01.07.2022 - 07:41:37
Affected files:
.obsidian/workspace
Daily/01.07.2022.md
2022-07-01 07:41:37 +02:00
46fd8cebae vault auto-backup: 01.07.2022 - 07:26:13
Affected files:
.obsidian/appearance.json
.obsidian/workspace
Daily/01.07.2022.md
2022-07-01 07:26:13 +02:00