Merge payments into prod #207

Bogdan-Torkhov · 2023-12-25T18:58:01Z

No description provided.

test-deploy: august

This reverts commit f89be06.

* Test (#160) * Revert "fix" * Create pr_closed.yml

fix: removed homepage

# Conflicts: # src/modules/ShelterVacancies/ShelterVacancies.jsx # src/ui/Select/OptionList.jsx # src/ui/Select/Select.jsx

Dev to test: 08.2023 release

Dev to test

feat: add a tooltip after taking home and add request

fix: поправил ошибку на странице регистрации в чек-боксе

Fix: фикс баг-репортов, части

FIX: фикс багов

fix: правка баг-репортов

fix: правка баг репортов на тест

…июта

Тест вакансий

feat: добавлена кнопка материальной помощи и подключения платежей

Feat: реализовано удаление и редактирование вакансий

….2.1.2-6.2.1.8 Feat/shelter owner layout 6.2.1.2 6.2.1.8

feat: подключение платежа и правки баг-репортов

merge PR 205

bevuxyna and others added 30 commits August 15, 2023 10:18

Merge pull request #158 from Lapkipomoshi/dev

201ffd0

test-deploy: august

Revert "fix"

ec4a1e7

This reverts commit f89be06.

Create pr_opened.yml

96478b2

Update pr_opened.yml

531d9c8

Create pr_closed.yml

5219ee8

Rename pr_closed.yml to pr_closed_test.yml

5436935

Create pr_closed.yml

3b73f6d

Update pr_closed_test.yml

d848a6c

Update pr_closed.yml

dfd7d38

Update pr_closed_test.yml

128abac

Update pr_closed_test.yml

e68e338

Update pr_closed.yml

cc4c9b0

Update pr_closed_test.yml

4b37e4f

deleted .github

00db52c

added .github

4292374

fix: test

a7710a3

Dev (#162)

4c47425

* Test (#160) * Revert "fix" * Create pr_closed.yml

fix: github fix test stand (#164)

e8454ef

fix: revert prev commit (#165)

c4fa346

fix: removed homepage

08f8168

Merge pull request #167 from Lapkipomoshi/remove_homepage

774eb20

fix: removed homepage

Merge remote-tracking branch 'origin/dev' into test

8331509

# Conflicts: # src/modules/ShelterVacancies/ShelterVacancies.jsx # src/ui/Select/OptionList.jsx # src/ui/Select/Select.jsx

Merge pull request #175 from Lapkipomoshi/dev

58710bf

Dev to test: 08.2023 release

Merge pull request #180 from Lapkipomoshi/dev

fb3c46a

Dev to test

feat: add a tooltip after taking home and add request

844ec37

fix: make a universal tooltip, move request

c0e72d4

fix: Take out the handler

fcc576c

fix: change button classname

bf46b11

Merge pull request #185 from Lapkipomoshi/dev_klaurrr

1e59f5e

feat: add a tooltip after taking home and add request

fix news title

4a71056

Nickoff and others added 28 commits November 14, 2023 17:54

feat: добавил ссылку-кнопку на переход в личный кабинет

4a33e09

fix: поправил название ивента в PrivasyCheckbox

dfa6e65

Merge pull request #196 from Lapkipomoshi/fix/registerPage

bd8ff3d

fix: поправил ошибку на странице регистрации в чек-боксе

Merge branch 'dev' into test

90103be

тест вакансий

2b92363

Fix: фикс баг-репортов, части

3ccd203

Merge pull request #197 from Lapkipomoshi/dev_n1k_fixBags

903cf50

Fix: фикс баг-репортов, части

Merge pull request #198 from Lapkipomoshi/dev

b5296ec

FIX: фикс багов

chore: merge from dev

fa28a28

fix: правка баг-репортов

4eaf6d8

Merge pull request #199 from Lapkipomoshi/dev_n1k_fixBags

cc240a4

fix: правка баг-репортов

Merge pull request #200 from Lapkipomoshi/dev

cd42661

fix: правка баг репортов на тест

feat: сверстал страницу в 6.2.1.2

f6953ce

Merge branch 'dev' into feat/shelter-owner-layout-6.2.1.2-6.2.1.8

6ecc6c6

feat: добавил оболочку и настроил роуты на страницу редактирования пр…

4fdfad8

…июта

feat: добавлена кнопка материальной помощи и подключения платежей

10426f1

Merge pull request #201 from Lapkipomoshi/dev_n1k

626e62b

Тест вакансий

Merge pull request #202 from Lapkipomoshi/dev_n1k_fixBags

210a51a

feat: добавлена кнопка материальной помощи и подключения платежей

Merge branch 'dev' into dev_n1k

19721cb

feat: реализовано удаления \ редактирование вакансий

260ce34

Merge branch 'dev' into dev_n1k

1678b1b

Merge pull request #203 from Lapkipomoshi/dev_n1k

d02bb54

Feat: реализовано удаление и редактирование вакансий

feat: начало работы над страницей редактирования приюта

2618d71

fix: fix merge conflict

7fd26a9

Merge pull request #204 from Lapkipomoshi/feat/shelter-owner-layout-6…

50b776a

….2.1.2-6.2.1.8 Feat/shelter owner layout 6.2.1.2 6.2.1.8

feat: подключение платежа и правки баг-репортов

53f8858

Merge pull request #205 from Lapkipomoshi/dev_n1k

8f3e8ed

feat: подключение платежа и правки баг-репортов

Merge pull request #206 from Lapkipomoshi/dev

59e06b2

merge PR 205

Bogdan-Torkhov self-assigned this Dec 25, 2023

Bogdan-Torkhov merged commit f3cae50 into main Dec 25, 2023
1 check failed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge payments into prod #207

Merge payments into prod #207

Bogdan-Torkhov commented Dec 25, 2023

Merge payments into prod #207

Merge payments into prod #207

Conversation

Bogdan-Torkhov commented Dec 25, 2023