Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-35207 #11350

Closed
wants to merge 11 commits into from
Closed

LPS-35207 #11350

wants to merge 11 commits into from

Conversation

marcellustavares
Copy link

No description provided.

Eduardo Garcia and others added 11 commits May 27, 2013 17:51
@marcellustavares
LPS-35207 Move storageType autopropagated parameter to DDMDisplay
7130c3b 
Conflicts:
	portal-impl/src/com/liferay/portlet/documentlibrary/ddm/DLDDMDisplay.java
	portal-impl/src/com/liferay/portlet/journal/ddm/JournalDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/DDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
@marcellustavares
LPS-35207 Source formatting
060b1aa
@marcellustavares
LPS-35207 Move structureType autopropagated parameter to DDMDisplay
b32370c 
Conflicts:
	portal-impl/src/com/liferay/portlet/documentlibrary/ddm/DLDDMDisplay.java
	portal-impl/src/com/liferay/portlet/journal/ddm/JournalDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/DDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
@marcellustavares
LPS-35207 Source formatting
9d5fe65
@marcellustavares
LPS-35207 Move structureName autopropagated parameter to DDMDisplay
3986fce 
Conflicts:
	portal-impl/src/com/liferay/portlet/documentlibrary/ddm/DLDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
@marcellustavares
LPS-35207 Source formatting
40fbb72
@marcellustavares
LPS-35207 Move templateType autopropagated parameter to DDMDisplay
17d250a 
Conflicts:
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
@marcellustavares
LPS-35207 Move avaliableFields autopropagated parameter to DDMDisplay
acec0b6 
Conflicts:
	portal-impl/src/com/liferay/portlet/journal/ddm/JournalDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/DDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
@marcellustavares
LPS-35207 Source formatting
1388123
@marcellustavares
LPS-35207 Move templateMode autopropagated parameter to DDMDisplay
83ab745 
Conflicts:
	portal-service/src/com/liferay/portlet/dynamicdatamapping/util/BaseDDMDisplay.java
	portal-web/docroot/html/portlet/dynamic_data_mapping/init.jsp
@marcellustavares
LPS-35207 Source formatting
5303226
@liferay-dev-ci
Copy link

Some tests have FAILED. ❌
Please use the following link to check if any of them are related to your changes.
Refer to this link for build results: http://ci.liferay.org.es/jenkins/job/brianchandotcom/2279/

@brianchandotcom
Copy link
Owner

Merged. Thank you.
View total diff: 902fc3d...e306ac9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marcellustavares @liferay-dev-ci @brianchandotcom