Skip to content

Commit

Permalink
Fix gtm-oauth2 among other things
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisballinger committed Sep 19, 2013
1 parent c8070fa commit 8d5af1e
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 53 deletions.
181 changes: 133 additions & 48 deletions Off the Record.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Off the Record/OTRAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#import "OTRConvertAccount.h"
#import "OTRUtilities.h"
#import "OTRAccountsManager.h"
#import <FacebookSDK/FacebookSDK.h>
#import "FacebookSDK.h"

// Log levels: off, error, warn, info, verbose
#if DEBUG
Expand Down
2 changes: 1 addition & 1 deletion Off the Record/OTRFacebookLoginViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#import "Strings.h"
#import "OTRAppDelegate.h"
#import "OTRConstants.h"
#import <FacebookSDK/FacebookSDK.h>
#import "FacebookSDK.h"

@interface OTRFacebookLoginViewController ()

Expand Down
2 changes: 1 addition & 1 deletion Submodules/OTRKit
2 changes: 1 addition & 1 deletion Submodules/UserVoice
Submodule UserVoice updated 87 files
+14 −0 CHANGELOG.md
+5 −3 Classes/UVArticle.m
+5 −3 Classes/UVArticleViewController.m
+1 −0 Classes/UVBaseInstantAnswersViewController.h
+10 −21 Classes/UVBaseInstantAnswersViewController.m
+1 −3 Classes/UVBaseModel.h
+17 −28 Classes/UVBaseModel.m
+0 −1 Classes/UVBaseSuggestionViewController.h
+75 −26 Classes/UVBaseSuggestionViewController.m
+1 −1 Classes/UVBaseTicketViewController.h
+16 −42 Classes/UVBaseTicketViewController.m
+19 −10 Classes/UVBaseViewController.h
+158 −14 Classes/UVBaseViewController.m
+20 −0 Classes/UVCallback.h
+42 −0 Classes/UVCallback.m
+1 −1 Classes/UVCategorySelectViewController.m
+4 −1 Classes/UVCellViewWithIndex.m
+10 −11 Classes/UVClientConfig.h
+12 −23 Classes/UVClientConfig.m
+1 −0 Classes/UVCommentViewController.m
+15 −0 Classes/UVConfig.m
+20 −0 Classes/UVDefines.h
+5 −3 Classes/UVForum.h
+8 −0 Classes/UVForum.m
+2 −2 Classes/UVHighlightingLabel.m
+3 −1 Classes/UVInitialLoadManager.h
+55 −19 Classes/UVInitialLoadManager.m
+14 −4 Classes/UVNewSuggestionIpadViewController.m
+23 −10 Classes/UVNewSuggestionViewController.m
+1 −1 Classes/UVNewTicketIpadViewController.h
+15 −2 Classes/UVNewTicketIpadViewController.m
+1 −1 Classes/UVNewTicketViewController.h
+21 −9 Classes/UVNewTicketViewController.m
+7 −4 Classes/UVSession.h
+8 −14 Classes/UVSession.m
+24 −5 Classes/UVSigninManager.h
+100 −27 Classes/UVSigninManager.m
+16 −0 Classes/UVStyleSheet.m
+2 −1 Classes/UVSuggestion.h
+3 −12 Classes/UVSuggestion.m
+47 −13 Classes/UVSuggestionDetailsViewController.m
+21 −34 Classes/UVSuggestionListViewController.m
+3 −2 Classes/UVTextView.m
+4 −4 Classes/UVTicket.m
+22 −7 Classes/UVUser.h
+2 −3 Classes/UVUser.m
+4 −0 Classes/UVUtils.h
+34 −0 Classes/UVUtils.m
+6 −6 Classes/UserVoice.m
+7 −4 Include/UVConfig.h
+15 −0 Include/UVStyleSheet.h
+49 −71 README.md
+ Resources/ca.lproj/UserVoice.strings
+ Resources/cs.lproj/UserVoice.strings
+ Resources/da.lproj/UserVoice.strings
+ Resources/de.lproj/UserVoice.strings
+ Resources/el.lproj/UserVoice.strings
+ Resources/en-GB.lproj/UserVoice.strings
+ Resources/en.lproj/UserVoice.strings
+ Resources/es.lproj/UserVoice.strings
+ Resources/fi.lproj/UserVoice.strings
+ Resources/fr.lproj/UserVoice.strings
+ Resources/hr.lproj/UserVoice.strings
+ Resources/hu.lproj/UserVoice.strings
+ Resources/id.lproj/UserVoice.strings
+ Resources/it.lproj/UserVoice.strings
+ Resources/ja.lproj/UserVoice.strings
+ Resources/ko.lproj/UserVoice.strings
+ Resources/ms.lproj/UserVoice.strings
+ Resources/nb.lproj/UserVoice.strings
+ Resources/nl.lproj/UserVoice.strings
+ Resources/pl.lproj/UserVoice.strings
+ Resources/pt-PT.lproj/UserVoice.strings
+ Resources/pt.lproj/UserVoice.strings
+ Resources/ro.lproj/UserVoice.strings
+ Resources/ru.lproj/UserVoice.strings
+ Resources/sk.lproj/UserVoice.strings
+ Resources/sv.lproj/UserVoice.strings
+ Resources/th.lproj/UserVoice.strings
+ Resources/tr.lproj/UserVoice.strings
+ Resources/uk.lproj/UserVoice.strings
+ Resources/vi.lproj/UserVoice.strings
+ Resources/zh-Hans.lproj/UserVoice.strings
+ Resources/zh-Hant.lproj/UserVoice.strings
+64 −8 UserVoice.xcodeproj/project.pbxproj
+1 −1 build.sh
+95 −0 strings.txt
2 changes: 1 addition & 1 deletion Submodules/gtm-oauth2

0 comments on commit 8d5af1e

Please sign in to comment.