mirror of
https://github.com/munki/munki.git
synced 2026-01-30 02:59:02 -06:00
d0cd14848a
# Conflicts: # code/apps/Managed Software Center/.gitignore # code/apps/Managed Software Center/Managed Software Center.xcodeproj/Localization.swift # code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj # code/apps/Managed Software Center/Managed Software Center/AllItemsTemplate.png # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/AllItemsTemplate.imageset/AllItemsTemplate.png # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/MyStuffTemplate.imageset/MyStuffTemplate.png # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/toolbarCategoriesTemplate.imageset/toolbarCategoriesTemplate.pdf # code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/updatesTemplate.imageset/updatesTemplate.png # code/apps/Managed Software Center/Managed Software Center/Base.lproj/Localizable.strings # code/apps/Managed Software Center/Managed Software Center/Base.lproj/MainMenu.xib # code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift # code/apps/Managed Software Center/Managed Software Center/Info.plist # code/apps/Managed Software Center/Managed Software Center/MSCBadgedTemplateImage.swift # code/apps/Managed Software Center/Managed Software Center/MyStuffTemplate.png # code/apps/Managed Software Center/Managed Software Center/Resources/AllItemsTemplate.png # code/apps/Managed Software Center/Managed Software Center/Resources/MyStuffTemplate.png # code/apps/Managed Software Center/Managed Software Center/Resources/WebResources/detail.css # code/apps/Managed Software Center/Managed Software Center/Resources/WebResources/updates.css # code/apps/Managed Software Center/Managed Software Center/Resources/templates/category_item_template.html # code/apps/Managed Software Center/Managed Software Center/Resources/templates/detail_template.html # code/apps/Managed Software Center/Managed Software Center/Resources/toolbarCategoriesTemplate.pdf # code/apps/Managed Software Center/Managed Software Center/Resources/updatesTemplate.png # code/apps/Managed Software Center/Managed Software Center/de.lproj/Localizable.strings # code/apps/Managed Software Center/Managed Software Center/en-AU.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/en-CA.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/en-GB.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/en.lproj/Localizable.strings # code/apps/Managed Software Center/Managed Software Center/en.lproj/MainMenu.strings # code/apps/Managed Software Center/Managed Software Center/en_AU.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/en_CA.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/en_GB.lproj/InfoPlist.strings # code/apps/Managed Software Center/Managed Software Center/msclog.swift # code/apps/Managed Software Center/Managed Software Center/toolbarCategoriesTemplate.pdf # code/apps/Managed Software Center/Managed Software Center/updatesTemplate.png # code/apps/MunkiStatus/MunkiStatus/AppDelegate.swift # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/Contents.json # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_128_1x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_128_2x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_16_1x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_16_2x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_256_1x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_256_2x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_32_1x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_32_2x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_512_1x.png # code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/AppIcon.appiconset/MunkiStatus_512_2x.png # code/apps/MunkiStatus/MunkiStatus/Base.lproj/Localizable.strings # code/apps/MunkiStatus/MunkiStatus/Base.lproj/MainMenu.xib # code/apps/MunkiStatus/MunkiStatus/Localizable.strings # code/apps/MunkiStatus/MunkiStatus/Localization.swift # code/apps/MunkiStatus/MunkiStatus/LogViewController.swift # code/apps/MunkiStatus/MunkiStatus/MainMenu.updated.textClipping # code/apps/MunkiStatus/MunkiStatus/MunkiStatusViewController.swift # code/apps/MunkiStatus/MunkiStatus/Utils.swift # code/apps/MunkiStatus/MunkiStatus/en-AU.lproj/MainMenu.strings # code/apps/MunkiStatus/MunkiStatus/en-CA.lproj/MainMenu.strings # code/apps/MunkiStatus/MunkiStatus/en-GB.lproj/MainMenu.strings # code/apps/pyobjc/Managed Software Center/.gitignore # code/apps/pyobjc/Managed Software Center/MSCDockTilePlugin/Info.plist # code/apps/pyobjc/Managed Software Center/MSCDockTilePlugin/MSCDockTilePlugIn.h # code/apps/pyobjc/Managed Software Center/MSCDockTilePlugin/MSCDockTilePlugIn.m # code/apps/pyobjc/Managed Software Center/Managed Software Center/AlertController.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/AllItemsTemplate.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/CocoaWrapper.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/FoundationPlist.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSC.icns # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCAppDelegate.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCBadgedTemplateImage.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCLogWindowController.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCMainWindowController.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCPasswordAlertController.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCStatusController.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCToolbar.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center 10_6.icns # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center-Info.plist # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center-Prefix.pch # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.icns # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_128x128.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_128x128@2x.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_16x16.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_16x16@2x.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_256x256.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_256x256@2x.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_32x32.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_32x32@2x.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_512x512.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/Managed Software Center.iconset/icon_512x512@2x.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/MunkiItems.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/MyStuffTemplate.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/FollowLink.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/Generic.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/LogOutReq.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/RestartReq.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/add-button-sprite.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/appearance.js # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/base.css # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/branding.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/branding1.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/branding2.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/delete-button-sprite.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/itemlist.js # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/progress-spinner.png # code/apps/pyobjc/Managed Software Center/Managed Software Center/WebResources/updates.js # code/apps/pyobjc/Managed Software Center/Managed Software Center/authrestart.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/da-storefront-autoinstallations.css # code/apps/pyobjc/Managed Software Center/Managed Software Center/da.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/da.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/de.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/de.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/en_AU.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/en_AU.lproj/MainMenu.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/en_CA.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/en_CA.lproj/MainMenu.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/en_GB.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/en_GB.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/en_GB.lproj/MainMenu.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/es.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/es.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/fi.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/fi.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/fr.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/fr.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/it.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/it.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/ja.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/ja.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/main.m # code/apps/pyobjc/Managed Software Center/Managed Software Center/main.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/mschtml.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/msclib.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/msclog.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/munki.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/nb.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/nl.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/nl.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/passwdutil.py # code/apps/pyobjc/Managed Software Center/Managed Software Center/ru.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/ru.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/sv.lproj/InfoPlist.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/sv.lproj/Localizable.strings # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/detail_more_items_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/detail_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/footer_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/list_item_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/list_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/myitems_row_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/myitems_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/page_not_found_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/showcase_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/sidebar_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/status_results_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/update_row_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/updatedetail_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/templates/updates_template.html # code/apps/pyobjc/Managed Software Center/Managed Software Center/toolbarCategoriesTemplate.pdf # code/apps/pyobjc/Managed Software Center/Managed Software Center/updatesTemplate.png # code/apps/pyobjc/MunkiStatus/.gitignore # code/apps/pyobjc/MunkiStatus/MunkiStatus/Localize.py # code/apps/pyobjc/MunkiStatus/MunkiStatus/da.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/da.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/de.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/de.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/en_AU.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/en_AU.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/en_CA.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/en_CA.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/en_GB.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/en_GB.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/es.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/es.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/fi.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/fi.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/fr.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/fr.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/it.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/ja.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/ja.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/nb.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/nb.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/nl.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/nl.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/ru.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/ru.lproj/Localizable.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/sv.lproj/InfoPlist.strings # code/apps/pyobjc/MunkiStatus/MunkiStatus/sv.lproj/Localizable.strings # code/apps/swift/Managed Software Center/Managed Software Center.xcodeproj/Localization.swift
