mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-08 08:10:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,584 Commits 11 Branches 114 Tags
4721bfeee67fa32f1ffcdd07ef3caa525ebb5513
Commit Graph

136 Commits

Author SHA1 Message Date
Steve Küng
1b3cb211b6 Merge branch 'master' of https://github.com/munki/munki into new_design 
# Conflicts:
#	code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj
#	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/de.lproj/Localizable.strings
 2020-06-09 18:43:41 +02:00
Greg Neagle
0d98ed9fd7 Record Xcode 11.4.1 upgrde check for MunkiStatus.xcodeproj 2020-04-26 18:56:40 -07:00
Steve Küng
b58010d0c8 fix munki status 2020-03-11 15:10:31 +01:00
Steve Küng
26fd94706c Merge branch 'MunkiStatus-Redesign' into new_design 
# Conflicts:
#	code/apps/Managed Software Center/Managed Software Center.xcodeproj/Localization.swift
#	code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/AllItemsTemplate.imageset/AllItemsTemplate.png
#	code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/AllItemsTemplate.imageset/Contents.json
#	code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/Contents.json
#	code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/MyStuffTemplate.imageset/Contents.json
#	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/Contents.json
#	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/Contents.json
#	code/apps/Managed Software Center/Managed Software Center/Assets.xcassets/updatesTemplate.imageset/updatesTemplate.png
#	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/MSCTableCellView.swift
#	code/apps/Managed Software Center/Managed Software Center/MSCTableRowView.swift
#	code/apps/Managed Software Center/Managed Software Center/Resources/templates/detail_template.html
#	code/apps/Managed Software Center/Managed Software Center/Resources/templates/list_template.html
#	code/apps/Managed Software Center/Managed Software Center/Resources/templates/myitems_template.html
#	code/apps/Managed Software Center/Managed Software Center/Resources/templates/updatedetail_template.html
#	code/apps/Managed Software Center/Managed Software Center/Resources/templates/updates_template.html
#	code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/Contents.json
#	code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/munkiLogoTemplate.imageset/Contents.json
#	code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/munkiLogoTemplate.imageset/icon_512x512@2x.png
#	code/apps/MunkiStatus/MunkiStatus/Base.lproj/MainMenu.xib
#	code/apps/MunkiStatus/MunkiStatus/MSWindow.swift
#	code/apps/swift/Managed Software Center/Managed Software Center/Assets.xcassets/Contents.json
#	code/apps/swift/MunkiStatus/MunkiStatus.xcodeproj/project.pbxproj
 2020-03-11 08:41:38 +01:00
Steve Küng
859516bbdd Merge branch 'master' of https://github.com/munki/munki into MunkiStatus-Redesign 
# Conflicts:
#	code/apps/MunkiStatus/MunkiStatus/Base.lproj/MainMenu.xib
#	code/apps/swift/MunkiStatus/MunkiStatus.xcodeproj/project.pbxproj
 2020-03-11 08:32:17 +01:00
