Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cep/CSXS/manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</Lifecycle>
<UI>
<Type>Panel</Type>
<Menu>Shotgun Adobe Panel</Menu>
<Menu>ShotGrid Adobe Panel</Menu>
<Geometry>
<Size>
<Height>350</Height>
Expand Down
Binary file modified cep/images/sg_logo_with_text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion cep/js/shotgun/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ sg_manager.Manager = new function() {
if (!_app_is_supported()) {
_emit_python_critical_error({
message: "This CC product does not meet the minimum " +
"requirements to run the Shotgun integration. The " +
"requirements to run the ShotGrid integration. The " +
"Shotgun integration requires support for HTML " +
"panels and the extended panel menu.",
stack: undefined
Expand Down
6 changes: 3 additions & 3 deletions cep/js/shotgun/panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ sg_panel.Panel = new function() {

_show_info(true);
_set_info(
"Loading Shotgun Integration..."
"Loading ShotGrid Integration..."
);
};

Expand Down Expand Up @@ -105,7 +105,7 @@ sg_panel.Panel = new function() {
<tr>
<td id='sg_unknown_context_details'>
The currently active file can't be associated with a
Shotgun context. Try switching to another file or
ShotGrid context. Try switching to another file or
restarting ${app_display_name}.
</td>
</tr>
Expand Down Expand Up @@ -518,7 +518,7 @@ sg_panel.Panel = new function() {
Checked="false"/>';

flyout_xml += '<MenuItem Id="sg_dev_reload" \
Label="Reload Shotgun Extension" \
Label="Reload ShotGrid Extension" \
Enabled="true" \
Checked="false"/>';
}
Expand Down
2 changes: 1 addition & 1 deletion com.sg.basic.adobe.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.1.1
v1.1.3
Binary file modified com.sg.basic.adobe.zxp
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
The Shotgun Adobe Framework
The ShotGrid Adobe Framework
==================================================

The Shotgun Adobe Framework contains a common integration platform for Adobe Products,
unifying and simplifying the process of writing a Shotgun Toolkit integration for an
The ShotGrid Adobe Framework contains a common integration platform for Adobe Products,
unifying and simplifying the process of writing a ShotGrid Toolkit integration for an
Application that is part of the Adobe Suite.

More documentation coming soon.
2 changes: 1 addition & 1 deletion python/tk_framework_adobe_utils/plugin_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def bootstrap(root_path, port, engine_name, app_id):
from sgtk.platform.qt import QtGui
from sgtk.platform.engine_logging import ToolkitEngineHandler

app_name = "Shotgun Framework for Adobe CC"
app_name = "ShotGrid Framework for Adobe CC"

# create and set up the Qt app. we don't want the app to close when the
# last window is shut down since it's running in parallel to the CC product.
Expand Down