summaryrefslogtreecommitdiffstats
path: root/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js
AgeCommit message (Collapse)AuthorFilesLines
2018-05-30removed fields from LA EP and LKGArielk1-2/+0
Change-Id: I20b9d81721125ac19c2910a36e11290c3fda27bd Issue-ID: SDC-1381 Signed-off-by: Arielk <Ariel.Kenan@amdocs.com>
2018-03-20Adding Prettier and fixing up eslint versionEinav Weiss Keidar1-390/+491
Issue-ID: SDC-1094 Change-Id: Ie83ad95a03899345dd90235daf0323cbe3bc6afd Signed-off-by: Einav Weiss Keidar <einavw@amdocs.com>
2018-01-09Change variable names to catalogilanap1-2/+2
Change-Id: Iaa4f2143840de47feaf25d110144cd762f6ff8ec Issue-ID: SDC-887 Signed-off-by: ilanap <ilanap@amdocs.com>
2017-12-21Add collaboration featuretalig1-0/+443
Issue-ID: SDC-767 Change-Id: I14fb4c1f54086ed03a56a7ff7fab9ecd40381795 Signed-off-by: talig <talig@amdocs.com>