Skip to content

Commit 4b64a10

Browse files
lsecreaselsecrease
committed
Merge pull request #4 from lsecrease/mafellows/development
Mafellows/development
2 parents 6d2d1ef + f11ff3a commit 4b64a10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4987
-2726
lines changed

‎Cluster.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
286563F21C0E8B6E00C21668 /* MyKlusterTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 286563F11C0E8B6E00C21668 /* MyKlusterTableViewCell.swift */; };
1212
287147851BFAEFB6007FDB36 /* NotificationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287147841BFAEFB6007FDB36 /* NotificationsViewController.swift */; };
1313
287147871BFAF00E007FDB36 /* NotificationsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287147861BFAF00E007FDB36 /* NotificationsTableViewCell.swift */; };
14-
28ADC5C61BF9350F001599D5 /* KlusterInviteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28ADC5C51BF9350F001599D5 /* KlusterInviteViewController.swift */; };
1514
28ADC5C81BF9385B001599D5 /* KlusterInviteTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28ADC5C71BF9385B001599D5 /* KlusterInviteTableViewCell.swift */; };
1615
28EE23431BDF1F83009161AE /* AsyncButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28EE23251BDF1F83009161AE /* AsyncButton.swift */; };
1716
28EE23441BDF1F83009161AE /* AsyncImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28EE23261BDF1F83009161AE /* AsyncImageView.swift */; };
@@ -58,10 +57,12 @@
5857
9D2EFA411BF6534400D91812 /* KlusterSearchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D2EFA401BF6534400D91812 /* KlusterSearchController.swift */; };
5958
9D63BB541C8DBD220094F5A2 /* MessagesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D63BB531C8DBD220094F5A2 /* MessagesNavigationController.swift */; };
6059
9D63BB561C8DD0570094F5A2 /* PopoverHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D63BB551C8DD0570094F5A2 /* PopoverHeaderView.swift */; };
60+
9D7097251C987AB600DF5C8E /* Invite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7097241C987AB600DF5C8E /* Invite.swift */; };
6161
9D7CC5AB1C7E7958002D21D0 /* MessageTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7CC5AA1C7E7958002D21D0 /* MessageTextView.swift */; };
6262
9D7CC5AD1C7E8EFB002D21D0 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7CC5AC1C7E8EFB002D21D0 /* Message.swift */; };
6363
9D807F7F1C90834600FA5768 /* BLMultiColorLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D807F7E1C90834600FA5768 /* BLMultiColorLoader.m */; };
6464
9D807F811C90B08D00FA5768 /* LocationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D807F801C90B08D00FA5768 /* LocationStore.swift */; };
65+
9D807F831C90FAC300FA5768 /* KlusterInviteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D807F821C90FAC300FA5768 /* KlusterInviteViewController.swift */; };
6566
9DAF9F871C87A3A2000B8586 /* ProfileNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DAF9F861C87A3A2000B8586 /* ProfileNameView.swift */; };
6667
9DAF9F8C1C89E022000B8586 /* CAPSPageMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DAF9F8B1C89E022000B8586 /* CAPSPageMenu.swift */; };
6768
9DAF9F8E1C89E7A4000B8586 /* Profile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9DAF9F8D1C89E7A4000B8586 /* Profile.storyboard */; };
@@ -120,7 +121,6 @@
120121
286563F11C0E8B6E00C21668 /* MyKlusterTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyKlusterTableViewCell.swift; sourceTree = "<group>"; };
121122
287147841BFAEFB6007FDB36 /* NotificationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationsViewController.swift; sourceTree = "<group>"; };
122123
287147861BFAF00E007FDB36 /* NotificationsTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationsTableViewCell.swift; sourceTree = "<group>"; };
123-
28ADC5C51BF9350F001599D5 /* KlusterInviteViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterInviteViewController.swift; sourceTree = "<group>"; };
124124
28ADC5C71BF9385B001599D5 /* KlusterInviteTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterInviteTableViewCell.swift; sourceTree = "<group>"; };
125125
28EE23251BDF1F83009161AE /* AsyncButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncButton.swift; sourceTree = "<group>"; };
126126
28EE23261BDF1F83009161AE /* AsyncImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncImageView.swift; sourceTree = "<group>"; };
@@ -169,11 +169,13 @@
169169
9D2EFA401BF6534400D91812 /* KlusterSearchController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterSearchController.swift; sourceTree = "<group>"; };
170170
9D63BB531C8DBD220094F5A2 /* MessagesNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessagesNavigationController.swift; sourceTree = "<group>"; };
171171
9D63BB551C8DD0570094F5A2 /* PopoverHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopoverHeaderView.swift; sourceTree = "<group>"; };
172+
9D7097241C987AB600DF5C8E /* Invite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Invite.swift; sourceTree = "<group>"; };
172173
9D7CC5AA1C7E7958002D21D0 /* MessageTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageTextView.swift; sourceTree = "<group>"; };
173174
9D7CC5AC1C7E8EFB002D21D0 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
174175
9D807F7D1C90834600FA5768 /* BLMultiColorLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BLMultiColorLoader.h; sourceTree = "<group>"; };
175176
9D807F7E1C90834600FA5768 /* BLMultiColorLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BLMultiColorLoader.m; sourceTree = "<group>"; };
176177
9D807F801C90B08D00FA5768 /* LocationStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationStore.swift; sourceTree = "<group>"; };
178+
9D807F821C90FAC300FA5768 /* KlusterInviteViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterInviteViewController.swift; sourceTree = "<group>"; };
177179
9DAF9F861C87A3A2000B8586 /* ProfileNameView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileNameView.swift; sourceTree = "<group>"; };
178180
9DAF9F8B1C89E022000B8586 /* CAPSPageMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CAPSPageMenu.swift; sourceTree = "<group>"; };
179181
9DAF9F8D1C89E7A4000B8586 /* Profile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Profile.storyboard; sourceTree = "<group>"; };
@@ -259,7 +261,6 @@
259261
isa = PBXGroup;
260262
children = (
261263
CEFEBF491BDC9CB500E4070D /* NewKlusterViewController.swift */,
262-
28ADC5C51BF9350F001599D5 /* KlusterInviteViewController.swift */,
263264
28ADC5C71BF9385B001599D5 /* KlusterInviteTableViewCell.swift */,
264265
);
265266
name = "New Kluster Screens";
@@ -373,6 +374,7 @@
373374
9DEFE5D81C73E5FB005B3B1A /* Controllers */ = {
374375
isa = PBXGroup;
375376
children = (
377+
9D807F821C90FAC300FA5768 /* KlusterInviteViewController.swift */,
376378
);
377379
name = Controllers;
378380
sourceTree = "<group>";
@@ -383,6 +385,7 @@
383385
9D7CC5AC1C7E8EFB002D21D0 /* Message.swift */,
384386
9DFB7D611C86211C00EF3E62 /* KlusterStore.swift */,
385387
9D807F801C90B08D00FA5768 /* LocationStore.swift */,
388+
9D7097241C987AB600DF5C8E /* Invite.swift */,
386389
);
387390
name = Models;
388391
sourceTree = "<group>";
@@ -710,6 +713,7 @@
710713
28EE234B1BDF1F83009161AE /* DesignableTextField.swift in Sources */,
711714
28EE23711BDF1FF9009161AE /* ImagePreviewFlowLayout.swift in Sources */,
712715
28EE23511BDF1F83009161AE /* LoadingView.swift in Sources */,
716+
9D7097251C987AB600DF5C8E /* Invite.swift in Sources */,
713717
287147871BFAF00E007FDB36 /* NotificationsTableViewCell.swift in Sources */,
714718
CE0413501BD88B8300BED627 /* MembersTableViewController.swift in Sources */,
715719
28EE234A1BDF1F83009161AE /* DesignableTabBarController.swift in Sources */,
@@ -730,6 +734,7 @@
730734
9D807F7F1C90834600FA5768 /* BLMultiColorLoader.m in Sources */,
731735
9DBA24721BE2B26D005D6AD6 /* LoginViewController.swift in Sources */,
732736
28EE234E1BDF1F83009161AE /* ImageLoader.swift in Sources */,
737+
9D807F831C90FAC300FA5768 /* KlusterInviteViewController.swift in Sources */,
733738
CEA8EA321B854B7F00DC2AA5 /* HomeViewController.swift in Sources */,
734739
28EE23501BDF1F83009161AE /* KeyboardLayoutConstraint.swift in Sources */,
735740
28EE23551BDF1F83009161AE /* Spring.swift in Sources */,
@@ -750,7 +755,6 @@
750755
28EE236E1BDF1FF9009161AE /* ImageCollectionViewCell.swift in Sources */,
751756
28EE235E1BDF1F83009161AE /* TransitionZoom.swift in Sources */,
752757
9DAF9F8C1C89E022000B8586 /* CAPSPageMenu.swift in Sources */,
753-
28ADC5C61BF9350F001599D5 /* KlusterInviteViewController.swift in Sources */,
754758
9D7CC5AD1C7E8EFB002D21D0 /* Message.swift in Sources */,
755759
28EE23481BDF1F83009161AE /* DesignableImageView.swift in Sources */,
756760
9DBA24701BE152F3005D6AD6 /* MembersTableViewCell.swift in Sources */,

‎Cluster/.DS_Store‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)