|
@@ -2,7 +2,12 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="3c5ee217-7f14-4e90-abcb-4d394d69ee22" name="Default Changelist" comment="">
|
|
|
+ <change afterPath="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/auteur.html.twig" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/DocumentBundle/Entity/Auteur.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Entity/Auteur.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/DocumentBundle/Entity/Livre.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Entity/Livre.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -47,9 +52,9 @@
|
|
|
<entry key="html" value="2" />
|
|
|
<entry key="ico" value="1" />
|
|
|
<entry key="log" value="1" />
|
|
|
- <entry key="php" value="39" />
|
|
|
+ <entry key="php" value="43" />
|
|
|
<entry key="png" value="1" />
|
|
|
- <entry key="twig" value="16" />
|
|
|
+ <entry key="twig" value="17" />
|
|
|
<entry key="yml" value="20" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
@@ -58,9 +63,9 @@
|
|
|
<entry key="CSS" value="1" />
|
|
|
<entry key="HTML" value="2" />
|
|
|
<entry key="Image" value="2" />
|
|
|
- <entry key="PHP" value="31" />
|
|
|
+ <entry key="PHP" value="35" />
|
|
|
<entry key="PLAIN_TEXT" value="9" />
|
|
|
- <entry key="Twig" value="16" />
|
|
|
+ <entry key="Twig" value="17" />
|
|
|
<entry key="YAML" value="20" />
|
|
|
<entry key="htaccess" value="1" />
|
|
|
</counts>
|
|
@@ -70,8 +75,8 @@
|
|
|
<entry key="css" value="30" />
|
|
|
<entry key="dummy" value="26" />
|
|
|
<entry key="html" value="2" />
|
|
|
- <entry key="php" value="4417" />
|
|
|
- <entry key="twig" value="1993" />
|
|
|
+ <entry key="php" value="5152" />
|
|
|
+ <entry key="twig" value="2292" />
|
|
|
<entry key="txt" value="1" />
|
|
|
<entry key="yml" value="264" />
|
|
|
</counts>
|
|
@@ -80,9 +85,9 @@
|
|
|
<counts>
|
|
|
<entry key="CSS" value="30" />
|
|
|
<entry key="HTML" value="2" />
|
|
|
- <entry key="PHP" value="3603" />
|
|
|
+ <entry key="PHP" value="4338" />
|
|
|
<entry key="PLAIN_TEXT" value="841" />
|
|
|
- <entry key="Twig" value="1993" />
|
|
|
+ <entry key="Twig" value="2292" />
|
|
|
<entry key="YAML" value="264" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
@@ -104,99 +109,94 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="374">
|
|
|
- <caret line="41" column="42" selection-start-line="41" selection-start-column="42" selection-end-line="41" selection-end-column="42" />
|
|
|
+ <state relative-caret-position="389">
|
|
|
+ <caret line="41" column="30" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
|
|
|
<folding>
|
|
|
<element signature="e#45#102#0#PHP" expanded="true" />
|
|
|
<element signature="e#477#513#0#PHP" expanded="true" />
|
|
|
<element signature="e#821#843#1#PHP" expanded="true" />
|
|
|
<element signature="e#848#884#0#PHP" expanded="true" />
|
|
|
- <element signature="e#1067#1106#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#1254#1277#1#PHP" expanded="true" />
|
|
|
+ <element signature="e#1345#1382#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#1566#1605#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Auteur.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/auteur.html.twig">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="23" column="7" selection-start-line="23" selection-start-column="7" selection-end-line="23" selection-end-column="7" />
|
|
|
+ <state relative-caret-position="300">
|
|
|
+ <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Livre.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="419">
|
|
|
- <caret line="143" column="6" lean-forward="true" selection-start-line="143" selection-start-column="6" selection-end-line="143" selection-end-column="6" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Repository/AuteurRepository.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/config/config.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Auteur.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="600">
|
|
|
- <caret line="40" column="9" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="255">
|
|
|
+ <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/config/parameters.yml">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Invite.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="180">
|
|
|
- <caret line="12" selection-start-line="12" selection-end-line="12" />
|
|
|
+ <state relative-caret-position="315">
|
|
|
+ <caret line="35" column="20" lean-forward="true" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Classe/Bouquin.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Repository/InviteRepository.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="270">
|
|
|
- <caret line="18" column="24" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
|
|
|
- <folding>
|
|
|
- <element signature="e#6#88#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="195">
|
|
|
+ <caret line="13" selection-start-line="13" selection-end-line="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Livre.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="269">
|
|
|
- <caret line="24" column="39" selection-start-line="24" selection-start-column="39" selection-end-line="24" selection-end-column="39" />
|
|
|
+ <state relative-caret-position="285">
|
|
|
+ <caret line="52" column="72" selection-start-line="52" selection-start-column="72" selection-end-line="52" selection-end-column="72" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Resources/views/layout.html.twig">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Repository/LivreRepository.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="405">
|
|
|
- <caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
|
|
|
+ <state relative-caret-position="195">
|
|
|
+ <caret line="13" selection-start-line="13" selection-end-line="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/config/parameters.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="45">
|
|
|
- <caret line="3" column="32" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="32" />
|
|
|
+ <state relative-caret-position="180">
|
|
|
+ <caret line="12" selection-start-line="12" selection-end-line="12" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/acces.html.twig">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state>
|
|
|
- <caret column="14" selection-start-column="3" selection-end-column="14" />
|
|
|
+ <state relative-caret-position="224">
|
|
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -244,9 +244,12 @@
|
|
|
<option value="$PROJECT_DIR$/src/DocumentBundle/Classe/Livre.php" />
|
|
|
<option value="$PROJECT_DIR$/app/config/parameters.yml" />
|
|
|
<option value="$PROJECT_DIR$/src/DocumentBundle/Classe/Bouquin.php" />
|
|
|
- <option value="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" />
|
|
|
<option value="$PROJECT_DIR$/src/DocumentBundle/Entity/Livre.php" />
|
|
|
<option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig" />
|
|
|
+ <option value="$PROJECT_DIR$/src/DocumentBundle/Entity/Auteur.php" />
|
|
|
+ <option value="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/auteur.html.twig" />
|
|
|
+ <option value="$PROJECT_DIR$/src/DocumentBundle/Entity/Invite.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -395,6 +398,13 @@
|
|
|
<item name="DocumentBundle" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Entity" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
+ <path>
|
|
|
+ <item name="mediatheque" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="mediatheque" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="DocumentBundle" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Repository" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
<path>
|
|
|
<item name="mediatheque" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="mediatheque" type="462c0819:PsiDirectoryNode" />
|
|
@@ -456,6 +466,9 @@
|
|
|
<property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
+ <key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document" />
|
|
|
+ </key>
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
|
<recent name="$PROJECT_DIR$/app/Resources/views" />
|
|
|
<recent name="$PROJECT_DIR$/src/DocumentBundle" />
|
|
@@ -503,18 +516,18 @@
|
|
|
<workItem from="1539690771861" duration="554000" />
|
|
|
<workItem from="1539691350473" duration="10691000" />
|
|
|
<workItem from="1539761038969" duration="7127000" />
|
|
|
- <workItem from="1539768307690" duration="4085000" />
|
|
|
+ <workItem from="1539768307690" duration="9014000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="45028000" />
|
|
|
+ <option name="totallyTimeSpent" value="49957000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="67" y="25" width="1853" height="1055" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27614832" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27614832" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -527,7 +540,7 @@
|
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
|
|
|
- <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4980631" visible="true" weight="0.32864866" />
|
|
|
+ <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.4980631" visible="true" weight="0.32864866" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5019369" side_tool="true" weight="0.32864866" />
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
@@ -736,36 +749,69 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="374">
|
|
|
- <caret line="41" column="42" selection-start-line="41" selection-start-column="42" selection-end-line="41" selection-end-column="42" />
|
|
|
+ <state relative-caret-position="389">
|
|
|
+ <caret line="41" column="30" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
|
|
|
<folding>
|
|
|
<element signature="e#45#102#0#PHP" expanded="true" />
|
|
|
<element signature="e#477#513#0#PHP" expanded="true" />
|
|
|
<element signature="e#821#843#1#PHP" expanded="true" />
|
|
|
<element signature="e#848#884#0#PHP" expanded="true" />
|
|
|
- <element signature="e#1067#1106#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#1254#1277#1#PHP" expanded="true" />
|
|
|
+ <element signature="e#1345#1382#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#1566#1605#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="224">
|
|
|
+ <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/auteur.html.twig">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="300">
|
|
|
+ <caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Auteur.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="23" column="7" selection-start-line="23" selection-start-column="7" selection-end-line="23" selection-end-column="7" />
|
|
|
+ <state relative-caret-position="255">
|
|
|
+ <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Livre.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="419">
|
|
|
- <caret line="143" column="6" lean-forward="true" selection-start-line="143" selection-start-column="6" selection-end-line="143" selection-end-column="6" />
|
|
|
+ <state relative-caret-position="285">
|
|
|
+ <caret line="52" column="72" selection-start-line="52" selection-start-column="72" selection-end-line="52" selection-end-column="72" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Repository/LivreRepository.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="195">
|
|
|
+ <caret line="13" selection-start-line="13" selection-end-line="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Repository/AuteurRepository.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Repository/InviteRepository.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="195">
|
|
|
+ <caret line="13" selection-start-line="13" selection-end-line="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Entity/Invite.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="269">
|
|
|
- <caret line="24" column="39" selection-start-line="24" selection-start-column="39" selection-end-line="24" selection-end-column="39" />
|
|
|
+ <state relative-caret-position="315">
|
|
|
+ <caret line="35" column="20" lean-forward="true" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|