Commit Graph

19 Commits

Author SHA1 Message Date
Greg Neagle
6b4ad647c4 Update copyright dates 2025-01-25 15:35:09 -08:00
Greg Neagle
2b327569b4 Update copyright dates 2024-01-30 16:14:29 -08:00
Greg Neagle
767f64b12a Update copyright info 2023-02-22 09:59:22 -08:00
Greg Neagle
5ee0f5928a Update copyright dates 2022-05-10 16:09:38 -07:00
Greg Neagle
82b720661a Update copyright dates 2021-02-20 09:12:34 -08:00
Steve Küng
df7ea0d4d5 Merge branch 'master' of https://github.com/munki/munki into MSCMojave
# Conflicts:
#	code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj
#	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/Resources/WebResources/updates.css
#	code/apps/Managed Software Center/Managed Software Center/en-AU.lproj/InfoPlist.strings
#	code/apps/Managed Software Center/Managed Software Center/msclog.swift
2020-03-11 08:02:32 +01:00
Greg Neagle
72a0535d0d Update Copyright dates 2020-01-01 08:53:37 -08:00
Steve Kküng
d0cd14848a Merge branch 'Munki3dev' into MSCMojave
# 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
2019-03-18 20:42:37 +01:00
Steve Kküng
50dcee6ead prepare for merge 2019-03-18 19:51:13 +01:00
Greg Neagle
918d0b7391 Update copyright dates 2019-01-02 10:31:50 -08:00
Greg Neagle
321383030e Move Swift versions of the apps out to code/apps; move pyobjc versions into code/apps/pyobjc; revise .gitignore files; update make_munki_mpkg scripts 2018-12-04 18:06:59 -08:00
Greg Neagle
1428c40d06 Update copyright notices to include 2018 2018-01-20 08:46:22 -08:00
Greg Neagle
4053a0dbe7 Update copyright dates to 2017 2017-01-17 20:14:31 -08:00
Greg Neagle
f6eb029976 Update PrincipalClass in MSCDockTilePlugin's Info.plist 2016-09-21 07:14:15 -07:00
Ben Goodstein
0745abf75e Renaming DockTilePlugIn class to MSCDockTilePlugIn 2016-09-21 09:36:29 +01:00
Greg Neagle
12d4f0d27e Update copyright info on files; remove abandoned tools from code/tools 2016-03-15 09:32:28 -07:00
Tim Morgan
4c8b71d03e [WIP] El Capitan-style CSS 2016-03-09 12:45:57 -08:00
Samuel Keeley
5c12185da4 Replace http://www.apache.org/licenses/LICENSE-2.0 with https://www.apache.org/licenses/LICENSE-2.0 2015-11-13 20:35:24 -08:00
Greg Neagle
42e2cf17f1 Begin Notification Center support: notifier helper app; docktileplugin, support for NSUserNotificationCenterDelegate methods 2015-04-15 10:44:37 -07:00