Commit d8bc27d7692f6dc74a5abfea85b77dcddf75da94
1 parent
09bec8e5ae
Exists in
master
añadido las imagenes de la aplicacion para no tener que copiar y pegar
Showing
3 changed files
with
27 additions
and
160 deletions
Show diff stats
.gitignore
.idea/workspace.xml
@@ -249,6 +249,8 @@ | @@ -249,6 +249,8 @@ | ||
249 | <change type="DELETED" beforePath="$PROJECT_DIR$/web/uploads/adscripcion/fdf418f4eb96f40d346962a035a0dad6.pdf" afterPath="" /> | 249 | <change type="DELETED" beforePath="$PROJECT_DIR$/web/uploads/adscripcion/fdf418f4eb96f40d346962a035a0dad6.pdf" afterPath="" /> |
250 | <change type="DELETED" beforePath="$PROJECT_DIR$/web/uploads/adscripcion/fe3f9acc04628f989a361ec32f9b92b9.pdf" afterPath="" /> | 250 | <change type="DELETED" beforePath="$PROJECT_DIR$/web/uploads/adscripcion/fe3f9acc04628f989a361ec32f9b92b9.pdf" afterPath="" /> |
251 | <change type="DELETED" beforePath="$PROJECT_DIR$/web/uploads/adscripcion/ffa341924faa4a312785b1416cb9ed10.pdf" afterPath="" /> | 251 | <change type="DELETED" beforePath="$PROJECT_DIR$/web/uploads/adscripcion/ffa341924faa4a312785b1416cb9ed10.pdf" afterPath="" /> |
252 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> | ||
253 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
252 | </list> | 254 | </list> |
253 | <ignored path="sym_cea.iws" /> | 255 | <ignored path="sym_cea.iws" /> |
254 | <ignored path=".idea/workspace.xml" /> | 256 | <ignored path=".idea/workspace.xml" /> |
@@ -324,10 +326,10 @@ | @@ -324,10 +326,10 @@ | ||
324 | </provider> | 326 | </provider> |
325 | </entry> | 327 | </entry> |
326 | </file> | 328 | </file> |
327 | - <file leaf-file-name="Adscripcion.php" pinned="false" current-in-tab="true"> | 329 | + <file leaf-file-name="Adscripcion.php" pinned="false" current-in-tab="false"> |
328 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Adscripcion.php"> | 330 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Adscripcion.php"> |
329 | <provider selected="true" editor-type-id="text-editor"> | 331 | <provider selected="true" editor-type-id="text-editor"> |
330 | - <state vertical-scroll-proportion="0.27731094"> | 332 | + <state vertical-scroll-proportion="-3.413793"> |
331 | <caret line="52" column="96" selection-start-line="52" selection-start-column="96" selection-end-line="52" selection-end-column="96" /> | 333 | <caret line="52" column="96" selection-start-line="52" selection-start-column="96" selection-end-line="52" selection-end-column="96" /> |
332 | <folding> | 334 | <folding> |
333 | <element signature="e#6#97#0#PHP" expanded="true" /> | 335 | <element signature="e#6#97#0#PHP" expanded="true" /> |
@@ -336,6 +338,16 @@ | @@ -336,6 +338,16 @@ | ||
336 | </provider> | 338 | </provider> |
337 | </entry> | 339 | </entry> |
338 | </file> | 340 | </file> |
341 | + <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> | ||
342 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | ||
343 | + <provider selected="true" editor-type-id="text-editor"> | ||
344 | + <state vertical-scroll-proportion="0.0"> | ||
345 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
346 | + <folding /> | ||
347 | + </state> | ||
348 | + </provider> | ||
349 | + </entry> | ||
350 | + </file> | ||
339 | <file leaf-file-name="DefaultController.php" pinned="false" current-in-tab="false"> | 351 | <file leaf-file-name="DefaultController.php" pinned="false" current-in-tab="false"> |
340 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/DefaultController.php"> | 352 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/DefaultController.php"> |
341 | <provider selected="true" editor-type-id="text-editor"> | 353 | <provider selected="true" editor-type-id="text-editor"> |
@@ -361,7 +373,6 @@ | @@ -361,7 +373,6 @@ | ||
361 | <component name="IdeDocumentHistory"> | 373 | <component name="IdeDocumentHistory"> |
362 | <option name="CHANGED_PATHS"> | 374 | <option name="CHANGED_PATHS"> |
363 | <list> | 375 | <list> |
364 | - <option value="$PROJECT_DIR$/src/AppBundle/Entity/DocumentoIdentidad.php" /> | ||
365 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/TipoPersona.php" /> | 376 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/TipoPersona.php" /> |
366 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Estatus.php" /> | 377 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Estatus.php" /> |
367 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/RolInstitucion.php" /> | 378 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/RolInstitucion.php" /> |
@@ -412,6 +423,7 @@ | @@ -412,6 +423,7 @@ | ||
412 | <option value="$PROJECT_DIR$/src/AppBundle/Controller/RegistrationController.php" /> | 423 | <option value="$PROJECT_DIR$/src/AppBundle/Controller/RegistrationController.php" /> |
413 | <option value="$PROJECT_DIR$/src/AppBundle/Form/UserType.php" /> | 424 | <option value="$PROJECT_DIR$/src/AppBundle/Form/UserType.php" /> |
414 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Adscripcion.php" /> | 425 | <option value="$PROJECT_DIR$/src/AppBundle/Entity/Adscripcion.php" /> |
426 | + <option value="$PROJECT_DIR$/.gitignore" /> | ||
415 | </list> | 427 | </list> |
416 | </option> | 428 | </option> |
417 | </component> | 429 | </component> |
@@ -484,153 +496,7 @@ | @@ -484,153 +496,7 @@ | ||
484 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 496 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
485 | </PATH_ELEMENT> | 497 | </PATH_ELEMENT> |
486 | <PATH_ELEMENT> | 498 | <PATH_ELEMENT> |
487 | - <option name="myItemId" value="src" /> | ||
488 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
489 | - </PATH_ELEMENT> | ||
490 | - </PATH> | ||
491 | - <PATH> | ||
492 | - <PATH_ELEMENT> | ||
493 | - <option name="myItemId" value="sym_cea" /> | ||
494 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
495 | - </PATH_ELEMENT> | ||
496 | - <PATH_ELEMENT> | ||
497 | - <option name="myItemId" value="cea_sym" /> | ||
498 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
499 | - </PATH_ELEMENT> | ||
500 | - <PATH_ELEMENT> | ||
501 | - <option name="myItemId" value="src" /> | ||
502 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
503 | - </PATH_ELEMENT> | ||
504 | - <PATH_ELEMENT> | ||
505 | - <option name="myItemId" value="AppBundle" /> | ||
506 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
507 | - </PATH_ELEMENT> | ||
508 | - </PATH> | ||
509 | - <PATH> | ||
510 | - <PATH_ELEMENT> | ||
511 | - <option name="myItemId" value="sym_cea" /> | ||
512 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
513 | - </PATH_ELEMENT> | ||
514 | - <PATH_ELEMENT> | ||
515 | - <option name="myItemId" value="cea_sym" /> | ||
516 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
517 | - </PATH_ELEMENT> | ||
518 | - <PATH_ELEMENT> | ||
519 | - <option name="myItemId" value="src" /> | ||
520 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
521 | - </PATH_ELEMENT> | ||
522 | - <PATH_ELEMENT> | ||
523 | - <option name="myItemId" value="AppBundle" /> | ||
524 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
525 | - </PATH_ELEMENT> | ||
526 | - <PATH_ELEMENT> | ||
527 | - <option name="myItemId" value="Entity" /> | ||
528 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
529 | - </PATH_ELEMENT> | ||
530 | - </PATH> | ||
531 | - <PATH> | ||
532 | - <PATH_ELEMENT> | ||
533 | - <option name="myItemId" value="sym_cea" /> | ||
534 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
535 | - </PATH_ELEMENT> | ||
536 | - <PATH_ELEMENT> | ||
537 | - <option name="myItemId" value="cea_sym" /> | ||
538 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
539 | - </PATH_ELEMENT> | ||
540 | - <PATH_ELEMENT> | ||
541 | - <option name="myItemId" value="app" /> | ||
542 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
543 | - </PATH_ELEMENT> | ||
544 | - </PATH> | ||
545 | - <PATH> | ||
546 | - <PATH_ELEMENT> | ||
547 | - <option name="myItemId" value="sym_cea" /> | ||
548 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
549 | - </PATH_ELEMENT> | ||
550 | - <PATH_ELEMENT> | ||
551 | - <option name="myItemId" value="cea_sym" /> | ||
552 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
553 | - </PATH_ELEMENT> | ||
554 | - <PATH_ELEMENT> | ||
555 | - <option name="myItemId" value="app" /> | ||
556 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
557 | - </PATH_ELEMENT> | ||
558 | - <PATH_ELEMENT> | ||
559 | - <option name="myItemId" value="Resources" /> | ||
560 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
561 | - </PATH_ELEMENT> | ||
562 | - <PATH_ELEMENT> | ||
563 | - <option name="myItemId" value="views" /> | ||
564 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
565 | - </PATH_ELEMENT> | ||
566 | - </PATH> | ||
567 | - <PATH> | ||
568 | - <PATH_ELEMENT> | ||
569 | - <option name="myItemId" value="sym_cea" /> | ||
570 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
571 | - </PATH_ELEMENT> | ||
572 | - <PATH_ELEMENT> | ||
573 | - <option name="myItemId" value="cea_sym" /> | ||
574 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
575 | - </PATH_ELEMENT> | ||
576 | - <PATH_ELEMENT> | ||
577 | - <option name="myItemId" value="app" /> | ||
578 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
579 | - </PATH_ELEMENT> | ||
580 | - <PATH_ELEMENT> | ||
581 | - <option name="myItemId" value="Resources" /> | ||
582 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
583 | - </PATH_ELEMENT> | ||
584 | - <PATH_ELEMENT> | ||
585 | - <option name="myItemId" value="views" /> | ||
586 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
587 | - </PATH_ELEMENT> | ||
588 | - <PATH_ELEMENT> | ||
589 | - <option name="myItemId" value="registration" /> | ||
590 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
591 | - </PATH_ELEMENT> | ||
592 | - </PATH> | ||
593 | - <PATH> | ||
594 | - <PATH_ELEMENT> | ||
595 | - <option name="myItemId" value="sym_cea" /> | ||
596 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
597 | - </PATH_ELEMENT> | ||
598 | - <PATH_ELEMENT> | ||
599 | - <option name="myItemId" value="cea_sym" /> | ||
600 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
601 | - </PATH_ELEMENT> | ||
602 | - <PATH_ELEMENT> | ||
603 | - <option name="myItemId" value="app" /> | ||
604 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
605 | - </PATH_ELEMENT> | ||
606 | - <PATH_ELEMENT> | ||
607 | - <option name="myItemId" value="Resources" /> | ||
608 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
609 | - </PATH_ELEMENT> | ||
610 | - <PATH_ELEMENT> | ||
611 | - <option name="myItemId" value="views" /> | ||
612 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
613 | - </PATH_ELEMENT> | ||
614 | - <PATH_ELEMENT> | ||
615 | - <option name="myItemId" value="default" /> | ||
616 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
617 | - </PATH_ELEMENT> | ||
618 | - </PATH> | ||
619 | - <PATH> | ||
620 | - <PATH_ELEMENT> | ||
621 | - <option name="myItemId" value="sym_cea" /> | ||
622 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
623 | - </PATH_ELEMENT> | ||
624 | - <PATH_ELEMENT> | ||
625 | - <option name="myItemId" value="cea_sym" /> | ||
626 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
627 | - </PATH_ELEMENT> | ||
628 | - <PATH_ELEMENT> | ||
629 | - <option name="myItemId" value="app" /> | ||
630 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
631 | - </PATH_ELEMENT> | ||
632 | - <PATH_ELEMENT> | ||
633 | - <option name="myItemId" value="Resources" /> | 499 | + <option name="myItemId" value="web" /> |
634 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 500 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
635 | </PATH_ELEMENT> | 501 | </PATH_ELEMENT> |
636 | </PATH> | 502 | </PATH> |
@@ -807,14 +673,6 @@ | @@ -807,14 +673,6 @@ | ||
807 | <watches-manager /> | 673 | <watches-manager /> |
808 | </component> | 674 | </component> |
809 | <component name="editorHistoryManager"> | 675 | <component name="editorHistoryManager"> |
810 | - <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/RolInstitucion.php"> | ||
811 | - <provider selected="true" editor-type-id="text-editor"> | ||
812 | - <state vertical-scroll-proportion="5.3333335"> | ||
813 | - <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> | ||
814 | - <folding /> | ||
815 | - </state> | ||
816 | - </provider> | ||
817 | - </entry> | ||
818 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Role.php"> | 676 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Role.php"> |
819 | <provider selected="true" editor-type-id="text-editor"> | 677 | <provider selected="true" editor-type-id="text-editor"> |
820 | <state vertical-scroll-proportion="-8.666667"> | 678 | <state vertical-scroll-proportion="-8.666667"> |
@@ -1196,7 +1054,7 @@ | @@ -1196,7 +1054,7 @@ | ||
1196 | </entry> | 1054 | </entry> |
1197 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Adscripcion.php"> | 1055 | <entry file="file://$PROJECT_DIR$/src/AppBundle/Entity/Adscripcion.php"> |
1198 | <provider selected="true" editor-type-id="text-editor"> | 1056 | <provider selected="true" editor-type-id="text-editor"> |
1199 | - <state vertical-scroll-proportion="0.27731094"> | 1057 | + <state vertical-scroll-proportion="-3.413793"> |
1200 | <caret line="52" column="96" selection-start-line="52" selection-start-column="96" selection-end-line="52" selection-end-column="96" /> | 1058 | <caret line="52" column="96" selection-start-line="52" selection-start-column="96" selection-end-line="52" selection-end-column="96" /> |
1201 | <folding> | 1059 | <folding> |
1202 | <element signature="e#6#97#0#PHP" expanded="true" /> | 1060 | <element signature="e#6#97#0#PHP" expanded="true" /> |
@@ -1204,5 +1062,13 @@ | @@ -1204,5 +1062,13 @@ | ||
1204 | </state> | 1062 | </state> |
1205 | </provider> | 1063 | </provider> |
1206 | </entry> | 1064 | </entry> |
1065 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | ||
1066 | + <provider selected="true" editor-type-id="text-editor"> | ||
1067 | + <state vertical-scroll-proportion="0.0"> | ||
1068 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
1069 | + <folding /> | ||
1070 | + </state> | ||
1071 | + </provider> | ||
1072 | + </entry> | ||
1207 | </component> | 1073 | </component> |
1208 | </project> | 1074 | </project> |
1209 | \ No newline at end of file | 1075 | \ No newline at end of file |
web/bundles/framework