Changeset [3ab2ebf71f3f3049ab31503a5d4f171baca20c76] by cacaodev
April 26th, 2012 @ 03:38 AM
Merge remote-tracking branch 'upstream/master' into CPRulePredicateEditor
Conflicts:
AppKit/CPRuleEditor/CPRuleEditor.j
https://github.com/cappuccino/cappuccino/commit/3ab2ebf71f3f3049ab3...
Committed by cacaodev
- A AppKit/CPColorSpace.j
- A AppKit/CPGradient.j
- A AppKit/CPWorkspace.j
- A AppKit/Cib/CPCibHelpConnector.j
- A AppKit/Cib/CPCibRuntimeAttributesConnector.j
- A AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif
- A AppKit/Resources/CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif
- A AppKit/Resources/_CPToolbarView/toolbar-background-bottom.png
- A AppKit/Resources/_CPToolbarView/toolbar-background-center.png
- A AppKit/Resources/_CPToolbarView/toolbar-background-top.png
- A External/rhino-narwhal-java-opts.patch
- A Foundation/CPDateFormatter.j
- A Foundation/_CPCollectionKVCOperators.j
- A Tests/AppKit/CPCheckBoxTest.j
- A Tests/AppKit/CPSplitViewTest.j
- A Tests/Manual/CPBinder-echo-bug/AppController.j
- A Tests/Manual/CPBinder-echo-bug/Info.plist
- A Tests/Manual/CPBinder-echo-bug/Jakefile
- A Tests/Manual/CPBinder-echo-bug/Resources/spinner.gif
- A Tests/Manual/CPBinder-echo-bug/index-debug.html
- A Tests/Manual/CPBinder-echo-bug/index.html
- A Tests/Manual/CPBinder-echo-bug/main.j
- A Tests/Manual/CPBoxTest/AppController.j
- A Tests/Manual/CPBoxTest/Info.plist
- A Tests/Manual/CPBoxTest/Jakefile
- A Tests/Manual/CPBoxTest/Resources/MainMenu.cib
- A Tests/Manual/CPBoxTest/Resources/MainMenu.xib
- A Tests/Manual/CPBoxTest/Resources/spinner.gif
- A Tests/Manual/CPBoxTest/index-debug.html
- A Tests/Manual/CPBoxTest/index.html
- A Tests/Manual/CPBoxTest/main.j
- A Tests/Manual/CPColorWellBindings/AppController.j
- A Tests/Manual/CPColorWellBindings/Info.plist
- A Tests/Manual/CPColorWellBindings/Jakefile
- A Tests/Manual/CPColorWellBindings/Resources/MainMenu.cib
- A Tests/Manual/CPColorWellBindings/Resources/MainMenu.xib
- A Tests/Manual/CPColorWellBindings/Resources/spinner.gif
- A Tests/Manual/CPColorWellBindings/index-debug.html
- A Tests/Manual/CPColorWellBindings/index.html
- A Tests/Manual/CPColorWellBindings/main.j
- A Tests/Manual/CPGraphicsTest/Resources/grad0.png
- A Tests/Manual/CPGraphicsTest/Resources/grad1.png
- A Tests/Manual/CPGraphicsTest/Resources/grad2.png
- A Tests/Manual/CPGraphicsTest/Resources/grad3.png
- A Tests/Manual/CPGraphicsTest/Resources/view1.png
- A Tests/Manual/CPGraphicsTest/Resources/view2.png
- A Tests/Manual/CPGraphicsTest/Resources/view3.png
- A Tests/Manual/CPGraphicsTest/Resources/view4.png
- A Tests/Manual/CPImageViewAlignmentScaling/AppController.j
- A Tests/Manual/CPImageViewAlignmentScaling/Info.plist
- A Tests/Manual/CPImageViewAlignmentScaling/Jakefile
- A Tests/Manual/CPImageViewAlignmentScaling/Resources/MainMenu.cib
- A Tests/Manual/CPImageViewAlignmentScaling/Resources/MainMenu.xib
- A Tests/Manual/CPImageViewAlignmentScaling/Resources/box.png
- A Tests/Manual/CPImageViewAlignmentScaling/Resources/spinner.gif
- A Tests/Manual/CPImageViewAlignmentScaling/index-debug.html
- A Tests/Manual/CPImageViewAlignmentScaling/index.html
- A Tests/Manual/CPImageViewAlignmentScaling/main.j
- A Tests/Manual/CPImageViewTest/AppController.j
- A Tests/Manual/CPImageViewTest/Info.plist
- A Tests/Manual/CPImageViewTest/Jakefile
- A Tests/Manual/CPImageViewTest/Resources/280px-1730_Homann_Map_of_Scandinavia,_Norway,_Sweden,_Denmark,_Finland_and_the_Baltics_-_Geographicus_-_Scandinavia-homann-1730.jpg
- A Tests/Manual/CPImageViewTest/Resources/spinner.gif
- A Tests/Manual/CPImageViewTest/index-debug.html
- A Tests/Manual/CPImageViewTest/index.html
- A Tests/Manual/CPImageViewTest/main.j
- A Tests/Manual/CPImageViewbindingsTest/AppController.j
- A Tests/Manual/CPImageViewbindingsTest/Info.plist
- A Tests/Manual/CPImageViewbindingsTest/Jakefile
- A Tests/Manual/CPImageViewbindingsTest/Resources/MainMenu.cib
- A Tests/Manual/CPImageViewbindingsTest/Resources/MainMenu.xib
- A Tests/Manual/CPImageViewbindingsTest/Resources/images.plist
- A Tests/Manual/CPImageViewbindingsTest/Resources/spinner.gif
- A Tests/Manual/CPImageViewbindingsTest/Resources/value.jpg
- A Tests/Manual/CPImageViewbindingsTest/Resources/valueURL.jpg
- A Tests/Manual/CPImageViewbindingsTest/index-debug.html
- A Tests/Manual/CPImageViewbindingsTest/index.html
- A Tests/Manual/CPImageViewbindingsTest/main.j
- A Tests/Manual/CPPopover/Resources/MainMenu.cib
- A Tests/Manual/CPPopover/Resources/MainMenu.xib
- A Tests/Manual/CPPropertyListSerializationTest/AppController.j
- A Tests/Manual/CPPropertyListSerializationTest/Info.plist
- A Tests/Manual/CPPropertyListSerializationTest/Jakefile
- A Tests/Manual/CPPropertyListSerializationTest/Resources/PropertyList.plist
- A Tests/Manual/CPPropertyListSerializationTest/Resources/spinner.gif
- A Tests/Manual/CPPropertyListSerializationTest/index-debug.html
- A Tests/Manual/CPPropertyListSerializationTest/index.html
- A Tests/Manual/CPPropertyListSerializationTest/main.j
- A Tests/Manual/CPSplitViewTest/AppController.j
- A Tests/Manual/CPSplitViewTest/Info.plist
- A Tests/Manual/CPSplitViewTest/Jakefile
- A Tests/Manual/CPSplitViewTest/Resources/MainMenu.cib
- A Tests/Manual/CPSplitViewTest/Resources/MainMenu.xib
- A Tests/Manual/CPSplitViewTest/Resources/spinner.gif
- A Tests/Manual/CPSplitViewTest/index-debug.html
- A Tests/Manual/CPSplitViewTest/index.html
- A Tests/Manual/CPSplitViewTest/main.j
- A Tests/Manual/CPStepperNibTest/AppController.j
- A Tests/Manual/CPStepperNibTest/Info.plist
- A Tests/Manual/CPStepperNibTest/Jakefile
- A Tests/Manual/CPStepperNibTest/Resources/MainMenu.cib
- A Tests/Manual/CPStepperNibTest/Resources/MainMenu.xib
- A Tests/Manual/CPStepperNibTest/Resources/spinner.gif
- A Tests/Manual/CPStepperNibTest/index-debug.html
- A Tests/Manual/CPStepperNibTest/index.html
- A Tests/Manual/CPStepperNibTest/main.j
- A Tests/Manual/LayoutTest/AppController.j
- A Tests/Manual/LayoutTest/Info.plist
- A Tests/Manual/LayoutTest/Jakefile
- A Tests/Manual/LayoutTest/Resources/MainMenu.cib
- A Tests/Manual/LayoutTest/Resources/MainMenu.xib
- A Tests/Manual/LayoutTest/Resources/horizontal-border-0.png
- A Tests/Manual/LayoutTest/Resources/horizontal-border-1.png
- A Tests/Manual/LayoutTest/Resources/horizontal-border-2.png
- A Tests/Manual/LayoutTest/Resources/round-border-0.png
- A Tests/Manual/LayoutTest/Resources/round-border-1.png
- A Tests/Manual/LayoutTest/Resources/round-border-2.png
- A Tests/Manual/LayoutTest/Resources/round-border-3.png
- A Tests/Manual/LayoutTest/Resources/round-border-4.png
- A Tests/Manual/LayoutTest/Resources/round-border-5.png
- A Tests/Manual/LayoutTest/Resources/round-border-6.png
- A Tests/Manual/LayoutTest/Resources/round-border-7.png
- A Tests/Manual/LayoutTest/Resources/round-border-8.png
- A Tests/Manual/LayoutTest/Resources/spinner.gif
- A Tests/Manual/LayoutTest/Resources/vertical-border-0.png
- A Tests/Manual/LayoutTest/Resources/vertical-border-1.png
- A Tests/Manual/LayoutTest/Resources/vertical-border-2.png
- A Tests/Manual/LayoutTest/index-debug.html
- A Tests/Manual/LayoutTest/index.html
- A Tests/Manual/LayoutTest/main.j
- A Tests/Manual/TableTest/HeaderCornerView/AppController.j
- A Tests/Manual/TableTest/HeaderCornerView/Info.plist
- A Tests/Manual/TableTest/HeaderCornerView/Jakefile
- A Tests/Manual/TableTest/HeaderCornerView/Resources/MainMenu.cib
- A Tests/Manual/TableTest/HeaderCornerView/Resources/MainMenu.xib
- A Tests/Manual/TableTest/HeaderCornerView/Resources/spinner.gif
- A Tests/Manual/TableTest/HeaderCornerView/index-debug.html
- A Tests/Manual/TableTest/HeaderCornerView/index.html
- A Tests/Manual/TableTest/HeaderCornerView/main.j
- A Tests/Manual/UserlandNSTest/AppController.j
- A Tests/Manual/UserlandNSTest/BorderView.j
- A Tests/Manual/UserlandNSTest/Info.plist
- A Tests/Manual/UserlandNSTest/Jakefile
- A Tests/Manual/UserlandNSTest/NS_BorderView.j
- A Tests/Manual/UserlandNSTest/Resources/MainMenu.cib
- A Tests/Manual/UserlandNSTest/Resources/MainMenu.xib
- A Tests/Manual/UserlandNSTest/Resources/spinner.gif
- A Tests/Manual/UserlandNSTest/index-debug.html
- A Tests/Manual/UserlandNSTest/index.html
- A Tests/Manual/UserlandNSTest/main.j
- A Tests/Manual/UserlandNSTest/nib2cib.conf
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/AppController.j
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/Info.plist
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/Jakefile
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/Resources/MainMenu.cib
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/Resources/MainMenu.xib
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/Resources/spinner.gif
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index-debug.html
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/index.html
- A Tests/Manual/resignFirstResponder-CPControlTextDidEndEditing/main.j
- A Tests/Objective-J/PropertyLists/XMLDate.plist
- A Tools/capp_lint/README
- A Tools/capp_lint/capp_lint
- A Tools/capp_lint/capp_lint.1
- A Tools/capp_lint/install.sh
- A Tools/capp_lint/pre-commit
- A Tools/dump_theme/Jakefile
- A Tools/dump_theme/dump_theme
- A Tools/dump_theme/dump_theme.1
- A Tools/nib2cib/NSDateFormatter.j
- A Tools/nib2cib/NSNull.j
- A Tools/nib2cib/NSStepper.j
- A Tools/nib2cib/Nib2Cib.j
- R AppKit/Resources/_CPToolbarView/_CPToolbarViewBackground.png
- R Tests/Manual/TableTest/HeaderView-CornerView/Info.plist
- R Tests/Manual/TableTest/HeaderView-CornerView/Resources/spinner.gif
- R Tests/Manual/TableTest/HeaderView-CornerView/index-debug.html
- R Tests/Manual/TableTest/HeaderView-CornerView/index.html
- R Tests/Manual/TableTest/HeaderView-CornerView/Jakefile
- R Tests/Manual/TableTest/HeaderView-CornerView/AppController.j
- R Tests/Manual/TableTest/HeaderView-CornerView/main.j
- M AppKit/AppKit.j
- M AppKit/CPAlert.j
- M AppKit/CPAnimation.j
- M AppKit/CPArrayController.j
- M AppKit/CPBezierPath.j
- M AppKit/CPBox.j
- M AppKit/CPBrowser.j
- M AppKit/CPButton.j
- M AppKit/CPCheckBox.j
- M AppKit/CPCollectionView.j
- M AppKit/CPColor.j
- M AppKit/CPColorWell.j
- M AppKit/CPControl.j
- M AppKit/CPEvent.j
- M AppKit/CPFlashView.j
- M AppKit/CPFont.j
- M AppKit/CPGraphicsContext.j
- M AppKit/CPImageView.j
- M AppKit/CPKeyValueBinding.j
- M AppKit/CPMenu/_CPMenuManager.j
- M AppKit/CPMenuItem/CPMenuItem.j
- M AppKit/CPMenuItem/_CPMenuItemMenuBarView.j
- M AppKit/CPMenuItem/_CPMenuItemStandardView.j
- M AppKit/CPObjectController.j
- M AppKit/CPOutlineView.j
- M AppKit/CPPopUpButton.j
- M AppKit/CPPopover.j
- M AppKit/CPProgressIndicator.j
- M AppKit/CPRuleEditor/CPPredicateEditor.j
- M AppKit/CPRuleEditor/CPRuleEditor.j
- M AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j
- M AppKit/CPScrollView.j
- M AppKit/CPScroller.j
- M AppKit/CPSearchField.j
- M AppKit/CPSegmentedControl.j
- M AppKit/CPShadowView.j
- M AppKit/CPSplitView.j
- M AppKit/CPStepper.j
- M AppKit/CPTabView.j
- M AppKit/CPTabViewItem.j
- M AppKit/CPTableColumn.j
- M AppKit/CPTableHeaderView.j
- M AppKit/CPTableView.j
- M AppKit/CPTextField.j
- M AppKit/CPTheme.j
- M AppKit/CPToolbar.j
- M AppKit/CPUserDefaultsController.j
- M AppKit/CPView.j
- M AppKit/CPViewController.j
- M AppKit/CPWindow/CPWindow.j
- M AppKit/CPWindow/_CPAttachedWindowView.j
- M AppKit/CPWindow/_CPBorderlessBridgeWindowView.j
- M AppKit/CPWindow/_CPHUDWindowView.j
- M AppKit/CPWindow/_CPStandardWindowView.j
- M AppKit/Cib/CPCib.j
- M AppKit/Cib/_CPCibClassSwapper.j
- M AppKit/Cib/_CPCibCustomResource.j
- M AppKit/Cib/_CPCibObjectData.j
- M AppKit/Cib/_CPCibWindowTemplate.j
- M AppKit/CoreGraphics/CGGeometry.j
- M AppKit/CoreGraphics/CGGradient.j
- M AppKit/Platform/DOM/CPPlatformWindow+DOM.j
- M AppKit/_CPAttachedWindow.j
- M AppKit/_CPCornerView.j
- M AppKit/_CPImageAndTextView.j
- M AppKit/_CPToolTip.j
- M CommonJS/lib/cappuccino/cib-analysis-tools.j
- M Foundation/CPArray+KVO.j
- M Foundation/CPArray/CPArray.j
- M Foundation/CPArray/_CPJavaScriptArray.j
- M Foundation/CPCharacterSet.j
- M Foundation/CPData.j
- M Foundation/CPDate.j
- M Foundation/CPDictionary.j
- M Foundation/CPIndexSet.j
- M Foundation/CPKeyValueCoding.j
- M Foundation/CPKeyValueObserving.j
- M Foundation/CPKeyedArchiver.j
- M Foundation/CPKeyedUnarchiver.j
- M Foundation/CPNotificationCenter.j
- M Foundation/CPNumberFormatter.j
- M Foundation/CPObject.j
- M Foundation/CPPredicate/CPComparisonPredicate.j
- M Foundation/CPPredicate/CPCompoundPredicate.j
- M Foundation/CPPredicate/_CPAggregateExpression.j
- M Foundation/CPSet+KVO.j
- M Foundation/CPSet/CPMutableSet.j
- M Foundation/CPSet/CPSet.j
- M Foundation/CPURL.j
- M Foundation/CPURLConnection.j
- M Foundation/CPURLRequest.j
- M Foundation/CPWebDAVManager.j
- M Foundation/Foundation.j
- M Objective-J/CFBundle.js
- M Objective-J/CFData.js
- M Objective-J/CFHTTPRequest.js
- M Objective-J/CFPropertyList.js
- M Objective-J/CFURL.js
- M Objective-J/CPLog.js
- M Objective-J/CommonJS/lib/objective-j/compiler.js
- M README.markdown
- M Tests/AppKit/CPArrayControllerTest.j
- M Tests/AppKit/CPButtonTest.j
- M Tests/AppKit/CPCollectionViewTest.j
- M Tests/AppKit/CPColorTest.j
- M Tests/AppKit/CPFontTest.j
- M Tests/AppKit/CPKeyEquivalentPerformance.j
- M Tests/AppKit/CPKeyValueBindingTest.j
- M Tests/AppKit/CPMenuTest.j
- M Tests/AppKit/CPPopUpButtonTest.j
- M Tests/AppKit/CPResponderTest.j
- M Tests/AppKit/CPScrollViewTest.j
- M Tests/AppKit/CPTableViewTest.j
- M Tests/Foundation/CPArrayTest.j
- M Tests/Foundation/CPDataTest.j
- M Tests/Foundation/CPIndexSetTest.j
- M Tests/Foundation/CPKVCArrayTest.j
- M Tests/Foundation/CPKVOTest.j
- M Tests/Foundation/CPKeyValueCodingTest.j
- M Tests/Foundation/CPKeyValueObservingTest.j
- M Tests/Foundation/CPKeyedArchiverTest.j
- M Tests/Foundation/CPObjectTest.j
- M Tests/Foundation/CPSetTest.j
- M Tests/Foundation/CPURLTest.j
- M Tests/Manual/CPGraphicsTest/AppController.j
- M Tests/Manual/CPGraphicsTest/Resources/MainMenu.cib
- M Tests/Manual/CPGraphicsTest/Resources/MainMenu.xib
- M Tests/Manual/CPPopUpButtonTest/AppController.j
- M Tests/Manual/CPPopover/AppController.j
- M Tests/Manual/CPPopover/Info.plist
- M Tests/Manual/CPPopover/Jakefile
- M Tests/Manual/CPPopover/index-debug.html
- M Tests/Manual/CPPopover/main.j
- M Tests/Manual/CPScrollView2/AppController.j
- M Tests/Manual/CPScrollView2/Resources/MainMenu.cib
- M Tests/Manual/CPScrollView2/Resources/MainMenu.xib
- M Tests/Manual/CPSearchField/AppController.j
- M Tests/Manual/CPSearchField/Resources/MainMenu.cib
- M Tests/Manual/CPTabViewNib/AppController.j
- M Tests/Manual/CPTabViewNib/Resources/MainMenu.cib
- M Tests/Manual/CPTabViewNib/Resources/MainMenu.xib
- M Tests/Manual/NibAppRemixed/Resources/MainMenu.cib
- M Tests/Manual/NibAppRemixed/Resources/MainMenu.xib
- M Tests/Manual/TableTest/BorderTableTest/Resources/MainMenu.cib
- M Tests/Manual/TableTest/GroupRowTest/AppController.j
- M Tests/Manual/TableTest/OldTest/AppController.j
- M Tests/Objective-J/CFPropertyListTest.j
- M Tools/Documentation/Cappuccino.doxygen
- M Tools/Documentation/preprocess/003.make_headers.rb
- M Tools/Jakefile
- M Tools/XcodeCapp/TNXCodeCapp.m
- M Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj
- M Tools/XcodeCapp/help.rtfd/TXT.rtf
- M Tools/capp/Configuration.j
- M Tools/capp/Generate.j
- M Tools/capp/Resources/Templates/Application/index-debug.html
- M Tools/capp/Resources/Templates/Framework/Jakefile
- M Tools/capp/Resources/Templates/NibApplication/index-debug.html
- M Tools/capp/Resources/Templates/ThemeDescriptor/Info.plist
- M Tools/capp/Resources/Templates/ThemeDescriptor/Jakefile
- M Tools/capp/Resources/Templates/ThemeDescriptor/ThemeDescriptors.j
- M Tools/capp/Resources/Templates/ThemeDescriptor/index-debug.html
- M Tools/capp/Resources/Templates/ThemeDescriptor/index.html
- M Tools/capp/Resources/Templates/ThemeDescriptor/main.j
- M Tools/nib2cib/Converter.j
- M Tools/nib2cib/NSAppKit.j
- M Tools/nib2cib/NSBox.j
- M Tools/nib2cib/NSClassSwapper.j
- M Tools/nib2cib/NSColor.j
- M Tools/nib2cib/NSFoundation.j
- M Tools/nib2cib/NSImageView.j
- M Tools/nib2cib/NSLevelIndicator.j
- M Tools/nib2cib/NSMenuItem.j
- M Tools/nib2cib/NSNibConnector.j
- M Tools/nib2cib/NSPopover.j
- M Tools/nib2cib/NSProgressIndicator.j
- M Tools/nib2cib/NSScrollView.j
- M Tools/nib2cib/NSSearchField.j
- M Tools/nib2cib/NSSegmentedControl.j
- M Tools/nib2cib/NSSlider.j
- M Tools/nib2cib/NSSplitView.j
- M Tools/nib2cib/NSTableView.j
- M Tools/nib2cib/NSTokenField.j
- M Tools/nib2cib/NSToolbar.j
- M Tools/nib2cib/NSToolbarItem.j
- M Tools/nib2cib/NSView.j
- M Tools/nib2cib/NSWindowTemplate.j
- M Tools/nib2cib/main.j
- M Tools/nib2cib/nib2cib.1
- M bootstrap.sh
- M common.jake
- M version.json
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
The Cappuccino Web Framework, including AppKit, Foundation, and Objective-J.