From 5c0e06e6b5de5cedb2973a2341290ff077aa6c4b Mon Sep 17 00:00:00 2001 From: Elena Date: Tue, 25 Sep 2018 16:45:01 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/myPaper.html | 42 +++++++++++++++++++++++ src/main/resources/templates/papers.html | 1 + 2 files changed, 43 insertions(+) create mode 100644 src/main/resources/templates/myPaper.html diff --git a/src/main/resources/templates/myPaper.html b/src/main/resources/templates/myPaper.html new file mode 100644 index 0000000..d129d60 --- /dev/null +++ b/src/main/resources/templates/myPaper.html @@ -0,0 +1,42 @@ + + + + + + +
+
+
+
+
+

Пустая страница

+
+
+
+
+ + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index 81b6952..8a6da86 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -12,6 +12,7 @@

Статьи

+

Ссылка на пустую страницу
From a93a19bcfeab93fe5eecb5dacfc526dce6427a97 Mon Sep 17 00:00:00 2001 From: Alyona Date: Tue, 25 Sep 2018 17:13:01 +0400 Subject: [PATCH 2/3] Alyona-Test --- src/main/resources/templates/AlyonaTest.html | 42 ++++++++++++++++++++ src/main/resources/templates/papers.html | 1 + 2 files changed, 43 insertions(+) create mode 100644 src/main/resources/templates/AlyonaTest.html diff --git a/src/main/resources/templates/AlyonaTest.html b/src/main/resources/templates/AlyonaTest.html new file mode 100644 index 0000000..6350a2b --- /dev/null +++ b/src/main/resources/templates/AlyonaTest.html @@ -0,0 +1,42 @@ + + + + + + +
+
+
+
+
+

Тестовая страница

+
+
+
+
+ + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index 81b6952..55e99fb 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -12,6 +12,7 @@ From 08140811870c8a3aca399c957833a1838cea3c27 Mon Sep 17 00:00:00 2001 From: Alyona Date: Wed, 26 Sep 2018 16:11:43 +0400 Subject: [PATCH 3/3] Merge branch 'master' into 23-dashboard # Conflicts: # src/main/resources/templates/papers.html --- src/main/resources/templates/papers.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index d1eb467..92441c7 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -13,11 +13,6 @@

Статьи

Перейти на тестовую страницу Алёны
 -
- -