Skip to content

Commit

Permalink
Merge branch 'feature/FlarupDesign' into development
Browse files Browse the repository at this point in the history 
Conflicts:
	BeMyEyes.xcodeproj/project.pbxproj
	BeMyEyes/Base.lproj/Main.storyboard
  • Loading branch information
Tobias Due Munk committed Oct 5, 2014
2 parents b9a6a6e + bd39ff6 commit 6e967ce
Show file tree
Hide file tree
Showing 65 changed files with 1,893 additions and 567 deletions.
41 changes: 41 additions & 0 deletions BeMyEyes.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@

/* Begin PBXBuildFile section */
4E08EE7A19E1693200B45088 /* OpenTok.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E08EE7919E1693200B45088 /* OpenTok.framework */; };
4EB6AD1219E1F47A00141615 /* BMETaskTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6AD1119E1F47A00141615 /* BMETaskTableViewCell.m */; };
4EB6AD1719E1F48C00141615 /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6AD1419E1F48C00141615 /* GradientView.swift */; };
4EB6AD1819E1F48C00141615 /* PointsBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6AD1519E1F48C00141615 /* PointsBarView.swift */; };
4EB6AD1C19E1F4CD00141615 /* BMEUserLevel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6AD1B19E1F4CD00141615 /* BMEUserLevel.m */; };
4EB6AD1F19E1F4D700141615 /* BMECommunityStats.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6AD1E19E1F4D700141615 /* BMECommunityStats.m */; };
4EB6AD2219E1F4F400141615 /* BMEPointsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB6AD2119E1F4F400141615 /* BMEPointsTableViewCell.m */; };
7206A76118FA9BF000251824 /* BMEPointLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7206A76018FA9BF000251824 /* BMEPointLabel.m */; };
7206A76618FA9C0D00251824 /* BMEPointGraphEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 7206A76318FA9C0D00251824 /* BMEPointGraphEntry.m */; };
7206A76718FA9C0D00251824 /* BMEPointGraphView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7206A76518FA9C0D00251824 /* BMEPointGraphView.m */; };
Expand Down Expand Up @@ -119,6 +125,17 @@
/* Begin PBXFileReference section */
22A222A28C44403D94B34BA1 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
4E08EE7919E1693200B45088 /* OpenTok.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenTok.framework; path = "OpenTok-iOS-2.3.0/OpenTok.framework"; sourceTree = "<group>"; };
4EB6AD1019E1F47A00141615 /* BMETaskTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BMETaskTableViewCell.h; sourceTree = "<group>"; };
4EB6AD1119E1F47A00141615 /* BMETaskTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMETaskTableViewCell.m; sourceTree = "<group>"; };
4EB6AD1319E1F48B00141615 /* BeMyEyes-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "BeMyEyes-Bridging-Header.h"; path = "Views/BeMyEyes-Bridging-Header.h"; sourceTree = "<group>"; };
4EB6AD1419E1F48C00141615 /* GradientView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; };
4EB6AD1519E1F48C00141615 /* PointsBarView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PointsBarView.swift; sourceTree = "<group>"; };
4EB6AD1A19E1F4CD00141615 /* BMEUserLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BMEUserLevel.h; sourceTree = "<group>"; };
4EB6AD1B19E1F4CD00141615 /* BMEUserLevel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMEUserLevel.m; sourceTree = "<group>"; };
4EB6AD1D19E1F4D700141615 /* BMECommunityStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BMECommunityStats.h; sourceTree = "<group>"; };
4EB6AD1E19E1F4D700141615 /* BMECommunityStats.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMECommunityStats.m; sourceTree = "<group>"; };
4EB6AD2019E1F4F400141615 /* BMEPointsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BMEPointsTableViewCell.h; sourceTree = "<group>"; };
4EB6AD2119E1F4F400141615 /* BMEPointsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMEPointsTableViewCell.m; sourceTree = "<group>"; };
60BAD311403180811F795B70 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
7206A75F18FA9BF000251824 /* BMEPointLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BMEPointLabel.h; sourceTree = "<group>"; };
7206A76018FA9BF000251824 /* BMEPointLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BMEPointLabel.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -452,6 +469,7 @@
72DEF71518B907D10048FA90 /* Models */,
7236E03B18B8A9EA00F622AA /* Library */,
7236E03C18B8A9EA00F622AA /* Views */,
4EB6AD1319E1F48B00141615 /* BeMyEyes-Bridging-Header.h */,
72DEF72318B90A6D0048FA90 /* Other sources */,
);
path = Source;
Expand Down Expand Up @@ -562,6 +580,12 @@
7206A76518FA9C0D00251824 /* BMEPointGraphView.m */,
7206A75F18FA9BF000251824 /* BMEPointLabel.h */,
7206A76018FA9BF000251824 /* BMEPointLabel.m */,
4EB6AD1019E1F47A00141615 /* BMETaskTableViewCell.h */,
4EB6AD1119E1F47A00141615 /* BMETaskTableViewCell.m */,
4EB6AD2019E1F4F400141615 /* BMEPointsTableViewCell.h */,
4EB6AD2119E1F4F400141615 /* BMEPointsTableViewCell.m */,
4EB6AD1419E1F48C00141615 /* GradientView.swift */,
4EB6AD1519E1F48C00141615 /* PointsBarView.swift */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -606,10 +630,14 @@
72DEF71B18B907D10048FA90 /* BMEToken.m */,
72DEF71C18B907D10048FA90 /* BMEUser.h */,
72DEF71D18B907D10048FA90 /* BMEUser.m */,
4EB6AD1A19E1F4CD00141615 /* BMEUserLevel.h */,
4EB6AD1B19E1F4CD00141615 /* BMEUserLevel.m */,
72E65FAE18BA8214002FB2E0 /* BMEFacebookInfo.h */,
72E65FAF18BA8214002FB2E0 /* BMEFacebookInfo.m */,
726D7B91191AA21A005690B7 /* BMEPointEntry.h */,
726D7B92191AA21A005690B7 /* BMEPointEntry.m */,
4EB6AD1D19E1F4D700141615 /* BMECommunityStats.h */,
4EB6AD1E19E1F4D700141615 /* BMECommunityStats.m */,
);
path = Models;
sourceTree = "<group>";
Expand Down Expand Up @@ -788,6 +816,7 @@
7236E04718B8DBDF00F622AA /* BMESignUpMethodViewController.m in Sources */,
72E65FB018BA8214002FB2E0 /* BMEFacebookInfo.m in Sources */,
7236E00A18B8A87B00F622AA /* main.m in Sources */,
4EB6AD1219E1F47A00141615 /* BMETaskTableViewCell.m in Sources */,
72DEF72118B907D10048FA90 /* BMEUser.m in Sources */,
725B0EFB1959896600BB4AE0 /* BMECallAudioPlayer.m in Sources */,
72B1493D18DF6AE100E9A8A9 /* BMESpeaker.m in Sources */,
Expand All @@ -804,9 +833,13 @@
72DA826818D45B52001F3312 /* BMEHelperMainViewController.m in Sources */,
7236E04A18B8DD8E00F622AA /* BMESignUpViewController.m in Sources */,
7296569918CC8C3E00E1A9EE /* BMEMainViewController.m in Sources */,
4EB6AD1719E1F48C00141615 /* GradientView.swift in Sources */,
72A7676C19029F34003121C4 /* NSDate+BMESnoozeRelativeDate.m in Sources */,
7206A76118FA9BF000251824 /* BMEPointLabel.m in Sources */,
727E13E9194B2AF8002EDA7E /* BMEForgotPasswordViewController.m in Sources */,
4EB6AD1819E1F48C00141615 /* PointsBarView.swift in Sources */,
4EB6AD2219E1F4F400141615 /* BMEPointsTableViewCell.m in Sources */,
4EB6AD1F19E1F4D700141615 /* BMECommunityStats.m in Sources */,
72DEF73218B90A6D0048FA90 /* NSData+CommonCrypto.m in Sources */,
720A68DF192FD92F0036CB1E /* BMEWebViewViewController.m in Sources */,
721C3958193BA03400637F88 /* BMEEmailValidator.m in Sources */,
Expand All @@ -824,6 +857,7 @@
72DEF73318B90A6D0048FA90 /* NSString+Base64.m in Sources */,
72DEF71318B907CB0048FA90 /* BMEClient.m in Sources */,
72DEF71E18B907D10048FA90 /* BMEOpenTokSession.m in Sources */,
4EB6AD1C19E1F4CD00141615 /* BMEUserLevel.m in Sources */,
72DEF71F18B907D10048FA90 /* BMERequest.m in Sources */,
72DEF73118B90A6D0048FA90 /* NSData+Base64.m in Sources */,
72DEF71418B907CB0048FA90 /* BMERoleConverter.m in Sources */,
Expand Down Expand Up @@ -1139,6 +1173,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1149,9 +1184,12 @@
GCC_PREFIX_HEADER = "BeMyEyes/BeMyEyes-Prefix.pch";
INFOPLIST_FILE = "BeMyEyes/BeMyEyes-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "BeMyEyes/Source/Views/BeMyEyes-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app;
};
Expand All @@ -1165,6 +1203,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1175,9 +1214,11 @@
GCC_PREFIX_HEADER = "BeMyEyes/BeMyEyes-Prefix.pch";
INFOPLIST_FILE = "BeMyEyes/BeMyEyes-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "BeMyEyes/Source/Views/BeMyEyes-Bridging-Header.h";
VALID_ARCHS = armv7;
WRAPPER_EXTENSION = app;
};
Expand Down
Loading

0 comments on commit 6e967ce

Please sign in to comment.