mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-12 15:28:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,039 Commits 10 Branches 121 Tags
2a0b464dc44758e82bbb4cfba8686eee481042a7
Commit Graph

2039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Gomez 2a0b464dc4 Merge remote-tracking branch 'munki/master' 2015-08-17 09:14:56 -05:00
Greg Neagle 853fcfdb23 PyLint cleanups on munkiimport v2.3.0 2015-08-12 14:21:14 -07:00
Greg Neagle 416edbc2dc Fix issue when matching receipts when an individual receipts's version number is different from the overall item version number 2015-08-12 13:00:24 -07:00
Greg Neagle 364206acdf Removing notifier from master branch 2015-08-06 09:17:45 -07:00
Greg Neagle fb5d985ba1 Bumping version for 2.3 RC1 2015-08-06 08:39:56 -07:00
Greg Neagle f39e6b5cd7 Kill stray comma 2015-07-29 15:04:32 -07:00
Greg Neagle 6471f6d2a3 If there is no orignal softwareupdate CatalogURL on 10.11, use --clear-catalog to reset. 2015-07-29 13:42:18 -07:00
Greg Neagle 0ce7846fe5 Make appleupdates_test.py stop complaining 2015-07-29 08:57:12 -07:00
Greg Neagle 9e0deb7540 Some changes to appleupdates.py to work around issues on 10.11 2015-07-29 08:11:03 -07:00
Greg Neagle d0f0862436 Merge branch 'master' of https://github.com/munki/munki 2015-07-29 08:10:14 -07:00
Greg Neagle 1dd8329d66 Inject NSAppTransportSecurity key and value into [NSBundle mainBundle]'s infoDictionary in order to make App Transport Security happy on 10.11 2015-07-29 08:09:39 -07:00
Greg Neagle 498fee6fbb Merge pull request #499 from taniguti/Japanese-localization 
Check and correct Japanese strings
 2015-07-25 08:35:49 -07:00
Takanori TANIGUCHI 1cf8414c48 Check and fix Japanese strings 2015-07-25 17:51:48 +09:00
Takanori TANIGUCHI ec4e98aae2 Correct year. 2015-07-25 17:44:32 +09:00
Greg Neagle 441e649288 take out another instance of 'launchctl bsexec' usage under 10.11 2015-07-14 13:44:15 -07:00
Greg Neagle 6f3b65feac Don't use under 10.11 since SIP prevents it from doing what we want 2015-07-14 13:39:49 -07:00
Greg Neagle 45b3fbf785 Update project settings for Managed Software Center and MunkiStatus to add Japanese localization 2015-07-08 15:25:36 -04:00
Greg Neagle d8ec44ce35 Merge pull request #495 from arubdesu/ja-localization 
add localization for japanese, haven't modified project settings
 2015-07-08 15:12:29 -04:00
Allister Banks d4233edf31 add localization for japanese, haven't modified project settings 
munkiStatus and MSC Japanese localizations. MSC’s is tested thoroughly.
Not including additional line in build script that calls localize,
leaving that to @gregneagle
 2015-07-08 14:15:21 -04:00
Greg Neagle 31e8bb822d Merge branch 'master' of https://github.com/munki/munki 2015-07-04 12:53:29 -07:00
Greg Neagle c92a0ba042 Protect against empty strings being passed as button labels for preinstall/preuninstall_alerts 2015-07-04 12:53:17 -07:00
Greg Neagle fd75be09fa Remove mistaken addition of OnDemand flag to configuration pkginfo in makepkginfo 2015-07-03 15:39:06 -07:00
Greg Neagle 24109ef69a Merge pull request #493 from midsandhighs/master 
Add support for running runtests.sh on El Capitan.
 2015-07-02 14:47:21 -07:00
Greg Neagle 3512f5389b Another attempt to actually accomplish what was intended here: https://github.com/munki/munki/commit/1e511689d562f633b93b7f59cc2e2b349eb987e0 -- turns out ClearAppleUpdateInfo() method wasn't actually being called by anything. Sigh. 2015-06-30 18:39:28 -07:00
Greg Neagle 60ce0fa167 Merge pull request #492 from erikng/master 
Move paths.d to core package
 2015-06-29 10:56:23 -07:00
