Commit Graph

871 Commits

Author SHA1 Message Date
Kostiantyn Stoliarskyi 680af14722 Merge branch 'develop' into kostia/feat/drag_and_drop 2023-06-02 16:10:17 +03:00
Kostiantyn Stoliarskyi 16faeaf9cb empty for sub 2023-06-02 16:08:56 +03:00
Svyatoslav Artymovych 04e6b6f2ad
Merge pull request #114 from Simple2B/svyat/feat/ordering
Svyat/feat/ordering
2023-06-02 16:08:07 +03:00
SvyatoslavArtymovych ea1c738343 static 2023-06-02 16:03:53 +03:00
SvyatoslavArtymovych 82db550d23 Merge branch 'develop' into svyat/feat/ordering 2023-06-02 16:03:51 +03:00
SvyatoslavArtymovych 4e290d117a change collection parent 2023-06-02 16:00:14 +03:00
Kostiantyn Stoliarskyi e5c35aea1b added empty divs for dnd 2023-06-02 15:50:54 +03:00
SvyatoslavArtymovych 4b9801e4e1 improve test 2023-06-02 15:34:05 +03:00
SvyatoslavArtymovych 16d66050dd remove select a role choice 2023-06-02 14:45:15 +03:00
SvyatoslavArtymovych 5169ab7f30 change section collection 2023-06-02 14:32:33 +03:00
Kostiantyn Stoliarskyi 4c7587ac4e creating files for context menus 2023-06-02 12:13:32 +03:00
Svyatoslav Artymovych c11e811090
Merge pull request #113 from Simple2B/svyat/feat/hot_fix
Svyat/feat/hot fix
2023-06-02 11:53:20 +03:00
SvyatoslavArtymovych 7e7374391f flake8 2023-06-02 11:46:28 +03:00
SvyatoslavArtymovych 53117ce239 fix class 2023-06-02 11:43:06 +03:00
SvyatoslavArtymovych b9a811b068 Merge branch 'develop' into svyat/feat/hot_fix 2023-06-02 11:23:00 +03:00
SvyatoslavArtymovych c0664ca027 fix favicon 2023-06-02 11:22:24 +03:00
SvyatoslavArtymovych 2e18863200 fix rename(local) 2023-06-02 11:17:37 +03:00
SvyatoslavArtymovych 757c9d1a03 fix my_contributions 2023-06-02 10:27:52 +03:00
SvyatoslavArtymovych 544f512d79 fix edit, delete interpretation 2023-06-02 10:17:55 +03:00
Костя Столярский 85de451f1a
Merge pull request #112 from Simple2B/kostia/fix/setting
fix route on book stat
2023-06-02 10:17:52 +03:00
Kostiantyn Stoliarskyi 9da0eea31a fix route on book stat 2023-06-02 10:08:33 +03:00
Kostiantyn Stoliarskyi 6327c04b9d fix 2023-06-02 10:00:31 +03:00
SvyatoslavArtymovych ddc7090158 hide delete book for editor 2023-06-02 09:55:13 +03:00
Костя Столярский 6e11307c2e
Merge pull request #111 from Simple2B/kostia/fix/add_sub_modal
fix sub_coll modal
2023-06-02 09:20:07 +03:00
Kostiantyn Stoliarskyi 9640108395 fix sub_coll modal 2023-06-02 09:14:21 +03:00
SvyatoslavArtymovych f6e50a1184 change position of collection/section 2023-06-01 18:00:42 +03:00
SvyatoslavArtymovych ebe9724f14 small refactor, add position fields 2023-06-01 17:01:45 +03:00
SvyatoslavArtymovych da831670c3 hotfix: contributing books in my library 2023-06-01 16:24:02 +03:00
Kostiantyn Stoliarskyi 70ca8c3ddd Merge branch 'develop' into kostia/feat/drag_and_drop 2023-06-01 16:05:02 +03:00
Kostiantyn Stoliarskyi 5389e3a1e3 fix 2023-06-01 16:03:36 +03:00
SvyatoslavArtymovych 4cf5e2a2a2 hotfix: collection.active_children 2023-06-01 15:59:44 +03:00
Kostiantyn Stoliarskyi 65d04a2238 Merge branch 'develop' into kostia/feat/drag_and_drop 2023-06-01 15:40:00 +03:00
Svyatoslav Artymovych a4797e5ddb
Merge pull request #107 from Simple2B/svyat/feat/user_permissions
Svyat/feat/user permissions
2023-06-01 15:38:07 +03:00
Kostiantyn Stoliarskyi 7a0299dab9 dome fix 2023-06-01 15:35:19 +03:00
SvyatoslavArtymovych f7701b78a0 reinit migrations 2023-06-01 15:34:24 +03:00
SvyatoslavArtymovych 4083d7fa57 Merge branch 'develop' into svyat/feat/user_permissions 2023-06-01 15:30:01 +03:00
SvyatoslavArtymovych 6b208a49b6 remove useless code 2023-06-01 15:24:45 +03:00
Kostiantyn Stoliarskyi f442662103 Merge branch 'develop' into kostia/feat/drag_and_drop 2023-06-01 15:23:33 +03:00
Костя Столярский 0f3471e381
Merge pull request #109 from Simple2B/svyat/feat/mention_user
issue Add mention user feature without quick search for comments #105…
2023-06-01 15:19:26 +03:00
Kostiantyn Stoliarskyi 5f80ceb182 Merge branch 'develop' into svyat/feat/mention_user 2023-06-01 15:11:42 +03:00
Костя Столярский 62d3193591
Merge pull request #110 from Simple2B/kostia/fix/delete_inter_modal
fix modal placement
2023-06-01 15:10:30 +03:00
Kostiantyn Stoliarskyi e6f81a5234 fix modal placement 2023-06-01 15:06:19 +03:00
SvyatoslavArtymovych bb685b14fe fix interpretation approve 2023-06-01 15:05:01 +03:00
SvyatoslavArtymovych a8f9d765d6 uncomment code, hide contributors tab 2023-06-01 14:49:18 +03:00
Костя Столярский 193064ce41
Merge pull request #102 from Simple2B/kostia/fixes/fix_issues
Kostia/fixes/fix issues
2023-06-01 14:43:02 +03:00
SvyatoslavArtymovych 155bcdda5c Merge branch 'develop' into svyat/feat/mention_user 2023-06-01 14:40:51 +03:00
SvyatoslavArtymovych 9fb428bf02 static 2023-06-01 14:40:32 +03:00
SvyatoslavArtymovych c6dcfe5f93 issue Add mention user feature without quick search for comments #105 Change tags syntax from [tag] to #tag #99 2023-06-01 14:39:42 +03:00
Костя Столярский 380a821853
Merge pull request #108 from Simple2B/kostia/fix/remove_sidebar
remove right_sidebar from search screens
2023-06-01 14:36:47 +03:00
Kostiantyn Stoliarskyi c737303217 remove right_sidebar from search screens 2023-06-01 14:33:09 +03:00