diff options
| -rw-r--r-- | .idea/workspace.xml | 251 |
1 files changed, 146 insertions, 105 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dfecf24..6a72216 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,20 +2,12 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="ca07d8c4-fc91-4a6c-a9d8-fc6a7d2a3cc4" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/coip.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> + <change type="MOVED" beforePath="$PROJECT_DIR$/coip/apps/sts/__init__.py" afterPath="$PROJECT_DIR$/coip/apps/services/__init__.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../django-oauth2-lite-client/.idea/django-oauth2-lite-client.iml" afterPath="$PROJECT_DIR$/../django-oauth2-lite-client/.idea/django-oauth2-lite-client.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/coip/apps/invitation/models.py" afterPath="$PROJECT_DIR$/coip/apps/invitation/models.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/coip/apps/link/models.py" afterPath="$PROJECT_DIR$/coip/apps/link/models.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/coip/apps/membership/models.py" afterPath="$PROJECT_DIR$/coip/apps/membership/models.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/asgard/settings.d/10-apps.conf" afterPath="$PROJECT_DIR$/asgard/settings.d/10-apps.conf" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/coip/apps/name/models.py" afterPath="$PROJECT_DIR$/coip/apps/name/models.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/coip/apps/scim/__init__.py" afterPath="$PROJECT_DIR$/coip/apps/scim/__init__.py" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/coip/apps/scim/urls.py" afterPath="$PROJECT_DIR$/coip/apps/scim/urls.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/coip/settings.py" afterPath="$PROJECT_DIR$/coip/settings.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/oauth2_client.py" afterPath="$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/oauth2_client.py" /> </list> <ignored path="coip.iws" /> @@ -38,80 +30,33 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="scim-test.json" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/scim-test.json"> - <provider selected="true" editor-type-id="text-editor"> - <state line="4" column="55" selection-start="173" selection-end="211" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="scim-add-group.json" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/scim-add-group.json"> - <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="1" selection-start="129" selection-end="129" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="__init__.py" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../django-box/django_box/__init__.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="0" selection-start="1064" selection-end="1064" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="urls.py" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../django-box/django_box/urls.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="3" column="27" selection-start="111" selection-end="111" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="views.py" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../django-box/django_box/views.py"> + <file leaf-file-name="models.py" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/../django-box/django_box/models.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="39" selection-start="670" selection-end="670" vertical-scroll-proportion="0.0"> + <state line="11" column="58" selection-start="385" selection-end="385" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="oauth2_client.py" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/oauth2_client.py"> + <file leaf-file-name="models.py" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/coip/apps/name/models.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="64" column="0" selection-start="2085" selection-end="2085" vertical-scroll-proportion="0.0"> + <state line="263" column="95" selection-start="8501" selection-end="8501" vertical-scroll-proportion="0.83573484"> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="models.py" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/models.py"> + <entry file="file://$PROJECT_DIR$/coip/apps/link/models.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="13" column="44" selection-start="560" selection-end="560" vertical-scroll-proportion="0.0"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="__init__.py" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/coip/apps/sts/__init__.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="18" selection-start="598" selection-end="598" vertical-scroll-proportion="0.60178304"> - <folding> - <element signature="e#23#55#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -128,22 +73,22 @@ <component name="IdeDocumentHistory"> <option name="changedFiles"> <list> - <option value="$PROJECT_DIR$/scim-add-group-member.json" /> - <option value="$PROJECT_DIR$/coip/apps/api/views.py" /> - <option value="$PROJECT_DIR$/coip/apps/scim/urls.py" /> - <option value="$PROJECT_DIR$/../pybox/box/__init__.py" /> <option value="$PROJECT_DIR$/../pybox/box/models.py" /> <option value="$PROJECT_DIR$/../django-box/box/models.py" /> <option value="$PROJECT_DIR$/../django-box/box/urls.py" /> <option value="$PROJECT_DIR$/../django-box/django_box/urls.py" /> <option value="$PROJECT_DIR$/../django-box/django_box/forms.py" /> - <option value="$PROJECT_DIR$/../django-box/django_box/models.py" /> <option value="$PROJECT_DIR$/../django-box/django_box/views.py" /> - <option value="$PROJECT_DIR$/../django-box/django_box/__init__.py" /> <option value="$PROJECT_DIR$/coip/apps/sts/templatetags/providers.py" /> <option value="$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/oauth2_client.py" /> <option value="$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/models.py" /> + <option value="$PROJECT_DIR$/../django-box/django_box/__init__.py" /> + <option value="$PROJECT_DIR$/../django-box/django_box/models.py" /> <option value="$PROJECT_DIR$/coip/apps/sts/__init__.py" /> + <option value="$PROJECT_DIR$/coip/settings.py" /> + <option value="$PROJECT_DIR$/asgard/settings.d/10-apps.conf" /> + <option value="$PROJECT_DIR$/coip/apps/services/__init__.py" /> + <option value="$PROJECT_DIR$/coip/apps/name/models.py" /> </list> </option> </component> @@ -307,7 +252,83 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="sts" /> + <option name="myItemId" value="services" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="apps" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="name" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="apps" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="link" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="asgard" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="coip" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="asgard" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="settings.d" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -363,7 +384,7 @@ <property name="options.splitter.main.proportions" value="0.3" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="recentsLimit" value="5" /> - <property name="options.lastSelected" value="Errors" /> + <property name="options.lastSelected" value="preferences.keymap" /> <property name="options.splitter.details.proportions" value="0.2" /> <property name="options.searchVisible" value="true" /> </component> @@ -518,10 +539,10 @@ <window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2722701" sideWeight="0.67083335" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22988506" sideWeight="0.33333334" order="1" side_tool="true" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22988506" sideWeight="0.65694445" order="0" side_tool="false" content_ui="combo" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3297414" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> @@ -589,16 +610,6 @@ <breakpoint-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/../django-box/django_box/models.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="64" selection-start="219" selection-end="219" vertical-scroll-proportion="0.15601783" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/views.py"> - <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="35" selection-start="1543" selection-end="1543" vertical-scroll-proportion="0.6363636" /> - </provider> - </entry> <entry file="file:///opt/virtualenv/coip-test/lib/python2.6/site-packages/django/http/__init__.py"> <provider selected="true" editor-type-id="text-editor"> <state line="635" column="8" selection-start="24247" selection-end="24255" vertical-scroll-proportion="0.33939394" /> @@ -609,21 +620,30 @@ <state line="12" column="22" selection-start="388" selection-end="388" vertical-scroll-proportion="0.26745912" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/scim-test.json"> + <entry file="file://$PROJECT_DIR$/scim-add-group.json"> <provider selected="true" editor-type-id="text-editor"> - <state line="4" column="55" selection-start="173" selection-end="211" vertical-scroll-proportion="0.0"> + <state line="5" column="1" selection-start="129" selection-end="129" vertical-scroll-proportion="0.0" /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/templates/oauth2_lite_client/oauth2_lite_client.html"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="0" selection-start="375" selection-end="375" vertical-scroll-proportion="0.2542373"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/scim-add-group.json"> + <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/oauth2_client.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="1" selection-start="129" selection-end="129" vertical-scroll-proportion="0.0" /> + <state line="77" column="30" selection-start="2548" selection-end="2552" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../django-box/django_box/__init__.py"> + <entry file="file://$PROJECT_DIR$/../django-box/django_box/views.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="0" selection-start="1064" selection-end="1064" vertical-scroll-proportion="0.0" /> + <state line="21" column="39" selection-start="669" selection-end="670" vertical-scroll-proportion="0.4011887"> + <folding /> + </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/../django-box/django_box/urls.py"> @@ -631,50 +651,71 @@ <state line="3" column="27" selection-start="111" selection-end="111" vertical-scroll-proportion="0.0" /> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/templates/oauth2_lite_client/oauth2_lite_client.html"> + <entry file="file://$PROJECT_DIR$/scim-test.json"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="375" selection-end="375" vertical-scroll-proportion="0.2542373"> + <state line="4" column="55" selection-start="173" selection-end="211" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../django-box/django_box/views.py"> + <entry file="file://$PROJECT_DIR$/../django-box/django_box/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="39" selection-start="670" selection-end="670" vertical-scroll-proportion="0.0"> + <state line="33" column="28" selection-start="1003" selection-end="1009" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/oauth2_client.py"> + <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/models.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="64" column="0" selection-start="2085" selection-end="2085" vertical-scroll-proportion="0.0"> + <state line="15" column="54" selection-start="674" selection-end="674" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/../django-oauth2-lite-client/oauth2_lite_client/models.py"> + <entry file="file://$PROJECT_DIR$/asgard/settings.d/10-apps.conf"> <provider selected="true" editor-type-id="text-editor"> - <state line="13" column="44" selection-start="560" selection-end="560" vertical-scroll-proportion="0.0"> + <state line="14" column="23" selection-start="345" selection-end="345" vertical-scroll-proportion="0.31203565"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/coip/settings.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="98" column="1" selection-start="3356" selection-end="3357" vertical-scroll-proportion="0.20802377"> + <state line="125" column="23" selection-start="3994" selection-end="3994" vertical-scroll-proportion="0.8098068"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/coip/apps/sts/__init__.py"> + <entry file="file://$PROJECT_DIR$/coip/apps/services/__init__.py"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="18" selection-start="598" selection-end="598" vertical-scroll-proportion="0.60178304"> + <state line="20" column="19" selection-start="527" selection-end="527" vertical-scroll-proportion="0.0"> <folding> <element signature="e#23#55#0" expanded="true" /> </folding> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/../django-box/django_box/models.py"> + <provider selected="true" editor-type-id="text-editor"> + <state line="11" column="58" selection-start="385" selection-end="385" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/coip/apps/link/models.py"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/coip/apps/name/models.py"> + <provider selected="true" editor-type-id="text-editor"> + <state line="263" column="95" selection-start="8501" selection-end="8501" vertical-scroll-proportion="0.83573484"> + <folding /> + </state> + </provider> + </entry> </component> </project> |