felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-05 23:47:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into smaller_membership

Browse Source 
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
This commit is contained in:
manuroe
2017-07-06 13:46:20 +02:00
parent df3189e097 55d75b6f96
commit 9b0d035ed8
5 changed files with 639 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot.xcodeproj/project.pbxproj
+45
View File
@@ -18,6 +18,9 @@
32AE61E51F0A971B007255F4 /* RoomMembershipBubbleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32AE61E31F0A971B007255F4 /* RoomMembershipBubbleCell.xib */; };
32AE61E91F0CE099007255F4 /* RoomMembershipBubbleCellWithPaginationTitleBubbleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 32AE61E71F0CE099007255F4 /* RoomMembershipBubbleCellWithPaginationTitleBubbleCell.m */; };
32AE61EA1F0CE099007255F4 /* RoomMembershipBubbleCellWithPaginationTitleBubbleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32AE61E81F0CE099007255F4 /* RoomMembershipBubbleCellWithPaginationTitleBubbleCell.xib */; };
32AE61F21F0D2183007255F4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 32AE61EC1F0D2183007255F4 /* InfoPlist.strings */; };
32AE61F31F0D2183007255F4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 32AE61EE1F0D2183007255F4 /* Localizable.strings */; };
32AE61F41F0D2183007255F4 /* Vector.strings in Resources */ = {isa = PBXBuildFile; fileRef = 32AE61F01F0D2183007255F4 /* Vector.strings */; };
32D392181EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 32D392161EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.m */; };
32D392191EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 32D392171EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.xib */; };
32FD0A3D1EB0CD9B0072B066 /* BugReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FD0A3B1EB0CD9B0072B066 /* BugReportViewController.m */; };
@@ -493,6 +496,9 @@
32AE61E61F0CE099007255F4 /* RoomMembershipBubbleCellWithPaginationTitleBubbleCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomMembershipBubbleCellWithPaginationTitleBubbleCell.h; sourceTree = "<group>"; };
32AE61E71F0CE099007255F4 /* RoomMembershipBubbleCellWithPaginationTitleBubbleCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomMembershipBubbleCellWithPaginationTitleBubbleCell.m; sourceTree = "<group>"; };
32AE61E81F0CE099007255F4 /* RoomMembershipBubbleCellWithPaginationTitleBubbleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RoomMembershipBubbleCellWithPaginationTitleBubbleCell.xib; sourceTree = "<group>"; };
32AE61ED1F0D2183007255F4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = InfoPlist.strings; sourceTree = "<group>"; };
32AE61EF1F0D2183007255F4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = Localizable.strings; sourceTree = "<group>"; };
32AE61F11F0D2183007255F4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = Vector.strings; sourceTree = "<group>"; };
32D392151EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryServerDetailTableViewCell.h; sourceTree = "<group>"; };
32D392161EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectoryServerDetailTableViewCell.m; sourceTree = "<group>"; };
32D392171EB9B7AB009A2BAF /* DirectoryServerDetailTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DirectoryServerDetailTableViewCell.xib; sourceTree = "<group>"; };
@@ -1098,6 +1104,16 @@
path = Directory;
sourceTree = "<group>";
};
32AE61EB1F0D2183007255F4 /* nl.lproj */ = {
isa = PBXGroup;
children = (
32AE61EC1F0D2183007255F4 /* InfoPlist.strings */,
32AE61EE1F0D2183007255F4 /* Localizable.strings */,
32AE61F01F0D2183007255F4 /* Vector.strings */,
);
path = nl.lproj;
sourceTree = "<group>";
};
6567B0BBF3C05D7F7A7F79CC /* Frameworks */ = {
isa = PBXGroup;
children = (
@@ -1165,6 +1181,7 @@
F083BB0E1E7009EC00A9B29C /* Assets */ = {
isa = PBXGroup;
children = (
32AE61EB1F0D2183007255F4 /* nl.lproj */,
F083BB0F1E7009EC00A9B29C /* InfoPlist.strings */,
F083BB111E7009EC00A9B29C /* Localizable.strings */,
F083BB131E7009EC00A9B29C /* Vector.strings */,
@@ -2033,6 +2050,7 @@
knownRegions = (
en,
Base,
nl,
);
mainGroup = F094A9991B78D8F000B1FBBF;
productRefGroup = F094A9A31B78D8F000B1FBBF /* Products */;
@@ -2111,6 +2129,7 @@
F083BD331E7009ED00A9B29C /* call_audio_mute_off_icon.png in Resources */,
F083BD691E7009ED00A9B29C /* directChatOn@2x.png in Resources */,
F083BD3E1E7009ED00A9B29C /* call_hangup_icon@3x.png in Resources */,
32AE61F21F0D2183007255F4 /* InfoPlist.strings in Resources */,
F083BDB91E7009ED00A9B29C /* remove_icon_pink.png in Resources */,
F083BE531E7009ED00A9B29C /* RoomOutgoingEncryptedTextMsgWithoutSenderInfoBubbleCell.xib in Resources */,
F083BD7F1E7009ED00A9B29C /* error@3x.png in Resources */,
@@ -2203,6 +2222,7 @@
F083BDCF1E7009ED00A9B29C /* selection_untick@2x.png in Resources */,
F083BDDF1E7009ED00A9B29C /* upload_icon@3x.png in Resources */,
F083BD6D1E7009ED00A9B29C /* disclosure_icon@3x.png in Resources */,
32AE61F31F0D2183007255F4 /* Localizable.strings in Resources */,
F083BDE61E7009ED00A9B29C /* busy.mp3 in Resources */,
F083BDD51E7009ED00A9B29C /* shrink_icon@2x.png in Resources */,
F083BD5D1E7009ED00A9B29C /* create_room@2x.png in Resources */,
@@ -2338,6 +2358,7 @@
F083BDCC1E7009ED00A9B29C /* selection_tick@2x.png in Resources */,
F083BD961E7009ED00A9B29C /* leave@2x.png in Resources */,
F0E05A461EA0F9EB004B83FB /* tab_rooms@2x.png in Resources */,
32AE61F41F0D2183007255F4 /* Vector.strings in Resources */,
F083BD851E7009ED00A9B29C /* favouriteOff@3x.png in Resources */,
F083BD541E7009ED00A9B29C /* camera_switch@2x.png in Resources */,
F083BD6A1E7009ED00A9B29C /* directChatOn@3x.png in Resources */,
@@ -2599,6 +2620,30 @@
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
32AE61EC1F0D2183007255F4 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
32AE61ED1F0D2183007255F4 /* nl */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
32AE61EE1F0D2183007255F4 /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
32AE61EF1F0D2183007255F4 /* nl */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
32AE61F01F0D2183007255F4 /* Vector.strings */ = {
isa = PBXVariantGroup;
children = (
32AE61F11F0D2183007255F4 /* nl */,
);
name = Vector.strings;
sourceTree = "<group>";
};
F083BB0F1E7009EC00A9B29C /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (