Commit Graph

100 Commits

Author SHA1 Message Date
Amanmyrat bb7aaaf4be added tradings api 2022-11-27 17:32:32 +05:00
saparatayev c1731b9709 npm build: id column word-break 2022-09-14 10:53:33 +05:00
saparatayev e478c31d45 Merge branch 'dev' 2022-09-14 10:50:42 +05:00
saparatayev ceb2decfad fix: id with two digits word break 2022-09-14 10:49:36 +05:00
saparatayev 3755399c8b Merge branch 'dev' 2022-09-14 10:34:04 +05:00
saparatayev 81f8704ed5 changed translation 2022-09-14 10:30:26 +05:00
saparatayev e6e0b73f8f merged adding empty space between subgroups 2022-07-02 10:49:22 +05:00
saparatayev 916f0ace40 Merge branch 'dev' 2022-07-02 10:47:08 +05:00
saparatayev 6c991b4ccc added empty space between subgroups 2022-07-02 10:46:42 +05:00
saparatayev 47e8803631 Merge branch 'dev' 2022-07-01 17:36:59 +05:00
saparatayev fcb54717ed fix: when uploading for a full group 2022-07-01 17:36:27 +05:00
saparatayev 89af9144ff merge after tradings section added 2022-07-01 17:01:17 +05:00
saparatayev 945154d964 Merge branch 'dev' 2022-07-01 16:58:09 +05:00
saparatayev 325740f054 tradings section 2022-07-01 16:57:09 +05:00
saparatayev dff98c340e Merge branch 'dev' 2022-06-07 14:05:46 +05:00
saparatayev 591fcbee2b fix sorted groups 2022-06-07 13:58:26 +05:00
saparatayev db27dfaca1 Merge branch 'dev' 2022-05-17 15:09:21 +05:00
saparatayev fbbd0f219f meta text now is sent with exports 2022-05-17 14:59:05 +05:00
saparatayev 1072abc619 Merge branch 'dev' 2022-05-16 20:14:52 +05:00
saparatayev bbdf57c2d0 meta info text 2022-05-16 20:14:22 +05:00
saparatayev 7ead459de4 Merge branch 'dev' 2022-05-10 14:07:35 +05:00
saparatayev a1faa4b947 added per_page param to export and import items when fetched 2022-05-10 14:03:50 +05:00
saparatayev b22366c523 Merge branch 'dev' 2022-05-10 11:19:49 +05:00
saparatayev 532318e154 quotations new section in the mobile app 2022-05-10 11:19:02 +05:00
saparatayev 2fc2a94943 Merge branch 'dev' 2022-05-03 17:34:50 +05:00
saparatayev 80ddd8a8bd fix undefined array key error 2022-05-03 17:31:38 +05:00
saparatayev 56785dde58 Merge branch 'dev' 2022-04-27 16:11:21 +05:00
saparatayev 4aca27c940 turn of searchable trait 2022-04-27 16:09:24 +05:00
merdan cafd60d341 additional file auto-generated 2022-03-25 08:12:31 +00:00
saparatayev 45be63e1e9 proper logout for admin - master build 2022-03-25 13:08:08 +05:00
saparatayev a89cd4968b Merge branch 'dev' 2022-03-25 13:06:43 +05:00
saparatayev 4e41377854 proper logout for admin 2022-03-25 13:06:06 +05:00
saparatayev 8e240060cc latest fixes 2022-03-24 16:46:50 +05:00
saparatayev 2c323629b3 Merge branch 'dev' 2022-03-24 16:45:18 +05:00
saparatayev 38a35898f7 fix: throwable, imports can be seen by admin, back to inertia logout (not working) 2022-03-24 16:44:46 +05:00
saparatayev 3bcdedcd71 reverted two latest commits 2022-03-24 16:08:30 +05:00
saparatayev 4e06d5de09 Merge branch 'dev' 2022-03-24 16:07:25 +05:00
saparatayev 3b2a736d64 Revert "return to inertia logout"
This reverts commit 8a543d317a.
2022-03-24 15:59:58 +05:00
saparatayev ae8c2aa66e Revert "fix: logout without csrf"
This reverts commit f4bfc93f18.
2022-03-24 15:58:01 +05:00
saparatayev 0ed70c181c latest merge with dev - fixed logout 2022-03-24 15:31:19 +05:00
saparatayev ef612f39a9 Merge branch 'dev' 2022-03-24 15:29:33 +05:00
saparatayev f4bfc93f18 fix: logout without csrf 2022-03-24 15:28:54 +05:00
saparatayev a3427eea2f latest commit for master build 2022-03-23 15:55:29 +05:00
saparatayev 9cfd4b6765 Merge branch 'dev' 2022-03-23 15:54:10 +05:00
saparatayev 8a543d317a return to inertia logout 2022-03-23 15:52:59 +05:00
saparatayev 51a3560f4c latest fix merge master branch with dev 2022-03-23 14:35:22 +05:00
saparatayev 76d6fea27f Merge branch 'dev' 2022-03-23 14:32:13 +05:00
saparatayev 54013acf1d fix: protected menu items hidden 2022-03-23 14:31:03 +05:00
saparatayev 3528fb79d0 build for master branch 2022-02-28 13:01:52 +05:00
saparatayev a4de6b4623 Merge branch 'dev' 2022-02-28 12:55:01 +05:00