Erik Gomez 45a36987f1 Revert to original recursive path. 2015-06-29 12:46:33 -05:00
Erik Gomez 8124b04f07 Add paths.d back to Admin pkg for sanity 2015-06-29 10:30:33 -05:00
Greg Neagle 900b34c481 Merge pull request #490 from Multimac/local_manifest_name 
Update getmanifest to create unique filename for local copy of manifest
 2015-06-29 08:28:31 -07:00
Erik Gomez 1f4cdff29d Change paths.d location to core package 2015-06-29 10:03:49 -05:00
Erik Gomez adee593d45 Merge pull request #1 from munki/master 
merge to master
 2015-06-29 09:59:19 -05:00
David Symons 3e4935ec9b Changed filename checking in cleanUpManifests to ignore all files named 'SelfServeManifest' 2015-06-25 14:38:04 +10:00
David Symons cb5117b18d Reworked cleanUpManifests to use os.walk instead of recursion, cleaning it up. 
Added better exception handling to manifest folder creation in getmanifest
 2015-06-25 14:30:13 +10:00
David Symons 495873e7a1 Added exception for SelfServeManifest to cleanUpManifests 2015-06-23 16:58:15 +10:00
David Symons d041d90b6f Fixing spelling mistake 2015-06-23 16:46:58 +10:00
David Symons b1840af0ac Added cleanUpManifests to check over all manifests and remove those which are no longer used 2015-06-23 16:43:24 +10:00
David Symons d7512980f5 Flattened MANIFESTS, removing unnecessary sub-dictionaries. Also updated variable names to be less confusing 2015-06-23 16:02:22 +10:00
David Symons 96b80d7ce1 Forgot to use addToManifestCache and getFromManifestCache... 2015-06-23 13:42:36 +10:00
David Symons aecf0191a8 Updated getmanifest to copy the folder structure on the server when storing client-side manifests 2015-06-23 13:14:22 +10:00
David Symons f1af30de49 Update getmanifest to create unique filename for local copy of manifest 2015-06-22 12:40:19 +10:00
Greg Neagle 1a3d82291e html-escape labels for additional updates always; add missed template with escaped fields 2015-06-16 17:03:41 -07:00
Greg Neagle a6b4b5be84 Merge pull request #487 from klou/re-enable-makepkginfo-scripts 
add arguments check to criteria test
 2015-06-10 14:25:15 -07:00
Greg Neagle 73a1a33e80 HTML escape and/or JavaScript quote item fields that are substituted into templates to prevent invalid HTML/JavaScript. 2015-06-10 14:19:14 -07:00
klou 069c8be699 add arguments check to criteria test 
Checks for a single argument (installer item) as well as has_valid_install_critieria.  Multiple arguments fail via other checks, zero arguments (script_options) pass for pkginfo generation.
 2015-06-10 13:08:24 -07:00
Greg Neagle b37a514624 When url quoting items, encode as UTF-8 first 2015-06-10 09:01:26 -07:00
Greg Neagle 7b4ddff2ba Add .sutcatalog URL for El Cap 2015-06-10 08:28:28 -07:00
Jonathan Haenchen 5703880d89 Added 10.11 to the runtests.sh 2015-06-08 20:02:17 -05:00
Greg Neagle e62128ddf3 Merge pull request #485 from timsutton/10.6-check-nil-NSNotification-userInfo 
Check for a nil NSNotification.userInfo dict for 10.6
 2015-06-04 08:10:21 -07:00
Timothy Sutton 4c02751b3d Check for a nil NSNotification.userInfo dict on applicationDidFinishLaunching_() 
- seems to be nil/NoneType on 10.6
 2015-06-04 10:40:06 -04:00
Greg Neagle 11acf01e08 Merge pull request #484 from ccaviness/pyobjc 
builtin.super doesn't work with Cocoa classes, use objc.super instead
 2015-06-03 13:42:26 -07:00
Clay Caviness 06fe9e25ea builtin.super doesn't work correctly with Cocoa classes, use objc.super instead. 
This will allow support for more recent PyObjC installs (3.x) than what's on the system (2.x).
 2015-06-03 12:14:01 -04:00