Commit b867c5ab authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'B5677-TinyMCE'

parents b3635483 93395531
......@@ -34,6 +34,9 @@ qfq.zip:
clean:
cd doc/diagram ; $(MAKE) $@
update-qfq-doc: ../qfq-doc/Documentation
rsync -av --delete --exclude=_make --exclude=_static extension/Documentation/ ../qfq-doc/Documentation/
git-revision: make-dist-dir
echo $(GIT_REVISION_LONG) > $(DISTDIR)/revision.git
......@@ -70,7 +73,8 @@ t3sphinx: .virtual_env
plantuml:
cd doc/diagram ; $(MAKE)
bootstrap: .phpdocinstall .npmpackages .bowerpackages .plantuml_install .virtual_env .sonar_scanner
#bootstrap: .phpdocinstall .npmpackages .bowerpackages .plantuml_install .virtual_env .sonar_scanner
bootstrap: .phpdocinstall .npmpackages .bowerpackages .plantuml_install .virtual_env
npm update
bower update
grunt default
......@@ -135,7 +139,8 @@ sonar: .sonar_scanner
support/sonar/sonar-scanner-$(SONAR_SCANNER_VERSION)-linux/bin/sonar-scanner
.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist make-dist-dir dist-move-doc dist-copy-extension pip-temp-directory plantuml sonar
#.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist make-dist-dir dist-move-doc dist-copy-extension pip-temp-directory plantuml sonar
.PHONY: nightly maintainer-clean snapshot release git-revision t3sphinx build-dist make-dist-dir dist-move-doc dist-copy-extension pip-temp-directory plantuml
copyReleaseNotes:
cp extension/Documentation/Release.rst extension/RELEASE.txt
......
......@@ -87,7 +87,7 @@ try {
switch ($modeAnswer) {
case MODE_JSON:
if ($flagSuccess) {
$answer[API_MESSAGE] = 'Delete';
$answer[API_MESSAGE] = 'Deleted';
$answer[API_REDIRECT] = API_ANSWER_REDIRECT_CLIENT;
$answer[API_STATUS] = API_ANSWER_STATUS_SUCCESS;
} else {
......
......@@ -63,7 +63,7 @@ try {
$answer[API_REDIRECT_URL] = $arr[API_REDIRECT_URL];
$answer[API_STATUS] = API_ANSWER_STATUS_SUCCESS;
$answer[API_MESSAGE] = 'Save';
$answer[API_MESSAGE] = 'Saved';
if (isset($data[API_ELEMENT_UPDATE])) {
$answer[API_ELEMENT_UPDATE] = $data[API_ELEMENT_UPDATE];
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment