mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-03-03 05:20:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into samuel-docs

Browse Source
This commit is contained in:
Samuel Keeley
2015-11-20 14:54:19 -08:00
parent ac39dda439 942e645387
commit 23d2e85545
61 changed files with 115 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.h
View File

@@ -10,7 +10,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/Managed Software Center/MSCDockTilePlugin/DockTilePlugIn.m
View File

@@ -10,7 +10,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,

6
code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj
View File

@@ -666,6 +666,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "Managed Software Center";
SDKROOT = macosx10.10;
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -689,6 +690,7 @@
);
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "Managed Software Center";
SDKROOT = macosx10.10;
WRAPPER_EXTENSION = app;
};
name = Release;
@@ -730,7 +732,7 @@
AppKit,
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.8;
SDKROOT = macosx;
SKIP_INSTALL = NO;
WRAPPER_EXTENSION = docktileplugin;
};
@@ -769,7 +771,7 @@
AppKit,
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.8;
SDKROOT = macosx;
SKIP_INSTALL = NO;
WRAPPER_EXTENSION = docktileplugin;
};

2
code/apps/Managed Software Center/Managed Software Center/FoundationPlist.py
View File

@@ -6,7 +6,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/Managed Software Center/Managed Software Center/Localize.py
View File

@@ -13,7 +13,7 @@ And Wil Shipley's 'Pimp My Code, Part 17: Lost in Translations'
http://wilshipley.com/blog/2009/10/pimp-my-code-part-17-lost-in.html
Written by David Keegan for Murky
http://bitbucket.org/snej/murky
https://bitbucket.org/snej/murky
Usage:
Localize.py -help

2
code/apps/Managed Software Center/Managed Software Center/MSCAppDelegate.py
View File

@@ -9,7 +9,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/Managed Software Center/Managed Software Center/MSCBadgedTemplateImage.py
View File

@@ -9,7 +9,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/Managed Software Center/Managed Software Center/MSCMainWindowController.py
View File

@@ -9,7 +9,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/Managed Software Center/Managed Software Center/MSCStatusController.py
View File

@@ -8,7 +8,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

7
code/apps/Managed Software Center/Managed Software Center/MunkiItems.py
View File

@@ -11,7 +11,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -322,9 +322,10 @@ class MSCHTMLFilter(HTMLParser):
self.filtered_html += u'&%s;' % name
def handle_charref(self, name):
self.entity_count += 1
if not self.current_ignore_element:
# just pass on unmodified
self.filtered_html += name
# add the char reference as-is
self.filtered_html += u'&#%s;' % name
def filtered_html(text, filter_images=False):

2
code/apps/Managed Software Center/Managed Software Center/msclib.py
View File

@@ -9,7 +9,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/Managed Software Center/Managed Software Center/msclog.py
View File

@@ -12,7 +12,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/Managed Software Center/Managed Software Center/munki.py
View File

@@ -10,7 +10,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

4
code/apps/MunkiStatus/MunkiStatus.xcodeproj/project.pbxproj
View File

@@ -464,7 +464,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx10.8;
SDKROOT = macosx;
};
name = Debug;
};
@@ -486,7 +486,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx10.8;
SDKROOT = macosx;
};
name = Release;
};

2
code/apps/MunkiStatus/MunkiStatus/BorderlessWindow.h
View File

@@ -8,7 +8,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/BorderlessWindow.m
View File

@@ -8,7 +8,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/FoundationPlist.py
View File

@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/Localize.py
View File

@@ -13,7 +13,7 @@ And Wil Shipley's 'Pimp My Code, Part 17: Lost in Translations'
http://wilshipley.com/blog/2009/10/pimp-my-code-part-17-lost-in.html
Written by David Keegan for Murky
http://bitbucket.org/snej/murky
https://bitbucket.org/snej/murky
Usage:
Localize.py -help

2
code/apps/MunkiStatus/MunkiStatus/MSUAppDelegate.py
View File

@@ -9,7 +9,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/MSUStatusWindowController.py
View File

@@ -9,7 +9,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/ScaledImageView.h
View File

@@ -9,7 +9,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/ScaledImageView.m
View File

@@ -9,7 +9,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/main.m
View File

@@ -8,7 +8,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/main.py
View File

@@ -8,7 +8,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,

2
code/apps/MunkiStatus/MunkiStatus/munki.py
View File

@@ -10,7 +10,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,