From 6ce9112bc7657ff03c3d161f3571e506f0d4efc3 Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Fri, 15 Jul 2016 11:03:19 +0200 Subject: [PATCH 01/14] cobaltians/cobalt#106: apply last Cobalt-iOS update to Catalog --- .gitignore | 2 ++ Catalog/www/platform | 2 +- Cobalt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 48765bd..806175c 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,5 @@ DerivedData Carthage/Build +## webstorm and idea IDE +.idea \ No newline at end of file diff --git a/Catalog/www/platform b/Catalog/www/platform index e1630f5..a565732 160000 --- a/Catalog/www/platform +++ b/Catalog/www/platform @@ -1 +1 @@ -Subproject commit e1630f5d3a2d4585bf5f214dd75a4870855da6c1 +Subproject commit a56573274d57394f7352c9d1908208f908fc6a00 diff --git a/Cobalt b/Cobalt index 1ccda8b..1da9dd7 160000 --- a/Cobalt +++ b/Cobalt @@ -1 +1 @@ -Subproject commit 1ccda8b4e54b47634e6b5dfbcbb67a44edb51a38 +Subproject commit 1da9dd7cfc97350f6605ab380055759ff3a0a13c From df9200948084a3d368eb7fcc75b5536e4adb2f7a Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Fri, 15 Jul 2016 11:04:26 +0200 Subject: [PATCH 02/14] cobaltians/cobalt#82 using web issue-82 branch --- Catalog/www/platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Catalog/www/platform b/Catalog/www/platform index a565732..24d3a96 160000 --- a/Catalog/www/platform +++ b/Catalog/www/platform @@ -1 +1 @@ -Subproject commit a56573274d57394f7352c9d1908208f908fc6a00 +Subproject commit 24d3a96e2bda191e1ee1d26cd2b22a4d5bb87200 From e8a8429f732306f270a4450fba4fbb52d3bd803b Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Fri, 15 Jul 2016 11:28:31 +0200 Subject: [PATCH 03/14] update to latest cobalt.js --- Catalog/www/platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Catalog/www/platform b/Catalog/www/platform index 24d3a96..6501f13 160000 --- a/Catalog/www/platform +++ b/Catalog/www/platform @@ -1 +1 @@ -Subproject commit 24d3a96e2bda191e1ee1d26cd2b22a4d5bb87200 +Subproject commit 6501f13f2405649ee1ded0d28288a7556ccd6f16 From fdf551c5723a2f3ae467437c9c0378c2e55e4db2 Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Wed, 20 Jul 2016 11:08:43 +0200 Subject: [PATCH 04/14] removing pdf plugin (wrong url) --- .gitmodules | 4 ---- PdfPlugin | 1 - 2 files changed, 5 deletions(-) delete mode 160000 PdfPlugin diff --git a/.gitmodules b/.gitmodules index b71941c..a51a282 100644 --- a/.gitmodules +++ b/.gitmodules @@ -76,10 +76,6 @@ path = Catalog/www/SharePlugin url = git://github.com/Cobaltians-Plugins/Plugins-Share-Web.git branch = develop -[submodule "PdfPlugin"] - path = PdfPlugin - url = git@github.com:Cobaltians-Plugins/Plugins-Pdf-iOS.git - branch = develop [submodule "Catalog/www/PdfPlugin"] path = Catalog/www/PdfPlugin url = git@github.com:Cobaltians-Plugins/Plugins-Pdf-Web.git diff --git a/PdfPlugin b/PdfPlugin deleted file mode 160000 index 587de75..0000000 --- a/PdfPlugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 587de7504eeb387c577aa42ad98766f14b9e3b39 From 07878ccf3f6aa8f23b1925cd5c7e0219905bb620 Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Wed, 20 Jul 2016 11:10:46 +0200 Subject: [PATCH 05/14] adding back pdf plugin (good url) --- .gitmodules | 4 ++++ PdfPlugin | 1 + 2 files changed, 5 insertions(+) create mode 160000 PdfPlugin diff --git a/.gitmodules b/.gitmodules index a51a282..033d494 100644 --- a/.gitmodules +++ b/.gitmodules @@ -80,3 +80,7 @@ path = Catalog/www/PdfPlugin url = git@github.com:Cobaltians-Plugins/Plugins-Pdf-Web.git branch = develop +[submodule "PdfPlugin"] + path = PdfPlugin + url = https://github.com/Cobaltians-Plugins/Plugins-Pdf-iOS.git + branch = develop diff --git a/PdfPlugin b/PdfPlugin new file mode 160000 index 0000000..587de75 --- /dev/null +++ b/PdfPlugin @@ -0,0 +1 @@ +Subproject commit 587de7504eeb387c577aa42ad98766f14b9e3b39 From d6dcb0919c3d822017f4406514459c5a431feb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vitard?= Date: Thu, 21 Jul 2016 16:42:03 +0200 Subject: [PATCH 06/14] update to last cobalt rev --- Cobalt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cobalt b/Cobalt index 1da9dd7..adc7b42 160000 --- a/Cobalt +++ b/Cobalt @@ -1 +1 @@ -Subproject commit 1da9dd7cfc97350f6605ab380055759ff3a0a13c +Subproject commit adc7b423ff8cceb0b3cf4ab79fb9aa7ea9f32a4d From 347b1235529add8e43dd394f473f90ac35857e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vitard?= Date: Mon, 8 Aug 2016 12:33:47 +0200 Subject: [PATCH 07/14] cobaltians/cobalt#82: apply Cobalt-iOS on Catalog --- Cobalt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cobalt b/Cobalt index 1da9dd7..5dabbaa 160000 --- a/Cobalt +++ b/Cobalt @@ -1 +1 @@ -Subproject commit 1da9dd7cfc97350f6605ab380055759ff3a0a13c +Subproject commit 5dabbaac1abf74f6e383289872c2860e029951ba From 659648b906f4ebc983655655cb6ff105270d4560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vitard?= Date: Mon, 8 Aug 2016 14:03:56 +0200 Subject: [PATCH 08/14] update Catalog iOS with the fixed font --- Fonts-FontAwesome-iOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fonts-FontAwesome-iOS b/Fonts-FontAwesome-iOS index 9c35ede..de49485 160000 --- a/Fonts-FontAwesome-iOS +++ b/Fonts-FontAwesome-iOS @@ -1 +1 @@ -Subproject commit 9c35ede7ffaaff800447dd87da45f9b337778e69 +Subproject commit de49485909c71ea499d1ef80cba045277ac65afe From 6f6857479ebdd109240da069c05083d9a7e9b4c7 Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Wed, 17 Aug 2016 08:38:53 +0200 Subject: [PATCH 09/14] update sample to latest cobalt.js from develop (how now has no more ios6 support) --- Catalog/www/platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Catalog/www/platform b/Catalog/www/platform index 6501f13..e20fdca 160000 --- a/Catalog/www/platform +++ b/Catalog/www/platform @@ -1 +1 @@ -Subproject commit 6501f13f2405649ee1ded0d28288a7556ccd6f16 +Subproject commit e20fdca9b7fb4ed16da92cf4a756c7c664bd9f11 From d38d23d740fab4153812e0b2ec683c20d084bb41 Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Wed, 17 Aug 2016 08:45:15 +0200 Subject: [PATCH 10/14] updating to latest cobalt.js --- Catalog/www/platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Catalog/www/platform b/Catalog/www/platform index e1630f5..e20fdca 160000 --- a/Catalog/www/platform +++ b/Catalog/www/platform @@ -1 +1 @@ -Subproject commit e1630f5d3a2d4585bf5f214dd75a4870855da6c1 +Subproject commit e20fdca9b7fb4ed16da92cf4a756c7c664bd9f11 From c40b97d3dae56e8aec957ca4dea7cbcc895d7355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vitard?= Date: Tue, 23 Aug 2016 17:27:21 +0200 Subject: [PATCH 11/14] update Cobalt iOS --- Catalog.xcodeproj/project.pbxproj | 77 +++++++++++++++---------------- Cobalt | 2 +- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Catalog.xcodeproj/project.pbxproj b/Catalog.xcodeproj/project.pbxproj index 34556e4..d3e0acd 100755 --- a/Catalog.xcodeproj/project.pbxproj +++ b/Catalog.xcodeproj/project.pbxproj @@ -55,15 +55,14 @@ BE1ABCF11B70F9C40070657C /* PubSubPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1ABCEE1B70F9C40070657C /* PubSubPlugin.m */; }; BE1ABCF21B70F9C40070657C /* PubSubReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1ABCF01B70F9C40070657C /* PubSubReceiver.m */; }; BE1B27CC1BCE9FE2003C0C61 /* ActionPickerPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BE1B27CB1BCE9FE2003C0C61 /* ActionPickerPlugin */; }; + BE5D91501D6CA1E400E4B2C7 /* libCobalt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE5D914B1D6CA18900E4B2C7 /* libCobalt.a */; }; + BE5D91511D6CA1F700E4B2C7 /* Cobalt.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BE5D914D1D6CA18900E4B2C7 /* Cobalt.bundle */; }; BE7BE5471CA05CB400AADDEB /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = BE7BE5421CA05CB400AADDEB /* .gitignore */; }; BE7BE5481CA05CB400AADDEB /* FontAwesome.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7BE5441CA05CB400AADDEB /* FontAwesome.m */; }; BE7BE5491CA05CB400AADDEB /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE7BE5451CA05CB400AADDEB /* FontAwesome.ttf */; }; BE7BE54A1CA05CB400AADDEB /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = BE7BE5461CA05CB400AADDEB /* LICENSE */; }; - BE956EB91C47F5CD002DBEE3 /* libCobalt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BE956EB41C47F5BC002DBEE3 /* libCobalt.a */; }; - BE956EBA1C47F5D6002DBEE3 /* Cobalt.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BE956EB61C47F5BC002DBEE3 /* Cobalt.bundle */; }; BE956EBC1C47F653002DBEE3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE956EBB1C47F653002DBEE3 /* CoreGraphics.framework */; }; BE956EBE1C47F65F002DBEE3 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE956EBD1C47F65F002DBEE3 /* JavaScriptCore.framework */; }; - BE9BC89A1D0717E600152C70 /* LocationListener.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9BC8991D0717E600152C70 /* LocationListener.m */; }; BEA867811B74E8B70072F61C /* LocationPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BEA8677E1B74E8B70072F61C /* LocationPlugin */; }; BEA867821B74E8B70072F61C /* PubSubPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BEA8677F1B74E8B70072F61C /* PubSubPlugin */; }; BEA867831B74E8B70072F61C /* WebServicesPlugin in Resources */ = {isa = PBXBuildFile; fileRef = BEA867801B74E8B70072F61C /* WebServicesPlugin */; }; @@ -90,23 +89,23 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - BE956EB31C47F5BC002DBEE3 /* PBXContainerItemProxy */ = { + BE5D914A1D6CA18900E4B2C7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */; + containerPortal = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */; proxyType = 2; remoteGlobalIDString = BE31EB1B1C3EC52100141B6E; remoteInfo = Cobalt; }; - BE956EB51C47F5BC002DBEE3 /* PBXContainerItemProxy */ = { + BE5D914C1D6CA18900E4B2C7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */; + containerPortal = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */; proxyType = 2; remoteGlobalIDString = BEFF884A1C4541FD0063AA18; remoteInfo = CobaltResources; }; - BE956EB71C47F5C8002DBEE3 /* PBXContainerItemProxy */ = { + BE5D914E1D6CA1D600E4B2C7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */; + containerPortal = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */; proxyType = 1; remoteGlobalIDString = BEFF882F1C3ED3BC0063AA18; remoteInfo = Framework; @@ -191,12 +190,12 @@ BE1ABCF01B70F9C40070657C /* PubSubReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PubSubReceiver.m; path = PubSubPlugin/PubSubReceiver.m; sourceTree = ""; }; BE1B27CB1BCE9FE2003C0C61 /* ActionPickerPlugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ActionPickerPlugin; path = www/ActionPickerPlugin; sourceTree = ""; }; BE208FEF1BD4DB5C000D2B5F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = ""; }; + BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Cobalt.xcodeproj; path = Cobalt/Cobalt.xcodeproj; sourceTree = ""; }; BE7BE5421CA05CB400AADDEB /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; BE7BE5431CA05CB400AADDEB /* FontAwesome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontAwesome.h; sourceTree = ""; }; BE7BE5441CA05CB400AADDEB /* FontAwesome.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontAwesome.m; sourceTree = ""; }; BE7BE5451CA05CB400AADDEB /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = ""; }; BE7BE5461CA05CB400AADDEB /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; - BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Cobalt.xcodeproj; path = Cobalt/Cobalt.xcodeproj; sourceTree = ""; }; BE956EBB1C47F653002DBEE3 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; BE956EBD1C47F65F002DBEE3 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; BE9BC8981D0717E600152C70 /* LocationListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocationListener.h; sourceTree = ""; }; @@ -240,14 +239,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 540BD3D91CFDCDE200E0580A /* SafariServices.framework in Frameworks */, 542538FD1CEF2AE500190AF9 /* AddressBook.framework in Frameworks */, - 6AAF551E1CD8DE04005C3123 /* SystemConfiguration.framework in Frameworks */, BE956EBC1C47F653002DBEE3 /* CoreGraphics.framework in Frameworks */, BEDE9EB61B7398DB00EAEB94 /* CoreLocation.framework in Frameworks */, BE956EBE1C47F65F002DBEE3 /* JavaScriptCore.framework in Frameworks */, + 540BD3D91CFDCDE200E0580A /* SafariServices.framework in Frameworks */, + 6AAF551E1CD8DE04005C3123 /* SystemConfiguration.framework in Frameworks */, BEDE9EB41B7398C700EAEB94 /* UIKit.framework in Frameworks */, - BE956EB91C47F5CD002DBEE3 /* libCobalt.a in Frameworks */, + BE5D91501D6CA1E400E4B2C7 /* libCobalt.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -395,6 +394,15 @@ name = AppDelegate; sourceTree = ""; }; + BE5D91451D6CA18900E4B2C7 /* Products */ = { + isa = PBXGroup; + children = ( + BE5D914B1D6CA18900E4B2C7 /* libCobalt.a */, + BE5D914D1D6CA18900E4B2C7 /* Cobalt.bundle */, + ); + name = Products; + sourceTree = ""; + }; BE7BE5411CA05CB400AADDEB /* Fonts-FontAwesome-iOS */ = { isa = PBXGroup; children = ( @@ -407,15 +415,6 @@ path = "Fonts-FontAwesome-iOS"; sourceTree = ""; }; - BE956EAE1C47F5BC002DBEE3 /* Products */ = { - isa = PBXGroup; - children = ( - BE956EB41C47F5BC002DBEE3 /* libCobalt.a */, - BE956EB61C47F5BC002DBEE3 /* Cobalt.bundle */, - ); - name = Products; - sourceTree = ""; - }; BEDD51871BCE993300E204AC /* ActionPickerPlugin */ = { isa = PBXGroup; children = ( @@ -458,23 +457,23 @@ F01A5A0A1716EF4C0000DD94 /* Frameworks */ = { isa = PBXGroup; children = ( - 540BD3D81CFDCDE200E0580A /* SafariServices.framework */, 542538FC1CEF2AE500190AF9 /* AddressBook.framework */, - 6AAF551D1CD8DE04005C3123 /* SystemConfiguration.framework */, - 6AAF550E1CD8DD19005C3123 /* BatteryStatusPlugin */, - 6AAF55031CD8DD0C005C3123 /* NetworkStatusPlugin */, - BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */, BE956EBB1C47F653002DBEE3 /* CoreGraphics.framework */, BEDE9EB51B7398DB00EAEB94 /* CoreLocation.framework */, BE956EBD1C47F65F002DBEE3 /* JavaScriptCore.framework */, + 540BD3D81CFDCDE200E0580A /* SafariServices.framework */, + 6AAF551D1CD8DE04005C3123 /* SystemConfiguration.framework */, BEDE9EB31B7398C700EAEB94 /* UIKit.framework */, + BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */, + BE7BE5411CA05CB400AADDEB /* Fonts-FontAwesome-iOS */, BEDD51871BCE993300E204AC /* ActionPickerPlugin */, BEDD8DA21BAC282C00265616 /* AppInfosPlugin */, + 6AAF550E1CD8DD19005C3123 /* BatteryStatusPlugin */, + BE1ABCD81B70F9730070657C /* LocationPlugin */, + 6AAF55031CD8DD0C005C3123 /* NetworkStatusPlugin */, 540BD3DA1CFDCF1400E0580A /* PdfPlugin */, - BE7BE5411CA05CB400AADDEB /* Fonts-FontAwesome-iOS */, BE1ABCEC1B70F9B50070657C /* PubSubPlugin */, 54EC75511CEF2910006E02DD /* SharePlugin */, - BE1ABCD81B70F9730070657C /* LocationPlugin */, F0AF225B1AFD639400B58B07 /* WebServicesPlugin */, ); name = Frameworks; @@ -534,7 +533,7 @@ buildRules = ( ); dependencies = ( - BE956EB81C47F5C8002DBEE3 /* PBXTargetDependency */, + BE5D914F1D6CA1D600E4B2C7 /* PBXTargetDependency */, ); name = Catalog; productName = Catalog; @@ -569,8 +568,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = BE956EAE1C47F5BC002DBEE3 /* Products */; - ProjectRef = BE956EAD1C47F5BC002DBEE3 /* Cobalt.xcodeproj */; + ProductGroup = BE5D91451D6CA18900E4B2C7 /* Products */; + ProjectRef = BE5D91441D6CA18900E4B2C7 /* Cobalt.xcodeproj */; }, ); projectRoot = ""; @@ -581,18 +580,18 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - BE956EB41C47F5BC002DBEE3 /* libCobalt.a */ = { + BE5D914B1D6CA18900E4B2C7 /* libCobalt.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libCobalt.a; - remoteRef = BE956EB31C47F5BC002DBEE3 /* PBXContainerItemProxy */; + remoteRef = BE5D914A1D6CA18900E4B2C7 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - BE956EB61C47F5BC002DBEE3 /* Cobalt.bundle */ = { + BE5D914D1D6CA18900E4B2C7 /* Cobalt.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = Cobalt.bundle; - remoteRef = BE956EB51C47F5BC002DBEE3 /* PBXContainerItemProxy */; + remoteRef = BE5D914C1D6CA18900E4B2C7 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -649,7 +648,7 @@ 8E751EA819EEB62400EDFF4D /* black_sun.png in Resources */, F0FB6E4219B45EF600021401 /* common in Resources */, 8E751EA919EEB62400EDFF4D /* black_sun@2x.png in Resources */, - BE956EBA1C47F5D6002DBEE3 /* Cobalt.bundle in Resources */, + BE5D91511D6CA1F700E4B2C7 /* Cobalt.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -689,10 +688,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - BE956EB81C47F5C8002DBEE3 /* PBXTargetDependency */ = { + BE5D914F1D6CA1D600E4B2C7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Framework; - targetProxy = BE956EB71C47F5C8002DBEE3 /* PBXContainerItemProxy */; + targetProxy = BE5D914E1D6CA1D600E4B2C7 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/Cobalt b/Cobalt index adc7b42..996607d 160000 --- a/Cobalt +++ b/Cobalt @@ -1 +1 @@ -Subproject commit adc7b423ff8cceb0b3cf4ab79fb9aa7ea9f32a4d +Subproject commit 996607db55ee4c2c9ab1e9fbbe5bb6c160605e89 From fa1d89acbdfe525776a6e233ef542a237fd3682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Vitard?= Date: Tue, 23 Aug 2016 17:35:01 +0200 Subject: [PATCH 12/14] cobaltians/cobalt#82: update FontAwesome --- Fonts-FontAwesome-iOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fonts-FontAwesome-iOS b/Fonts-FontAwesome-iOS index 9c35ede..de49485 160000 --- a/Fonts-FontAwesome-iOS +++ b/Fonts-FontAwesome-iOS @@ -1 +1 @@ -Subproject commit 9c35ede7ffaaff800447dd87da45f9b337778e69 +Subproject commit de49485909c71ea499d1ef80cba045277ac65afe From 8ce7628206dfdc8c92b2b48425566bce3c027cdc Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Tue, 13 Sep 2016 14:53:01 +0200 Subject: [PATCH 13/14] merge is correct. setting all plugins submodules on develop too. --- SharePlugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharePlugin b/SharePlugin index bc52adc..8210696 160000 --- a/SharePlugin +++ b/SharePlugin @@ -1 +1 @@ -Subproject commit bc52adc6a5f5ba743ca65bc4884ed3c94fc7fd23 +Subproject commit 8210696156f3eb988e1d7b65de24ffe9537eae04 From c6e4af0b370640bc75ddb91037394070b891fca4 Mon Sep 17 00:00:00 2001 From: Guillaume Gendre Date: Tue, 13 Sep 2016 17:43:19 +0200 Subject: [PATCH 14/14] using latest www from develop --- Catalog/www/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Catalog/www/common b/Catalog/www/common index 102d73c..b9b7909 160000 --- a/Catalog/www/common +++ b/Catalog/www/common @@ -1 +1 @@ -Subproject commit 102d73c89dc8d3ed1ec0ae64929844def68b5587 +Subproject commit b9b7909bf96983e94a12dbefc7f63e0add46cccc