Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Compile. #106

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Fix Compile. #106

wants to merge 31 commits into from

Commits on Mar 20, 2013

  1. Using FMDB 2.0 instead of head version to adopt new Cocoapod spec req… 

    …uirements
    @stcui
    stcui committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    c602869 View commit details
    Browse the repository at this point in the history

  2. fix BeeLog defination

    @stcui
    stcui committed Mar 20, 2013
    Configuration menu
    Copy the full SHA
    2306351 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2013

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	BeeFramework/Core/Storage/Bee_Database.m
    @stcui
    stcui committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    cdbb6a7 View commit details
    Browse the repository at this point in the history

  2. supress warnings

    @stcui
    stcui committed Apr 13, 2013
    Configuration menu
    Copy the full SHA
    8ba79bd View commit details
    Browse the repository at this point in the history

Commits on May 8, 2013

  1. Merge remote-tracking branch 'upstream/master'

    @stcui
    stcui committed May 8, 2013
    Configuration menu
    Copy the full SHA
    052bd4e View commit details
    Browse the repository at this point in the history

Commits on May 18, 2013

  1. Add more geometry helper methods to UIView Extension 

    centerX, centerY, origin, size, boundsCenter
    @stcui
    stcui committed May 18, 2013
    Configuration menu
    Copy the full SHA
    3a4302f View commit details
    Browse the repository at this point in the history

