Skip to content

Mafellows/development #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lsecrease merged 3 commits into from
Mar 24, 2016
Merged

Mafellows/development #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13beac2
Show basic invites
mafellows Mar 15, 2016
083eeb9
Merge branch 'master' into mafellows/development
mafellows Mar 15, 2016
f11ff3a
Added empty dataset views
mafellows Mar 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Cluster.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
286563F21C0E8B6E00C21668 /* MyKlusterTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 286563F11C0E8B6E00C21668 /* MyKlusterTableViewCell.swift */; };
287147851BFAEFB6007FDB36 /* NotificationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287147841BFAEFB6007FDB36 /* NotificationsViewController.swift */; };
287147871BFAF00E007FDB36 /* NotificationsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287147861BFAF00E007FDB36 /* NotificationsTableViewCell.swift */; };
28ADC5C61BF9350F001599D5 /* KlusterInviteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28ADC5C51BF9350F001599D5 /* KlusterInviteViewController.swift */; };
28ADC5C81BF9385B001599D5 /* KlusterInviteTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28ADC5C71BF9385B001599D5 /* KlusterInviteTableViewCell.swift */; };
28EE23431BDF1F83009161AE /* AsyncButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28EE23251BDF1F83009161AE /* AsyncButton.swift */; };
28EE23441BDF1F83009161AE /* AsyncImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28EE23261BDF1F83009161AE /* AsyncImageView.swift */; };
Expand Down Expand Up @@ -58,10 +57,12 @@
9D2EFA411BF6534400D91812 /* KlusterSearchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D2EFA401BF6534400D91812 /* KlusterSearchController.swift */; };
9D63BB541C8DBD220094F5A2 /* MessagesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D63BB531C8DBD220094F5A2 /* MessagesNavigationController.swift */; };
9D63BB561C8DD0570094F5A2 /* PopoverHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D63BB551C8DD0570094F5A2 /* PopoverHeaderView.swift */; };
9D7097251C987AB600DF5C8E /* Invite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7097241C987AB600DF5C8E /* Invite.swift */; };
9D7CC5AB1C7E7958002D21D0 /* MessageTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7CC5AA1C7E7958002D21D0 /* MessageTextView.swift */; };
9D7CC5AD1C7E8EFB002D21D0 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D7CC5AC1C7E8EFB002D21D0 /* Message.swift */; };
9D807F7F1C90834600FA5768 /* BLMultiColorLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D807F7E1C90834600FA5768 /* BLMultiColorLoader.m */; };
9D807F811C90B08D00FA5768 /* LocationStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D807F801C90B08D00FA5768 /* LocationStore.swift */; };
9D807F831C90FAC300FA5768 /* KlusterInviteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D807F821C90FAC300FA5768 /* KlusterInviteViewController.swift */; };
9DAF9F871C87A3A2000B8586 /* ProfileNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DAF9F861C87A3A2000B8586 /* ProfileNameView.swift */; };
9DAF9F8C1C89E022000B8586 /* CAPSPageMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DAF9F8B1C89E022000B8586 /* CAPSPageMenu.swift */; };
9DAF9F8E1C89E7A4000B8586 /* Profile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9DAF9F8D1C89E7A4000B8586 /* Profile.storyboard */; };
Expand Down Expand Up @@ -120,7 +121,6 @@
286563F11C0E8B6E00C21668 /* MyKlusterTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyKlusterTableViewCell.swift; sourceTree = "<group>"; };
287147841BFAEFB6007FDB36 /* NotificationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationsViewController.swift; sourceTree = "<group>"; };
287147861BFAF00E007FDB36 /* NotificationsTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationsTableViewCell.swift; sourceTree = "<group>"; };
28ADC5C51BF9350F001599D5 /* KlusterInviteViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterInviteViewController.swift; sourceTree = "<group>"; };
28ADC5C71BF9385B001599D5 /* KlusterInviteTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterInviteTableViewCell.swift; sourceTree = "<group>"; };
28EE23251BDF1F83009161AE /* AsyncButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncButton.swift; sourceTree = "<group>"; };
28EE23261BDF1F83009161AE /* AsyncImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncImageView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -169,11 +169,13 @@
9D2EFA401BF6534400D91812 /* KlusterSearchController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterSearchController.swift; sourceTree = "<group>"; };
9D63BB531C8DBD220094F5A2 /* MessagesNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessagesNavigationController.swift; sourceTree = "<group>"; };
9D63BB551C8DD0570094F5A2 /* PopoverHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopoverHeaderView.swift; sourceTree = "<group>"; };
9D7097241C987AB600DF5C8E /* Invite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Invite.swift; sourceTree = "<group>"; };
9D7CC5AA1C7E7958002D21D0 /* MessageTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageTextView.swift; sourceTree = "<group>"; };
9D7CC5AC1C7E8EFB002D21D0 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
9D807F7D1C90834600FA5768 /* BLMultiColorLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BLMultiColorLoader.h; sourceTree = "<group>"; };
9D807F7E1C90834600FA5768 /* BLMultiColorLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BLMultiColorLoader.m; sourceTree = "<group>"; };
9D807F801C90B08D00FA5768 /* LocationStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationStore.swift; sourceTree = "<group>"; };
9D807F821C90FAC300FA5768 /* KlusterInviteViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KlusterInviteViewController.swift; sourceTree = "<group>"; };
9DAF9F861C87A3A2000B8586 /* ProfileNameView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileNameView.swift; sourceTree = "<group>"; };
9DAF9F8B1C89E022000B8586 /* CAPSPageMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CAPSPageMenu.swift; sourceTree = "<group>"; };
9DAF9F8D1C89E7A4000B8586 /* Profile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Profile.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -259,7 +261,6 @@
isa = PBXGroup;
children = (
CEFEBF491BDC9CB500E4070D /* NewKlusterViewController.swift */,
28ADC5C51BF9350F001599D5 /* KlusterInviteViewController.swift */,
28ADC5C71BF9385B001599D5 /* KlusterInviteTableViewCell.swift */,
);
name = "New Kluster Screens";
Expand Down Expand Up @@ -373,6 +374,7 @@
9DEFE5D81C73E5FB005B3B1A /* Controllers */ = {
isa = PBXGroup;
children = (
9D807F821C90FAC300FA5768 /* KlusterInviteViewController.swift */,
);
name = Controllers;
sourceTree = "<group>";
Expand All @@ -383,6 +385,7 @@
9D7CC5AC1C7E8EFB002D21D0 /* Message.swift */,
9DFB7D611C86211C00EF3E62 /* KlusterStore.swift */,
9D807F801C90B08D00FA5768 /* LocationStore.swift */,
9D7097241C987AB600DF5C8E /* Invite.swift */,
);
name = Models;
sourceTree = "<group>";
Expand Down Expand Up @@ -710,6 +713,7 @@
28EE234B1BDF1F83009161AE /* DesignableTextField.swift in Sources */,
28EE23711BDF1FF9009161AE /* ImagePreviewFlowLayout.swift in Sources */,
28EE23511BDF1F83009161AE /* LoadingView.swift in Sources */,
9D7097251C987AB600DF5C8E /* Invite.swift in Sources */,
287147871BFAF00E007FDB36 /* NotificationsTableViewCell.swift in Sources */,
CE0413501BD88B8300BED627 /* MembersTableViewController.swift in Sources */,
28EE234A1BDF1F83009161AE /* DesignableTabBarController.swift in Sources */,
Expand All @@ -730,6 +734,7 @@
9D807F7F1C90834600FA5768 /* BLMultiColorLoader.m in Sources */,
9DBA24721BE2B26D005D6AD6 /* LoginViewController.swift in Sources */,
28EE234E1BDF1F83009161AE /* ImageLoader.swift in Sources */,
9D807F831C90FAC300FA5768 /* KlusterInviteViewController.swift in Sources */,
CEA8EA321B854B7F00DC2AA5 /* HomeViewController.swift in Sources */,
28EE23501BDF1F83009161AE /* KeyboardLayoutConstraint.swift in Sources */,
28EE23551BDF1F83009161AE /* Spring.swift in Sources */,
Expand All @@ -750,7 +755,6 @@
28EE236E1BDF1FF9009161AE /* ImageCollectionViewCell.swift in Sources */,
28EE235E1BDF1F83009161AE /* TransitionZoom.swift in Sources */,
9DAF9F8C1C89E022000B8586 /* CAPSPageMenu.swift in Sources */,
28ADC5C61BF9350F001599D5 /* KlusterInviteViewController.swift in Sources */,
9D7CC5AD1C7E8EFB002D21D0 /* Message.swift in Sources */,
28EE23481BDF1F83009161AE /* DesignableImageView.swift in Sources */,
9DBA24701BE152F3005D6AD6 /* MembersTableViewCell.swift in Sources */,
Expand Down
Binary file modified Cluster/.DS_Store
View file
Open in desktop
Binary file not shown.
Loading