Skip to content

Commit

Permalink
Merge pull request #20 from devmynd/develop
Browse files Browse the repository at this point in the history 
Merge develop for 0.1.2
  • Loading branch information
@tycobbb
tycobbb authored Oct 28, 2016
2 parents cdc4884 + 12daf97 commit 2764b60
Show file tree
Hide file tree
Showing 17 changed files with 178 additions and 90 deletions.
12 changes: 12 additions & 0 deletions Harbor.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
31CEEC161D3826BD0023A5AC /* NSButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31CEEC151D3826BD0023A5AC /* NSButton.swift */; };
4C86D9FC1CE50142008E91E4 /* codeshipLogo_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 4C86D9FA1CE50142008E91E4 /* codeshipLogo_blue.png */; };
4C86D9FD1CE50142008E91E4 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 4C86D9FB1CE50142008E91E4 /* [email protected] */; };
721620151D401E4A00EE239C /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 721620141D401E4A00EE239C /* Credits.rtf */; };
CDD5638F36C28F1CBED22C30 /* Pods_Harbor_HarborTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EF75FA103814CE2B8C146C9 /* Pods_Harbor_HarborTests.framework */; };
D01093BC1BB5B3D7002D5794 /* SettingsSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01093BB1BB5B3D7002D5794 /* SettingsSpec.swift */; };
D01093BF1BB5D932002D5794 /* NotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01093BE1BB5D932002D5794 /* NotificationCenter.swift */; };
Expand Down Expand Up @@ -161,6 +162,7 @@
6A44CEAA7EBDF79EBEA74B01 /* Pods-Harbor-HarborTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Harbor-HarborTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Harbor-HarborTests/Pods-Harbor-HarborTests.release.xcconfig"; sourceTree = "<group>"; };
6AB17BFC533903194B2259FA /* Pods-HarborTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HarborTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-HarborTests/Pods-HarborTests.release.xcconfig"; sourceTree = "<group>"; };
7150961101FB11B6275D20F3 /* Pods_HarborTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HarborTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
721620141D401E4A00EE239C /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; };
9F06F0036A0C8CA9A3D11BA6 /* Pods-Harbor.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Harbor.release.xcconfig"; path = "Pods/Target Support Files/Pods-Harbor/Pods-Harbor.release.xcconfig"; sourceTree = "<group>"; };
C0CEA4AAFB6873D19A822129 /* Pods-Harbor.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Harbor.test.xcconfig"; path = "Pods/Target Support Files/Pods-Harbor/Pods-Harbor.test.xcconfig"; sourceTree = "<group>"; };
D01093BB1BB5B3D7002D5794 /* SettingsSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SettingsSpec.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
Expand Down Expand Up @@ -324,6 +326,14 @@
name = View;
sourceTree = "<group>";
};
721620101D401E0000EE239C /* Resources */ = {
isa = PBXGroup;
children = (
721620141D401E4A00EE239C /* Credits.rtf */,
);
name = Resources;
sourceTree = "<group>";
};
A338C7D8E749FE47B694D06D /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -441,6 +451,7 @@
D0772F0A1B3C437800031FB9 /* Harbor */ = {
isa = PBXGroup;
children = (
721620101D401E0000EE239C /* Resources */,
10FA200E1C933E1B00A642A7 /* Application.swift */,
D0772F0B1B3C437800031FB9 /* AppDelegate.swift */,
D08EAB3F1B98D5D5009564CE /* Views */,
Expand Down Expand Up @@ -655,6 +666,7 @@
4C86D9FD1CE50142008E91E4 /* [email protected] in Resources */,
D08EAB3B1B98A60A009564CE /* codeshipLogo_red.png in Resources */,
D08EAB391B98A60A009564CE /* codeshipLogo_green.png in Resources */,
721620151D401E4A00EE239C /* Credits.rtf in Resources */,
D08EAB321B97531A009564CE /* MainMenu.xib in Resources */,
D0B1777A1B9651BD0055ECC6 /* [email protected] in Resources */,
D0B177791B9651BD0055ECC6 /* codeshipLogo_black.png in Resources */,
Expand Down
4 changes: 2 additions & 2 deletions Harbor/BuildView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="BuildView" customModule="Harbor" customModuleProvider="target">
Expand Down
13 changes: 13 additions & 0 deletions Harbor/Credits.rtf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\margl1440\margr1440\vieww9000\viewh8400\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0

\f0\fs24 \cf0 Brought to you by your friends at {\field{\*\fldinst{HYPERLINK "http://devmynd.com"}}{\fldrslt DevMynd}} in Chicago and San Francisco.
\b \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\cf0 \
Contributors
\b0 : Erin Hochstatter, Ty Cobb, \
Michael Crismali, Joe Hirn, Ifu Aniemeka, Erick Arias & Eryan Cobham}
6 changes: 2 additions & 4 deletions Harbor/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1.1</string>
<string>0.1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>LSUIElement</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 DevMynd. All rights reserved.</string>
<string>Copyright © 2016 DevMynd. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Expand Down
Loading

0 comments on commit 2764b60

Please sign in to comment.