Commits on May 23, 2013

  1. simple singleton macro

    @stcui
    stcui committed May 23, 2013
    Configuration menu
    Copy the full SHA
    5b367a2 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2013

  1. fix UITableBoard layout problem

    @stcui
    stcui committed Jul 12, 2013
    Configuration menu
    Copy the full SHA
    fbdb3ab View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2013

  1. add podspec to repos

    @stcui
    stcui committed Jul 27, 2013
    Configuration menu
    Copy the full SHA
    0cf52a9 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2013

  1. fix project file, remove deleted files

    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    1c1957d View commit details
    Browse the repository at this point in the history

  2. replace with latest podspec

    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    f47cb78 View commit details
    Browse the repository at this point in the history

  3. clean project file

    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    e9044f5 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	BeeDebugger/Bee_DebugCrashReporter.h
	BeeDebugger/Bee_DebugCrashReporter.mm
	BeeDebugger/Bee_DebugDashBoard.h
	BeeDebugger/Bee_DebugDashBoard.m
	BeeDebugger/Bee_DebugHeatmapModel.h
	BeeDebugger/Bee_DebugHeatmapModel.m
	BeeDebugger/Bee_DebugMessageBoard.h
	BeeDebugger/Bee_DebugMessageBoard.m
	BeeDebugger/Bee_DebugNetworkBoard.h
	BeeDebugger/Bee_DebugNetworkBoard.m
	BeeDebugger/Bee_DebugSandboxBoard.h
	BeeDebugger/Bee_DebugSandboxBoard.m
	BeeDebugger/Bee_DebugViewBoard.h
	BeeDebugger/Bee_DebugViewBoard.m
	BeeDebugger/Bee_DebugViewModel.h
	BeeDebugger/Bee_DebugViewModel.m
	BeeDebugger/Bee_DebugWindow.h
	BeeDebugger/Bee_DebugWindow.m
	BeeFramework/Core/Foundation/Bee_Singleton.h
	BeeFramework/Core/Foundation/Bee_Thread.h
	BeeFramework/Core/Storage/Bee_Cache.h
	BeeFramework/Core/Storage/Bee_Cache.m
	BeeFramework/MVC/View/Extension/UIView+BeeExtension.h
	BeeFramework/MVC/View/Extension/UIView+BeeExtension.m
	BeeFramework/MVC/ViewLayout/Extension/UIView+BeeUIStyle.h
	Example/Lessons/Lesson11Board.m
	Example/Lessons/Lesson5Board.h
	Example/Lessons/Lesson5Board.m
	Example/Lessons/Lesson6Board.m
	Example/Lessons/Lesson7Board.m
	Example/Lessons/LessonBaseBoard.m
	Example/WhatsBug.xcodeproj/project.pbxproj
	Example/WhatsBug/WhatsBug-Prefix.pch
	StaticLibrary/StaticLibrary.xcodeproj/project.pbxproj
	framework-ext/Bee_UIWebBoard/Bee_UIWebBoard.m
	framework/application/mvc/view/dom-element/Bee_UIAccelerometer.h
	framework/application/mvc/view/dom-element/Bee_UIAccelerometer.m
	framework/application/mvc/view/dom-element/Bee_UIKeyboard.h
	framework/system/database/Bee_Database.mm
	framework/system/database/extension/NSObject+BeeActiveRecord.m
	framework/system/foundation/Bee_Ticker.mm
	framework/system/foundation/extension/NSObject+BeeTicker.mm
	services/ServiceDebugger/ServiceDebugger_MemoryModel.h
	services/ServiceDebugger/ServiceDebugger_MemoryModel.m
	services/ServiceDebugger/ServiceDebugger_MessageModel.h
	services/ServiceDebugger/ServiceDebugger_MessageModel.m
	services/ServiceDebugger/ServiceDebugger_NetworkModel.h
	services/ServiceDebugger/ServiceDebugger_NetworkModel.m
    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    388cfa9 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master'

    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    ea60eff View commit details
    Browse the repository at this point in the history

  6. fix

    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    405d968 View commit details
    Browse the repository at this point in the history

  7. update podspec

    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    b7a0232 View commit details
    Browse the repository at this point in the history

  8. add ASI patch

    @stcui
    stcui committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    c9d7db1 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2013

  1. fix podspec, add ASI_Bee to target lib

    @stcui
    stcui committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    cec4ef3 View commit details
    Browse the repository at this point in the history

  2. supress warning

    @stcui
    stcui committed Jul 30, 2013
    Configuration menu
    Copy the full SHA
    7ccd039 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2013

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	framework-ext/Bee_UIWebBoard/Bee_UIWebBoard.m
    @stcui
    stcui committed Aug 2, 2013
    Configuration menu
    Copy the full SHA
    f104348 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2014

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	framework/mvc/controller/Bee_MessageController.h
	framework/mvc/controller/Bee_MessageController.mm
	framework/mvc/controller/Bee_MessageQueue.mm
	framework/mvc/view/dom-element/Bee_UIKeyboard.h
	framework/system/database/Bee_Database.mm
	framework/vendor/Bee_Vendor.h
	projects/lib/lib.xcodeproj/project.pbxproj
	services/bee.services.inspector/source/ServiceInspector_Indicator.m
    @stcui
    stcui committed Jan 13, 2014
    Configuration menu
    Copy the full SHA
    632877c View commit details
    Browse the repository at this point in the history

  2. fix

    @stcui
    stcui committed Jan 13, 2014
    Configuration menu
    Copy the full SHA
    3fe94c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2014

  1. replace JSONKit, fix podspec

    @stcui
    stcui committed Jan 15, 2014
    Configuration menu
    Copy the full SHA
    4b32569 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2014

  1. avoid duplicated symbol

    @stcui
    stcui committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    b007ed5 View commit details
    Browse the repository at this point in the history

  2. remove libalixpay.a

    @stcui
    stcui committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    545577c View commit details
    Browse the repository at this point in the history

  3. remove alipay library

    @stcui
    stcui committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    6db1cf6 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2014

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	projects/BeeFramework.xcworkspace/xcshareddata/BeeFramework.xccheckout
    @stcui
    stcui committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    169decd View commit details
    Browse the repository at this point in the history

  2. suppress warnings

    @stcui
    stcui committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    3e72559 View commit details
    Browse the repository at this point in the history

  3. update podspec

    @stcui
    stcui committed Mar 6, 2014
    Configuration menu
    Copy the full SHA
    8c52fe9 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	projects/example/example.xcodeproj/project.pbxproj
    @stcui
    stcui committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    578a078 View commit details
    Browse the repository at this point in the history

  2. fix compile

    @stcui
    stcui committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    ebabc18 View commit details
    Browse the repository at this point in the history