Greg Neagle
72a0535d0d Update Copyright dates 2020-01-01 08:53:37 -08:00
Greg Neagle
264470e7eb Remove Command-Q shortcut for Quit to prevent using that to quit the MunkiStatus app at/over the loginwindow. 2019-12-20 15:44:13 -08:00
Greg Neagle
c81fd77d59 MunkiStatus: delay starting up NSApplication until CGSession is available. Works around a display issue at boot. 2019-08-27 13:22:53 -07:00
Greg Neagle
2c0c13e636 Update MSC.app and MunkiStatus.app projects for Xcode 10(.2) compatibility. 2019-03-27 10:43:57 -07:00
Elliot Jordan
d14c4304ea Various typo fixes and spelling corrections (#907) 
* Fixed "No Comment" typo in strings files

* Fix "problem updates" typo

* Fix "caught" typo

* Fix "pseudo" typo

* Fix "instantiated" typo

* Fix "explicitly" typo

* Fix "osascript" typo

* Spelling fixes and various other corrections

* Fix two more instances of "Logput"

* Fixed a few remaining spelling issues in python files

* Fix "because" typo

PR also submitted upstream to the Murky project for the same correction.

* Fix name of associated app

* Additional spelling corrections in comments/docstrings
 2019-02-14 08:30:43 -08:00
Ben Goodstein
4d8b05c9b6 MunkiStatus.app Info.plist localization fixes (#895) 2019-01-07 08:48:08 -08:00
Greg Neagle
31e4afa266 Fix timer in MSC.app that monitors for managedsoftwareupdate failing to start or ending unexpectedly. 2019-01-04 13:39:00 -08:00
Greg Neagle
918d0b7391 Update copyright dates 2019-01-02 10:31:50 -08:00
Greg Neagle
f715a4627e Update .gitignore files; add MunkiStatus/en.lproj; fixes git tracking issues with localized files 2018-12-21 13:45:37 -08:00
Greg Neagle
ff5d94cc28 Clean up code signing configuration for MSC.app and MunkiStatus.app. Resolves an issue where MSC.app will not launch in response to a clicked Notification Center notification. 2018-12-14 15:36:32 -08:00
Greg Neagle
ce0499048a Automatically add git psuedo-revision number to CFBundleVersion and CFBundleShortVersionString 2018-12-04 18:35:44 -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
0bbd68c7ba Merge branch 'master' into Munki3dev 2018-10-18 09:08:20 -07:00
Greg Neagle
a6a070db0f Adjust build architectures for MunkiStatus (don't build 32-bit code) -- may address build issues under Xcode 10 2018-10-18 09:07:58 -07:00
Greg Neagle
424169377b Merge branch 'darkmode' into Munki3dev 2018-08-30 09:43:03 -07:00
Greg Neagle
dea412d72e Dark Mode support for MSC.app and MunkiStatus.app 2018-08-30 09:41:28 -07:00
Greg Neagle
ca46fedb18 Disable tabs in MunkiStatus windows. Remove PATH references to Python2.6 2018-06-30 09:43:57 -07:00
Greg Neagle
870c260e19 Tweaks to #includes in the PyObjC apps so they'll build under both Xcode 8 and Xcode 9 2018-05-04 07:59:54 -07:00
Greg Neagle
1428c40d06 Update copyright notices to include 2018 2018-01-20 08:46:22 -08:00
Ben Goodstein
49144ed681 Removing references to Managed Software Update in the localized window title of MunkiStatus (#810) 2017-10-13 09:48:10 -07:00
Greg Neagle
7888e7123f Update German localizations. Thanks to Daniel Moore and Oliver Haessler. 2017-08-18 13:43:33 -07:00
Greg Neagle
9917df8708 Speed up launch of MunkiStatus by replacing wildcard imports from Foundation and AppKit with selective import of needed symbols. 2017-06-26 09:23:02 -07:00
Greg Neagle
9da9d24a22 Link Managed Software Center.app and MunkiStatus.app to Python 2.7 instead of 2.6 2017-06-09 06:48:19 -07:00
Greg Neagle
49fbdf4899 Update Japanese localization. Thanks to @nakanana. 2017-05-18 08:15:18 -07:00
Greg Neagle
b654476969 Updated Norwegian localization courtesy Frank Paul Silye 2017-05-04 08:57:57 -07:00
Greg Neagle
19c30cc375 Updated Swedish localization courtesy Jonas Jöreskog 2017-05-04 08:48:55 -07:00
Greg Neagle
875bf649ff Updated Italian localization courtesy Dino Libertino 2017-05-04 08:41:26 -07:00
Greg Neagle
fe822f7a37 Updated Finnish localization courtesy Hannes Juutilainen 2017-05-04 08:26:02 -07:00
Greg Neagle
c9130cbad0 Updated Danish localization courtesy Thomas Tvegaard 2017-05-04 08:20:46 -07:00
Greg Neagle
089df454a1 Updated French localization courtesy Serge ROUX 2017-05-03 08:47:51 -07:00
Greg Neagle
293b20a18d Updated Spanish localization courtesy @LcTrKiD 2017-05-02 09:47:48 -07:00
Timothy Sutton
d58682c39f Munki3 ru updates (#759) 
* Russian localizations for new Munki3 features

- thanks to Nadia Mytnik-Frantova

* Add missing 'Removal Error message' for Russian localization
 2017-05-01 09:35:45 -07:00
Arjen van Bochoven
08073809de Update nl locale for munkistatus (#756) 2017-04-26 06:10:06 -07:00
Greg Neagle
d2e83e5e25 Localization updates 2017-04-25 15:50:13 -07:00
Greg Neagle
778df23802 Tweak progress/status messages for macOS upgrade installs 2017-04-25 15:20:58 -07:00
Greg Neagle
89a3e0d993 Localization work for macOS upgrades 2017-04-22 07:34:37 -07:00
Greg Neagle
db5f11b83c Normalize sorting of strings files 2017-04-09 13:04:40 -07:00
Greg Neagle
3dbaad48b9 Normalize sorting of strings files 2017-04-09 13:03:43 -07:00
Greg Neagle
9c749bfff1 Normalize sorting of strings files 2017-04-09 13:01:40 -07:00
Greg Neagle
d4b162b94c Updated German localization courtesy of Fridolin Koch 2017-04-09 12:35:44 -07:00
Greg Neagle
4aca898b97 Normalize sorting of localization strings for Norwegian 2017-04-09 08:29:58 -07:00
Greg Neagle
e171a251c8 # This is a combination of 4 commits. 
# The first commit's message is:
Update build targets to 10.8; change forward/back controls from deprecated 'textured rounded' to 'textured square'

# This is the 2nd commit message:

MunkiStatus: update build targets to 10.8

# This is the 3rd commit message:

munki-notifier: set deployment target to 10.8

# This is the 4th commit message:

MunkiStatus: tweak MainMenu.xib to built for deployment target
 2017-03-24 15:14:47 -07:00
Greg Neagle
dca0608aab Revert "Munki3: Update project settings to Xcode 8.2, deployment target 10.8 (#736)" 
This reverts commit a60cff69b8.
 2017-03-24 14:35:58 -07:00
Timothy Sutton
a60cff69b8 Munki3: Update project settings to Xcode 8.2, deployment target 10.8 (#736) 
* Updates for Xcode 8

- applied recommended settings (mostly Clang-related)
- Fixed Deployment Target to 10.8 for all projects
- set macOS SDK explicitly to 10.12
- switch textured rounded to textured square for MSC toolbar navigation UI element

* macOS 10.12 SDK -> macOS current

* Revert height property change within MSC Log window
 2017-03-24 14:18:49 -07:00
Greg Neagle
4053a0dbe7 Update copyright dates to 2017 2017-01-17 20:14:31 -08:00