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.

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

SOS-2582 #196

Open
wants to merge 2 commits into
base: 6.2.x
Choose a base branch
from
Open

SOS-2582 #196

wants to merge 2 commits into from

Conversation

alekiy
Copy link

@alekiy alekiy commented Feb 16, 2016

added german translation for notification portlet

Clickmari pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Dec 7, 2016
Conflicts:
	portlets/override-help-icon-portlet/docroot/WEB-INF/lib/commons-logging.jar
	portlets/override-help-icon-portlet/docroot/WEB-INF/lib/log4j.jar
	portlets/override-help-icon-portlet/docroot/WEB-INF/lib/util-bridges.jar
	portlets/override-help-icon-portlet/docroot/WEB-INF/lib/util-java.jar
	portlets/override-help-icon-portlet/docroot/WEB-INF/lib/util-taglib.jar
	portlets/up-activities-portlet/docroot/WEB-INF/lib/up-activities-portlet-service.jar
	portlets/up-activities-portlet/docroot/WEB-INF/src/content/Language_de.properties
	portlets/up-activities-portlet/docroot/WEB-INF/src/content/Language_en.properties
	portlets/up-activities-portlet/docroot/WEB-INF/src/de/unipotsdam/elis/activities/ActivitiesPortlet.java
	portlets/up-activities-portlet/docroot/WEB-INF/src/de/unipotsdam/elis/activities/extservice/moodle/rest/MoodleRestClient.java
	portlets/up-activities-portlet/docroot/WEB-INF/src/de/unipotsdam/elis/activities/hooks/interpreter/PortfolioActivityInterpreter.java
	portlets/up-activities-portlet/docroot/WEB-INF/src/portlet.properties
	portlets/up-activities-portlet/docroot/WEB-INF/src/service.properties
	portlets/up-activities-portlet/docroot/html/init.jsp
	portlets/up-activities-portlet/docroot/html/view_activity_sets.jsp
	portlets/up-activities-portlet/docroot/html/view_activity_sets_feed.jspf
	themes/so-up-theme
alekiy pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Sep 13, 2017
alekiy pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Sep 13, 2017
alekiy pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Sep 13, 2017
alekiy pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Sep 13, 2017
alekiy pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Sep 13, 2017
alekiy pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Sep 13, 2017
alekiy pushed a commit to University-of-Potsdam-MM/liferay-plugins that referenced this pull request Sep 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant