scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 07:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
11373 commits 70 branches 179 tags 165 MiB
Commit graph

857 commits

Author SHA1 Message Date
Martin Artnik abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
artoscinote 95a36b6870
Implemented stock management modal [SCI-6417] (#3788) 
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
 2022-01-20 12:44:57 +01:00
artoscinote 277b5f6eec
Fixed reCaptcha causing stack overflows on invite modal [SCI-6052] (#3534) 2022-01-06 10:11:20 +01:00
Martin Artnik f3cc31052b Amend BMT repository default columns [SCI-6385] 2021-12-21 12:19:19 +01:00
Martin Artnik c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
Oleksii Kriuchykhin e67b17dd6f Optimize loading of project and experiment cards [SCI-6346] 2021-12-13 16:43:16 +01:00
Anton a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
aignatov-bio 8f9ab4f6c3
Refactor permissions breadcrumbs for users [SCI-6260] (#3665) 
* Refactor permissions breadcrumbs for users [SCI-6260]

* Change creator assignments to automatically [SCI-6260]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-15 15:02:22 +01:00
Oleksii Kriuchykhin a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
aignatov-bio 992d3bffa3
small permissions interface updates [SCI-6145] (#3620) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-28 13:58:31 +02:00
aignatov-bio 69a3c5f5ec
Fix results comments permission helper [SCI-6146] (#3594) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-14 11:48:09 +02:00
artoscinote 362658021e
Permission typo fixes [SCI-6120] (#3582) 2021-10-11 10:19:16 +02:00
artoscinote 63923f0e63
Skip inaccessible elements when generating reports [SCI-6109] (#3569) 2021-10-01 14:18:40 +02:00
Martin Artnik bf96f71531 Fix comment edit method [SCI_6054] 2021-09-30 14:12:12 +02:00
artoscinote f68d724202
Rework experiment permissions [SCI-6054] (#3538) 
* Rework experiment permissions [SCI-6054]
 2021-09-30 11:32:11 +02:00
aignatov-bio c248e87adb
Add permissions checks for results controllers [SCI-6071] (#3555) 
* Add permission tests for results controller [SCI-6071]

* Update results controllers with new permissions [SCI-6071]

* Small fixes to results controllers [SCI-6071]

* Update result permission helpers [SCI-6071]
 2021-09-24 13:11:41 +02:00
Martin Artnik 49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
Oleksii Kriuchykhin 607b7f76cf Update/implement permission checks in the my_modules_controller and my_modules_status_flow_controller [SCI-6061][SCI-6063] 2021-09-24 10:23:28 +02:00
Martin Artnik e8f57e9e99 Reworked MyModule permissions [SCI-6056] 2021-09-14 11:08:35 +02:00
Martin Artnik 975a8910a8 Updated project permission helpers [SCI-6041] 2021-09-07 11:27:52 +02:00
Martin Artnik 7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
Oleksii Kriuchykhin b32477a933 Add error message in report in case of file preview generation failure [SCI-5848] 2021-08-30 14:18:31 +02:00
Oleksii Kriuchykhin d4ef2b1bd4 Add BMT inventory model [SCI-6009] 2021-08-30 10:49:15 +02:00
Oleksii Kriuchykhin 0b74f34de7 Add external IDs to repositories [SCI-5990] 2021-08-30 10:49:14 +02:00
aignatov-bio 546b108bd2
Fix webhooks page for user without teams [SCI-6016] (#3498) 2021-08-20 13:14:24 +02:00
Martin Artnik 403bce6f5f Fixed creating notifications when users are inactive [SCI-5938] 2021-08-18 10:45:29 +02:00
Martin Artnik a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
Martin Artnik 67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
Alex Kriuchykhin dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847 
Fix repository cell joining and preloading [SCI-5847]
 2021-07-21 13:18:21 +02:00
artoscinote 5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] (#3441) 
* Added prefixed IDs to repository rows (items) [SCI-5909]

* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]

* Fixed accessing repository_row parent code [SCI-5909]

* Better handling of repository_row code display [SCI-5909]

* Fix index warning for id prefixed models issue setting up project [SCI-5909]
 2021-07-19 14:23:36 +02:00
Oleksii Kriuchykhin 549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Oleksii Kriuchykhin d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
aignatov-bio d0b4a75095 Fix file icons in report 2021-06-30 14:35:23 +02:00
Oleksii Kriuchykhin 7d31b99386 Revert to fontawesome CDN link in reports and update wicked_pdf [SCI-5650] 2021-06-18 15:03:17 +02:00
Oleksii Kriuchykhin bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Oleksii Kriuchykhin c03535f027 Code style improvements [SCI-5831] 2021-06-18 10:33:31 +02:00
Oleksii Kriuchykhin 1e3197875c Fix repositories selection in report wizard and deleted repositories handling [SCI-5831] 2021-06-17 16:23:27 +02:00
Oleksii Kriuchykhin 85a5cca98a Fix repository snapshots for export all [SCI-5776] 2021-06-16 16:17:12 +02:00
Oleksii Kriuchykhin 16bad9eb9c Fix export all functionality [SCI-5776] 2021-06-08 14:21:34 +02:00
zmagoD 784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
aignatov-bio 9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
zmagoD 28cb7ee81d add user roles enpoint and update scenarios 2021-05-29 15:28:10 +02:00
Oleksii Kriuchykhin 70f0535dbd Fix deletion of old reports [SCI-5751] 2021-05-27 16:31:58 +02:00
zmagoD 7e6789200a fix new API endpoints and add test cases 2021-05-23 17:31:02 +02:00
zmagoD be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
zmagoD c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
zmagoD de4c28069a fix experiment level styling issues and update the dropdown placeholerds 2021-05-16 11:04:04 +02:00
zmagoD 5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
zmagoD 8f9c55d6e4 update locales 2021-05-11 08:30:39 +02:00
zmagoD d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +02:00
zmagoD ac91d9c2c4 add assign user permission to experiment level 2021-05-08 18:06:07 +02:00
Alex Kriuchykhin eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619 
Add default settings to existing reports [SCI-5619][SCI-5672]
 2021-05-07 11:38:41 +02:00
Oleksii Kriuchykhin b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
Oleksii Kriuchykhin 6a1c073024 Fix file icons in export all [SCI-5685] 2021-05-06 14:53:44 +02:00
aignatov-bio bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
aignatov-bio 9ca7b76a1f Fix report assigned repository items 2021-05-04 12:49:38 +02:00
zmagoD 11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +02:00
Oleksii Kriuchykhin bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin 8a915c8acf Fix assets inclusion into report [SCI-5680] 2021-04-28 14:37:16 +02:00
zmagoD c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
Oleksii Kriuchykhin a67cc619ec Add additional custom fields for reports [SCI-5609] 2021-04-20 13:57:09 +02:00
zmagoD 04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
Miha Mencin d5c8edd266
Merge pull request #3223 from aignatov-bio/ai-sci-5513-fix-office-icons-in-print-report 
Convert office icons to base64 [SCI-5513]
 2021-03-24 09:44:54 +01:00
Oleksii Kriuchykhin d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +01:00
aignatov-bio c1f0896670 Convert office icons to base64 [SCI-5513] 2021-03-19 15:10:23 +01:00
Urban Rotnik 8202181095
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications 
Bring back old notifications [SCI-4140]
 2021-03-09 14:54:08 +01:00
Urban Rotnik ab1477997a Update variables name 2021-03-09 14:50:14 +01:00
Urban Rotnik e16612caee
Merge pull request #3205 from urbanrotnik/ur-sci-4084 
Fix missing user placeholder icon in export_all [SCI-4084]
 2021-03-09 13:21:00 +01:00
Urban Rotnik b9f77bf4fd Fix missing user placeholder icon in export_all 2021-03-08 14:39:58 +01:00
Urban Rotnik e1db291729
Merge pull request #3200 from urbanrotnik/ur-sci-5525 
Add breadcrumbs on Experiments and Tasks pages [SCI-5525]
 2021-03-08 14:13:44 +01:00
aignatov-bio 4f1905d16a
Merge pull request #3204 from aignatov-bio/ai-sci-fix-new-step-creation 
Fix new step creation
 2021-03-08 12:24:27 +01:00
aignatov-bio d99722be5c Fix new step creation 2021-03-08 12:21:10 +01:00
Urban Rotnik 96ef0c10da
Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode 
Store Table/Cards view setting per user [SCI-5450]
 2021-03-08 11:48:33 +01:00
Urban Rotnik 235f19cf25 Store Table/Cards view setting per user 
SCI-5450
 2021-03-04 14:56:59 +01:00
Urban Rotnik 401224ae11 Add breadcrumbs on Experiments and Tasks pages 2021-03-04 09:00:58 +01:00
aignatov-bio 468afaaa5a Fix upercase file extensions [SCI-5484] 2021-03-02 15:04:43 +01:00
Urban Rotnik 1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
Urban Rotnik 347f208480 Bring back old notifications 
SCI-4140
 2021-02-25 11:59:14 +01:00
Oleksii Kriuchykhin 7d89088b14 Multiple small bugfixes [SCI-5494] 2021-02-18 13:55:03 +01:00
aignatov-bio 1eff3494fb Fix archived experiments page routes and clean old archive page [SCI-5479] 2021-02-11 14:21:15 +01:00
Miha Mencin b35e15fdd5
Merge pull request #3101 from aignatov-bio/ai-sci-5263-add-new-file-icons-to-report 
Add new asset icons to report [SCI-5263]
 2021-02-05 08:21:05 +01:00
aignatov-bio a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
Urban Rotnik ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112) 
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
 2021-01-22 11:24:08 +01:00
Alex Kriuchykhin adb9442677
Small bugfixes [SCI-5432] (#3107) 2021-01-21 11:24:25 +01:00
Alex Kriuchykhin 8ab7b94443
Fix error message at login with false credential [SCI-5412] (#3102) 2021-01-19 17:19:40 +01:00
aignatov-bio 07831c0294 Add new asset icons to report [SCI-5263] 2021-01-19 12:53:49 +01:00
Alex Kriuchykhin f15d984d47
Fix navigation between archived and active projects [SCI-5419] (#3100) 
* Fix navigation between archived and active projects [SCI-5419]
 2021-01-19 11:28:59 +01:00
Urban Rotnik 496c106497
Merge pull request #3088 from urbanrotnik/ur-sci-5395-breadcrumbs-order 2021-01-15 17:04:31 +01:00
Urban Rotnik 97371f8216 Reorder ProjectFolder inner foldres 2021-01-15 14:22:48 +01:00
Urban Rotnik 531b6cd554 Fix folder's activities links 2021-01-14 15:06:56 +01:00
Alex Kriuchykhin 62b1aaf033
Merge pull request #3077 from okriuchykhin/ok_SCI_5386 
Fix flash messages on sign-in [SCI-5386]
 2021-01-12 15:44:24 +01:00
Urban Rotnik 1070e813fc Add helper for archived_on date 2021-01-12 15:35:35 +01:00
Oleksii Kriuchykhin cf3b0916f6 Fix flash messages on sign-in [SCI-5386] 2021-01-12 15:28:30 +01:00
Oleksii Kriuchykhin 78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
aignatov-bio e88848cd75
Fix comments counter [SCI-5371] (#3063) 2021-01-11 10:03:13 +01:00
Urban Rotnik 3a52f62d85 Implement folders tree for move action 2021-01-07 17:42:01 +01:00
aignatov-bio 1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) 
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
 2021-01-07 13:16:05 +01:00
Urban Rotnik 8f11376285
Merge pull request #3045 from urbanrotnik/ur-sci-5320-tooptip-for-avatars 
Tooltip for users on project cards [SCI-5320]
 2021-01-06 09:18:00 +01:00