Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions Cards/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<body>
<p>Recognizing that the work of our collective rests upon generations of understanding of group dynamics, we are gifting this particular emergence of that ongoing development into the commons.</p>

<p>Group Pattern Language Project (2011) <a href="http://www.grouppatternlanguage.org">www.grouppatternlanguage.org</a> & <a
href="http://www.groupworksdeck.org">www.groupworksdeck.org</a>.</p>
<p>Group Pattern Language Project (2011) <a
href="https://www.groupworksdeck.org">www.groupworksdeck.org</a>.</p>

<p>This work is licensed under the Creative Commons Attribution-Share Alike 3.0 License. You are free to share and remix the work on the condition that you attribute the source, and redistribute under the same license. For more information see: www.creativecommons.org.</p>

Expand Down Expand Up @@ -54,11 +54,11 @@ <h2>Introduction</h2>
<p>Want to learn more? Go to our website :</p>

<ul>
<li><a href="http://groupworksdeck.org/activities">Activities</a></li>
<li><a href="http://groupworksdeck.org/participation">Get Involved</a></li>
<li><a href="https://groupworksdeck.org/activities">Activities</a></li>
<li><a href="https://groupworksdeck.org/participation">Get Involved</a></li>
<li><a href="acknowledgements.html">Acknowledgements</a></li>
<li><a href="http://groupworksdeck.org/pictures">Picture Licensing Info</a></li>
<li><a href="https://groupworksdeck.org/pictures">Picture Licensing Info</a></li>
</ul>

</body>
</html>
</html>
56 changes: 56 additions & 0 deletions Group Works/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "GWlogo_120.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "GWlogo_180.png",
"scale" : "3x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "GWlogo1.png",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions Group Works/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
175 changes: 146 additions & 29 deletions GroupPatterns.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions GroupPatterns.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions GroupPatterns/Controllers/CardController.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ - (void)makeTitleFit {
UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero];
label.backgroundColor = [UIColor clearColor];
label.font = [UIFont boldSystemFontOfSize:16.0];
label.textColor = [UIColor whiteColor];
label.textColor = [UIColor blackColor];
label.text = self.navigationItem.title;
label.numberOfLines = 1;
label.adjustsFontSizeToFitWidth = true;
Expand All @@ -34,7 +34,7 @@ - (void)makeTitleFit {

- (void)viewDidLoad {
[super viewDidLoad];
self.navigationItem.title = card.name;
self.title = card.name;
[self makeTitleFit];
[self loadHTMLString:[self cardHtml]];
}
Expand Down
13 changes: 5 additions & 8 deletions GroupPatterns/GroupPatterns-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,24 @@
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIconFiles</key>
<array>
<string>icon_57.png</string>
<string>icon_114.png</string>
</array>
<key>CFBundleIdentifier</key>
<string>org.groupworksdeck.carddeck</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>Launch Screen</string>
<key>UIMainStoryboardFile</key>
<string>Storyboard</string>
<key>UISupportedInterfaceOrientations</key>
Expand Down
2 changes: 1 addition & 1 deletion GroupPatterns/Models/Card.m
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#import <OCHamcrestIOS/OCHamcrestIOS.h>
#import <OCHamcrest/OCHamcrest.h>
#import "Card.h"
#import "Category.h"
#import "NSString+Helpers.h"
Expand Down
Loading