refs #33259
refs #33259
refs #33259
Revert "refs #33259"

This reverts commit b17a9a7030997ce356ad570fe9bc8abd3065c2ee.
refs #33259
Merge branch 'features/activity-filter-top' into
features/activity-filter-top2

Conflicts:
	core/src/main/java/com/aimluck/eip/services/social/model/ALActivityGetRequest.java
	portlets/activity/src/main/java/com/aimluck/eip/activity/ActivityAllSelectData.java
	portlets/activity/src/main/java/com/aimluck/eip/modules/actions/activity/ActivityAction.java
	portlets/activity/src/main/webapp/WEB-INF/templates/vm/portlets/html/ajax-activity-all.vm
	portlets/activity/src/main/webapp/WEB-INF/templates/vm/portlets/html/ja/ajax-activity-all.vm
	portlets/activity/src/main/webapp/javascript/aipo/activity/form.js
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_de.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_el.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_en.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_es.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_fr.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_it.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_ja.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_ko.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_my.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_nl.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_no.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_pl.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_pt.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_tr.properties
	war/src/main/resources/com/aimluck/eip/modules/localization/AipoLocalization_zh.properties
refs #33259
最大化画面でのPSMLの保存の実装
最大化画面でのアプリの切り替えの実装
マイページでページングのボタンが余計に表示されていた箇所を修正
refs #33259
最大化画面でのアプリの絞込み機能の実装と
xアイコンで部署の絞り込みを解除できなかった問題の修正
refs #33259
ACTIVITY_GROUP=グループをCOMMON_GROUPに統一
refs #33732
refs #33182
refs #33259
refs #33182
refs #33737
refs #33841
Merge pull request #611 from aipocom/bugfix/timeline-parser-error

refs #33732
Merge pull request #612 from aipocom/features/img-thumbnail-style3

Features/img thumbnail style3
refs #33839
refs #33840
refs #33840
refs #33839