Skip to content

Commit

Permalink
Merge pull request #56 from vineetchoudhary/development
Browse files Browse the repository at this point in the history 
Bug Fixes
  • Loading branch information
@vineetchoudhary
vineetchoudhary authored Feb 13, 2017
2 parents 746d612 + 6ffe64c commit 48e70e5
Show file tree
Hide file tree
Showing 28 changed files with 842 additions and 95 deletions.
50 changes: 50 additions & 0 deletions AppBox.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@
E1AA0F441E2F328300BA81A1 /* QRCodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E1AA0F431E2F328300BA81A1 /* QRCodeViewController.m */; };
E1AA0F481E2F94F700BA81A1 /* WindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = E1AA0F471E2F94F700BA81A1 /* WindowController.m */; };
E1CFC65E1D7E7FEA005872BE /* Common.m in Sources */ = {isa = PBXBuildFile; fileRef = E1CFC65D1D7E7FEA005872BE /* Common.m */; };
E1D479C41E4AE4BC00BBC838 /* GitRepoDetails.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479C31E4AE4BC00BBC838 /* GitRepoDetails.m */; };
E1D479D11E4B04A500BBC838 /* Project+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479C61E4B04A500BBC838 /* Project+CoreDataClass.m */; };
E1D479D21E4B04A500BBC838 /* Project+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479C81E4B04A500BBC838 /* Project+CoreDataProperties.m */; };
E1D479D31E4B04A500BBC838 /* UploadRecord+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479CA1E4B04A500BBC838 /* UploadRecord+CoreDataClass.m */; };
E1D479D41E4B04A500BBC838 /* UploadRecord+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479CC1E4B04A500BBC838 /* UploadRecord+CoreDataProperties.m */; };
E1D479D51E4B04A500BBC838 /* CISetting+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479CE1E4B04A500BBC838 /* CISetting+CoreDataClass.m */; };
E1D479D61E4B04A500BBC838 /* CISetting+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = E1D479D01E4B04A500BBC838 /* CISetting+CoreDataProperties.m */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand Down Expand Up @@ -138,6 +145,20 @@
E1AF8FD71E266CC000A57633 /* DropboxKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DropboxKeys.h; sourceTree = "<group>"; };
E1CFC65C1D7E7FEA005872BE /* Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
E1CFC65D1D7E7FEA005872BE /* Common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Common.m; sourceTree = "<group>"; };
E1D479C21E4AE4BC00BBC838 /* GitRepoDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitRepoDetails.h; sourceTree = "<group>"; };
E1D479C31E4AE4BC00BBC838 /* GitRepoDetails.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GitRepoDetails.m; sourceTree = "<group>"; };
E1D479C51E4B04A500BBC838 /* Project+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Project+CoreDataClass.h"; sourceTree = "<group>"; };
E1D479C61E4B04A500BBC838 /* Project+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Project+CoreDataClass.m"; sourceTree = "<group>"; };
E1D479C71E4B04A500BBC838 /* Project+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Project+CoreDataProperties.h"; sourceTree = "<group>"; };
E1D479C81E4B04A500BBC838 /* Project+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Project+CoreDataProperties.m"; sourceTree = "<group>"; };
E1D479C91E4B04A500BBC838 /* UploadRecord+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UploadRecord+CoreDataClass.h"; sourceTree = "<group>"; };
E1D479CA1E4B04A500BBC838 /* UploadRecord+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UploadRecord+CoreDataClass.m"; sourceTree = "<group>"; };
E1D479CB1E4B04A500BBC838 /* UploadRecord+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UploadRecord+CoreDataProperties.h"; sourceTree = "<group>"; };
E1D479CC1E4B04A500BBC838 /* UploadRecord+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UploadRecord+CoreDataProperties.m"; sourceTree = "<group>"; };
E1D479CD1E4B04A500BBC838 /* CISetting+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CISetting+CoreDataClass.h"; sourceTree = "<group>"; };
E1D479CE1E4B04A500BBC838 /* CISetting+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CISetting+CoreDataClass.m"; sourceTree = "<group>"; };
E1D479CF1E4B04A500BBC838 /* CISetting+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CISetting+CoreDataProperties.h"; sourceTree = "<group>"; };
E1D479D01E4B04A500BBC838 /* CISetting+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CISetting+CoreDataProperties.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -177,6 +198,25 @@
path = ALOutputParser;
sourceTree = "<group>";
};
E12A9AAA1E49F360002DDA3C /* CoreDataModel */ = {
isa = PBXGroup;
children = (
E1D479C51E4B04A500BBC838 /* Project+CoreDataClass.h */,
E1D479C61E4B04A500BBC838 /* Project+CoreDataClass.m */,
E1D479C71E4B04A500BBC838 /* Project+CoreDataProperties.h */,
E1D479C81E4B04A500BBC838 /* Project+CoreDataProperties.m */,
E1D479C91E4B04A500BBC838 /* UploadRecord+CoreDataClass.h */,
E1D479CA1E4B04A500BBC838 /* UploadRecord+CoreDataClass.m */,
E1D479CB1E4B04A500BBC838 /* UploadRecord+CoreDataProperties.h */,
E1D479CC1E4B04A500BBC838 /* UploadRecord+CoreDataProperties.m */,
E1D479CD1E4B04A500BBC838 /* CISetting+CoreDataClass.h */,
E1D479CE1E4B04A500BBC838 /* CISetting+CoreDataClass.m */,
E1D479CF1E4B04A500BBC838 /* CISetting+CoreDataProperties.h */,
E1D479D01E4B04A500BBC838 /* CISetting+CoreDataProperties.m */,
);
path = CoreDataModel;
sourceTree = "<group>";
};
E12E6D061D8FC6E20054814D /* DashboardViewController */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -297,6 +337,7 @@
isa = PBXGroup;
children = (
E139460F1DF2AFC200B3FAD0 /* ProjectModel */,
E12A9AAA1E49F360002DDA3C /* CoreDataModel */,
E16437DB1D743A4E00CE8B7E /* AppBox.xcdatamodeld */,
);
path = Model;
Expand Down Expand Up @@ -407,6 +448,8 @@
children = (
E1902B551E16619800C3E0F6 /* GitHandler.h */,
E1902B561E16619800C3E0F6 /* GitHandler.m */,
E1D479C21E4AE4BC00BBC838 /* GitRepoDetails.h */,
E1D479C31E4AE4BC00BBC838 /* GitRepoDetails.m */,
);
path = GitHandler;
sourceTree = "<group>";
Expand Down Expand Up @@ -653,24 +696,31 @@
E119EF671E3764C600A7798E /* ALOutput.m in Sources */,
E16018F01DEC0BC200E3A377 /* DropboxViewController.m in Sources */,
E16437D41D743A4E00CE8B7E /* AppDelegate.m in Sources */,
E1D479C41E4AE4BC00BBC838 /* GitRepoDetails.m in Sources */,
E1902B571E16619800C3E0F6 /* GitHandler.m in Sources */,
E16724601E1D2AE000346502 /* CIViewController.m in Sources */,
E1902B531E16617B00C3E0F6 /* NetworkHandler.m in Sources */,
E1D479D61E4B04A500BBC838 /* CISetting+CoreDataProperties.m in Sources */,
E18DCB171DFE729300BD7F11 /* MailViewController.m in Sources */,
E1902B5A1E1661A300C3E0F6 /* MacHandler.m in Sources */,
E1CFC65E1D7E7FEA005872BE /* Common.m in Sources */,
E1D479D21E4B04A500BBC838 /* Project+CoreDataProperties.m in Sources */,
E12E6D0A1D8FC77D0054814D /* DashboardViewController.m in Sources */,
E15C266A1D7FD5CE004243B9 /* ShowLinkViewController.m in Sources */,
E1902B601E1661BE00C3E0F6 /* UpdateHandler.m in Sources */,
E14F33341E1A64CA00C3DD34 /* NSApplication+MenuHandler.m in Sources */,
E13946121DF2AFCF00B3FAD0 /* XCProject.m in Sources */,
E188EA111D78485900EBCA52 /* GooglURLShortenerService.m in Sources */,
E1D479D11E4B04A500BBC838 /* Project+CoreDataClass.m in Sources */,
E16437F31D743B6800CE8B7E /* HomeViewController.m in Sources */,
E1AA0F441E2F328300BA81A1 /* QRCodeViewController.m in Sources */,
E1902B641E16633A00C3E0F6 /* KeychainHandler.m in Sources */,
E1902B5D1E1661B300C3E0F6 /* MailHandler.m in Sources */,
E143637B1DF59AFD00FB10CA /* LogViewController.m in Sources */,
E1D479D51E4B04A500BBC838 /* CISetting+CoreDataClass.m in Sources */,
E1D479D41E4B04A500BBC838 /* UploadRecord+CoreDataProperties.m in Sources */,
E188EA101D78485900EBCA52 /* BitlyURLShortenerService.m in Sources */,
E1D479D31E4B04A500BBC838 /* UploadRecord+CoreDataClass.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
42 changes: 37 additions & 5 deletions AppBox/AppBox.xcdatamodeld/AppBox.xcdatamodel/contents
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="10174" systemVersion="15F34" minimumToolsVersion="Automatic">
<entity name="App" syncable="YES">
<attribute name="build" optional="YES" attributeType="String" syncable="YES"/>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11759" systemVersion="16C67" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
<entity name="CISetting" representedClassName="CISetting" syncable="YES">
<attribute name="branchName" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="buildScheme" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="buildType" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="emailAddress" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="keepSameLink" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
<attribute name="personalMessage" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="shutdownMac" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
<attribute name="teamId" optional="YES" attributeType="String" syncable="YES"/>
</entity>
<entity name="Project" representedClassName="Project" syncable="YES">
<attribute name="bundleIdentifier" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dropboxDirectory" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="projectPath" optional="YES" attributeType="String" syncable="YES"/>
<relationship name="ciSettings" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="CISetting" syncable="YES"/>
<relationship name="uploadRecords" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="UploadRecord" syncable="YES"/>
</entity>
<entity name="UploadRecord" representedClassName="UploadRecord" syncable="YES">
<attribute name="build" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="buildScheme" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="buildType" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="datetime" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
<attribute name="dbAppInfoFullPath" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dbDirectroy" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dbFolderName" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dbIPAFullPath" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dbManifestFullPath" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dbSharedAppInfoURL" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dbSharedIPAURL" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="dbSharedManifestURL" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="keepSameLink" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
<attribute name="localBuildPath" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="mailURL" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="shortURL" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="teamId" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="version" optional="YES" attributeType="String" syncable="YES"/>
</entity>
<elements>
<element name="App" positionX="-63" positionY="-27" width="128" height="118"/>
<element name="CISetting" positionX="-11729" positionY="-2647" width="128" height="165"/>
<element name="Project" positionX="-11927" positionY="-2592" width="128" height="120"/>
<element name="UploadRecord" positionX="-12098" positionY="-2758" width="128" height="315"/>
</elements>
</model>
1 change: 1 addition & 0 deletions AppBox/AppDelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
-(void)addSessionLog:(NSString *)sessionLog;

@property (nonatomic) BOOL processing;
@property (nonatomic) BOOL isInternetConnected;
@property (nonatomic, weak) IBOutlet NSMenuItem *gmailLogoutButton;
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxLogoutButton;
@property (nonatomic, weak) IBOutlet NSMenuItem *dropboxSpaceButton;
Expand Down
Loading

0 comments on commit 48e70e5

Please sign in to comment.