Merge branch 'release/1.0.4'

alkoleft · Sep 26, 2017 · 02caa41 · 02caa41
2 parents 3239697 + 3a6153d
commit 02caa41
Show file tree

Hide file tree

Showing 52 changed files with 12,757 additions and 3,599 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-*.epf
+test_reports/report-allure-testsuite.xml
+build/
+
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "precommit1c"]
+	path = precommit1c
+	url = [email protected]:xDrivenDevelopment/precommit1c.git
diff --git a/CodeConsole83.epf b/CodeConsole83.epf
diff --git a/config.json b/config.json
@@ -0,0 +1,3 @@
+{
+    "proxy": "https://www.google.ru:789"
+}
diff --git a/precommit1c b/precommit1c
diff --git a/...ольКода83/Forms/Форма/Ext/Form/Module.bsl → src/CodeConsole83/Form/Форма/Форма.bsl b/...ольКода83/Forms/Форма/Ext/Form/Module.bsl → src/CodeConsole83/Form/Форма/Форма.bsl
diff --git a/...ФормаНастройкаТаблицы/Ext/Form/Module.bsl → ...le83/Form/ФормаНастройкаТаблицы/Форма.bsl b/...ФормаНастройкаТаблицы/Ext/Form/Module.bsl → ...le83/Form/ФормаНастройкаТаблицы/Форма.bsl
diff --git a/...83/Forms/ФормаСвойств/Ext/Form/Module.bsl → ...CodeConsole83/Form/ФормаСвойств/Форма.bsl b/...83/Forms/ФормаСвойств/Ext/Form/Module.bsl → ...CodeConsole83/Form/ФормаСвойств/Форма.bsl
diff --git a/src/CodeConsole83/maps.txt b/src/CodeConsole83/maps.txt
@@ -0,0 +1,3 @@
+Form\Форма\Форма.bsl-->6e6904e6-445a-4678-957b-e39d02fce6a4.0 (3 977, 6 313)
+Form\ФормаНастройкаТаблицы\Форма.bsl-->a3626ede-5b0a-440b-92ae-ae5ab4b70298.0 (627, 659)
+Form\ФормаСвойств\Форма.bsl-->2160ae20-89a5-4c06-8ef5-261700f38e89.0 (574, 599)
diff --git a/src/CodeConsole83/renames.txt b/src/CodeConsole83/renames.txt
@@ -0,0 +1,11 @@
+2160ae20-89a5-4c06-8ef5-261700f38e89-->und\2160ae20-89a5-4c06-8ef5-261700f38e89
+2160ae20-89a5-4c06-8ef5-261700f38e89.0-->und\2160ae20-89a5-4c06-8ef5-261700f38e89.0
+6e6904e6-445a-4678-957b-e39d02fce6a4-->und\6e6904e6-445a-4678-957b-e39d02fce6a4
+6e6904e6-445a-4678-957b-e39d02fce6a4.0-->und\6e6904e6-445a-4678-957b-e39d02fce6a4.0
+a3626ede-5b0a-440b-92ae-ae5ab4b70298-->und\a3626ede-5b0a-440b-92ae-ae5ab4b70298
+a3626ede-5b0a-440b-92ae-ae5ab4b70298.0-->und\a3626ede-5b0a-440b-92ae-ae5ab4b70298.0
+ac7f7896-01c1-4bcc-abb9-dedfec899bc7-->und\ac7f7896-01c1-4bcc-abb9-dedfec899bc7
+copyinfo-->und\copyinfo
+root-->und\root
+version-->und\version
+versions-->und\versions
diff --git a/src/CodeConsole83/und/2160ae20-89a5-4c06-8ef5-261700f38e89 b/src/CodeConsole83/und/2160ae20-89a5-4c06-8ef5-261700f38e89
@@ -0,0 +1,15 @@
+{1,
+{1,
+{0,
+{12,
+{1,
+{0,0,2160ae20-89a5-4c06-8ef5-261700f38e89},"ФормаСвойств",
+{1,"ru","Форма свойств"},"",0,1,32e087ab-1491-49b6-aba7-43571b41ac2b,3},0,1,
+{2,
+{"#",1708fdaa-cbce-4289-b373-07a5a74bee91,1},
+{"#",1708fdaa-cbce-4289-b373-07a5a74bee91,2}
+}
+},
+{0}
+}
+},0}