Feature #4061 #172
Closed
Feature #4061 #172
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added tables : - SC_Contact_Company (company list for contacts) - SC_Contact_Company_Rel (relation table between a company and a contact from SC_Contact_Contact
…ctions Syntax correction in scripts
New table : SC_Contact_GenericContact
…ponents into contact-with-company
…ponents into contact-with-company
…ponents into contact-with-company
…into contact-with-company Conflicts: yellowpages/yellowpages-ejb/pom.xml
…into contact-with-company
…s d'accès dans tableau des companies (onglets gestion et consultation)
…y autocomplete plugin
…y autocomplete plugin
This reverts commit 3b3ed7e.
This reverts commit d90ccb4.
…into contact-with-company Conflicts: yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/control/ejb/YellowpagesBmEJB.java
…into contact-with-company
…into contact-with-company
…into contact-with-company Conflicts: .gitignore yellowpages/yellowpages-config/src/main/config/dbRepository/data/mssql/yellowpages-contribution.xml yellowpages/yellowpages-config/src/main/config/dbRepository/data/oracle/yellowpages-contribution.xml yellowpages/yellowpages-config/src/main/config/dbRepository/data/postgres/yellowpages-contribution.xml yellowpages/yellowpages-config/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle.properties yellowpages/yellowpages-config/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_de.properties yellowpages/yellowpages-config/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_en.properties yellowpages/yellowpages-config/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_fr.properties yellowpages/yellowpages-config/src/main/config/properties/org/silverpeas/yellowpages/settings/yellowpagesSettings.properties yellowpages/yellowpages-config/src/main/config/silvertrace/messages/yellowpagesMessages_en.properties yellowpages/yellowpages-config/src/main/config/silvertrace/messages/yellowpagesMessages_fr.properties yellowpages/yellowpages-ejb/pom.xml yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/YellowpagesException.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/YellowpagesInstanciator.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/YellowpagesStatistics.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/control/ejb/YellowpagesBm.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/control/ejb/YellowpagesBmEJB.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/control/ejb/YellowpagesBmHome.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/control/ejb/YellowpagesBmSkeleton.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/dao/GroupDAO.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/model/GroupDetail.java yellowpages/yellowpages-ejb/src/main/java/com/stratelia/webactiv/yellowpages/model/TopicDetail.java yellowpages/yellowpages-war/src/main/java/com/stratelia/webactiv/yellowpages/YellowpagesIndexer.java yellowpages/yellowpages-war/src/main/java/com/stratelia/webactiv/yellowpages/control/YellowpagesSessionController.java yellowpages/yellowpages-war/src/main/java/com/stratelia/webactiv/yellowpages/servlets/YellowpagesRequestRouter.java yellowpages/yellowpages-war/src/main/webapp/WEB-INF/web.xml yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/annuaire.jsp yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/contactManager.jsp yellowpages/yellowpages-war/src/main/webapp/yellowpages/jsp/topicManager.jsp
…into contact-with-company
…into contact-with-company
remove commented code
fix company icon
- adding gallery REST Web-Services - adding JavaScript galleria plugin - centralizing and packaging the notifier JavaScript plugin - modifying notifier plugin calls in kmelia application - displaying slide show into popup dialog
…into contact-with-company Conflicts: gallery/gallery-war/src/main/java/com/silverpeas/gallery/web/AbstractGalleryResource.java gallery/gallery-war/src/main/java/com/silverpeas/gallery/web/GalleryResource.java gallery/gallery-war/src/main/java/com/silverpeas/gallery/web/GalleryResourceURIs.java gallery/gallery-war/src/main/java/com/silverpeas/gallery/web/PhotoEntity.java gallery/gallery-war/src/test/java/com/silverpeas/gallery/web/GalleryResourceMock.java gallery/gallery-war/src/test/java/com/silverpeas/gallery/web/PhotoEntityMatcher.java
…into contact-with-company Conflicts: yellowpages/yellowpages-war/src/main/java/com/stratelia/webactiv/yellowpages/control/YellowpagesSessionController.java
|
Silverpeas » Silverpeas-Components #54 FAILURE |
|
Silverpeas » Silverpeas-Components #55 FAILURE |
|
The branch is out of sync with master. |
|
Indeed, the branch is out of sync, the request was done 4 months ago. |
|
This PR is out of sync and hasn't been updated since my last report. So I decide to reject it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.