Merge origin/develop into develop

hpi-swa-teaching · Jul 5, 2024 · a2e1722 · a2e1722
2 parents 9a04793 + fcb39a5
commit a2e1722
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 40 deletions.
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addTestmorph.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/addTestmorph.st
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createTestMorph.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/createTestMorph.st
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph..st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph..st
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph.st b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/instance/testmorph.st
diff --git a/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatInfoPage.class/methodProperties.json
@@ -17,7 +17,6 @@
 		"addInfoBar" : "RS 5/20/2021 21:28",
 		"addInfoText" : "jkon 5/15/2024 11:04",
 		"addPhoto" : "jkon 5/22/2024 10:26",
-		"addTestmorph" : "TU 6/14/2024 09:29",
 		"addTitle" : "jkon 5/22/2024 10:55",
 		"addTitleText" : "jkon 5/22/2024 11:04",
 		"addUserList" : "jkon 5/15/2024 11:55",
@@ -31,7 +30,6 @@
 		"createContentWrapper" : "jkon 5/15/2024 11:53",
 		"createDescription" : "RS 5/29/2021 18:32",
 		"createInfoBar" : "RS 5/20/2021 21:31",
-		"createTestMorph" : "TU 6/14/2024 09:29",
 		"createTitle" : "jkon 5/22/2024 10:54",
 		"description" : "RS 5/29/2021 18:46",
 		"description:" : "RK 8/4/2021 10:26",
@@ -43,8 +41,6 @@
 		"photoPage" : "jkon 5/15/2024 15:05",
 		"photoPage:" : "jkon 5/15/2024 15:05",
 		"showPhotoPage" : "jkon 5/15/2024 15:07",
-		"testmorph" : "TU 6/14/2024 09:29",
-		"testmorph:" : "TU 6/14/2024 09:29",
 		"title" : "jkon 5/22/2024 10:50",
 		"title:" : "jkon 5/22/2024 10:50",
 		"userList" : "per 6/3/2021 17:27",

diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices.st
diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st
@@ -8,7 +8,6 @@ addInputFieldFor: aRectangle
 		color: Color white;
 		contentsWrapped: '' asText;
 		extent: 200 @ 20;
-		"crAction: [self buttonSendPressed];"
 		yourself).
 	self allInputFields add: inputField.
 	aRectangle addMorph: inputField.

diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json
@@ -2,10 +2,9 @@
 	"class" : {
 		"newFor:withBounds:" : "jkon 6/27/2024 20:14" },
 	"instance" : {
-		"addChoices" : "6/24/2024 10:41:19",
 		"addChoices:" : "jkon 6/27/2024 19:24",
 		"addConfirmButton:" : "jkon 6/18/2024 10:05",
-		"addInputFieldFor:" : "jkon 6/27/2024 20:15",
+		"addInputFieldFor:" : "jkon 7/5/2024 10:00",
 		"addNextButton:" : "jkon 6/19/2024 18:50",
 		"addTextFieldFor:with:" : "jkon 6/18/2024 13:31",
 		"addTextInputFor:" : "jkon 6/19/2024 21:41",