scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
12300 commits 31 branches 181 tags 166 MiB
Commit graph

1929 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +02:00
Anton
df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
Anton
ed49e93a6a Highlight negative stock in modal with red [SCI-6729] 2022-04-15 12:08:29 +02:00
artoscinote
30ee6cd40c
Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) 
* Refactor and fix how stock consumption is displayed [SCI-6734]

* Refactor and fix display of stock warnings [SCI-6734]
 2022-04-14 14:27:31 +02:00
aignatov-bio
4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination 
Features/projects experiments pagination
 2022-04-14 10:45:27 +02:00
ajugo
1338d4524f
Align items in assigned item section [SCI-6707] (#4007) 2022-04-13 10:12:01 +02:00
Anton
d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
artoscinote
2d811cdc4c
Add snapshot error message below task status [SCI-6614] (#4009) 2022-04-12 13:28:26 +02:00
ajugo
a9fc4c3c44
Adding/changing stock consumption [SCI-6708] (#4005) 
* Adding/changing stock consumption [SCI-6708]

* Fix hound [SCI-6708]
 2022-04-11 10:47:24 +02:00
ajugo
986e817fdc
Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) 
* Removed clear autofocus on open reminder flyout [SCI-6690]

* Fix hound [SCI-6690]
 2022-04-08 18:08:55 +02:00
aignatov-bio
29cbf99498
Fix css for stotck modal [SCI-6698] (#3999) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-08 11:11:24 +02:00
aignatov-bio
3a4cab9d0a
Stock modal UX fixes [SCI-6714] (#3998) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-08 11:09:37 +02:00
ajugo
98144b225c
Fix color on consumption link [SCI-6686] (#3992) 2022-04-07 13:03:18 +02:00
Anton
d96103d714 Add pagination to projects list [SCI-6655] 2022-04-07 12:22:52 +02:00
artoscinote
5d8ecb0c4a
Override error styling in stock column management [SCI-6674] (#3995) 2022-04-06 15:36:11 +02:00
artoscinote
73757c4820
Added styling for failed snapshots in sidebar [SCI-6636] (#3990) 
* Added styling for failed snapshots in sidebar [SCI-6636]

* Simplify markup for failed icon [SCI-6636]
 2022-04-05 15:45:49 +02:00
artoscinote
785ff4152e
Stock column management UX/UI fixes [SCI-6674] (#3979) 2022-04-05 10:30:06 +02:00
aignatov-bio
4df8faec7e
Fix css stock modal [SCI-6675] (#3989) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-05 10:25:47 +02:00
aignatov-bio
2a2a5b2725
Repository toolbar CSS fixes [SCI-6676] (#3984) 
Co-authored-by: Anton <anton@scinote.net>
 2022-04-04 12:02:59 +02:00
ajugo
bb44152d54
Fix assigning and consuming items [SCI-6686] (#3985) 2022-04-04 11:07:46 +02:00
artoscinote
401a32edd9
Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) 
* Implement failed snapshot pop-up on task screen [SCI-6612]

* Copy change [SCI-6612]

* Proper handling of snapshot transition error [SCI-6612]

* Move modal auto open logic to JS file [SCI-6612]

* Remove unnecessary .html_safe [SCI-6612]
 2022-04-04 11:04:03 +02:00
aignatov-bio
ca53c3058a
Stock modal bugs [SCI-6667] (#3970) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-30 14:03:07 +02:00
Martin Artnik
45a325e824 Merge branch 'develop' into features/stock-management 2022-03-30 11:10:40 +02:00
ajugo
f75265974e
Print protocol smart annotation and table improvements [SCI-6566] (#3925) 
* Improve table printing in the print menu [SCI-6566]

* Open smart annotation in new tab for print view [SCI-6566]

* Unify naming of same parameter [SCI-6566]

* Fix typo [SCI-6566]

* Fix hound errors [SCI-6566]
 2022-03-29 12:09:33 +02:00
aignatov-bio
103e20ee9a
Update front end validation for columns managment [SCI-6657] (#3962) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-28 21:31:49 +02:00
aignatov-bio
673f8c1a2a
Fix multiple stock bugs [SCI-6651] (#3959) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-28 12:43:09 +02:00
aignatov-bio
5e92429212
Add micro-interactions to reminders flyout [SCI-6627] (#3951) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-24 10:16:47 +01:00
aignatov-bio
004aeda601
Add stock filters [SCI-6547] (#3938) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-23 10:05:07 +01:00
aignatov-bio
c6c073c750
Add micro interactions for stock modal [SCI-6625] (#3947) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-22 14:35:27 +01:00
ajugo
7cba738a9b
Date remidner flyout [SCI-6503] (#3937) 
* Implement date reminder flyout [SCI-6503]

* Show only days left for date reminder [SCI-6503]

* Pluralize day in reminders [SCI-6503]

* Create partials for different reminders [SCI-6503]

* Unify css for reminder [SCI-6503]
 2022-03-22 13:33:58 +01:00
artoscinote
297cd02da7
Handle locked stock consumption state [SCI-6608] (#3942) 2022-03-18 15:02:15 +01:00
aignatov-bio
0cfedb2155
Add datetime reminders to columns modal [SCI-6556] (#3934) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-18 14:40:09 +01:00
aignatov-bio
fecaafecf9
Refactor repository toolbar [SCI-6545] (#3943) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-18 14:10:34 +01:00
ajugo
be989245ed
Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) 
* Add bell icon on assigned task [SCI-6506]

* Add flyout and improve quering [SCI-6506]
 2022-03-17 11:39:17 +01:00
ajugo
a89244c537
Displaying low stock warning [SCI-6497] (#3912) 
* Low stock warning [SCI-6497

* Fix some bugs [SCI-6497]

* Fix to long line [SCI-6497]

* Clean not needed information in renderes [SCI-6497]
 2022-03-16 15:06:52 +01:00
ajugo
d1610fba53
Low stock flyout reminders [SCI-6502] (#3932) 
* Display low stock flyout reminder [SCI-6502]

* Display low stock flyout reminder [SCI-6502]

* Adapt showing stock reminders for every bell icon click [SCI-6502]

* Correct hound error [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix hound [SCI-6502]

* Remove not needed line [SCI-6502]

* Add reminder template [SCI-6502]

* Add clearing messages [SCI-6502]
 2022-03-15 10:24:35 +01:00
Anton
8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
ajugo
959b86b40c
Task inventory activity for assigned item consumption [SCI-6453] (#3830) 
* Add task inventory activity [SCI-6453]
 2022-03-09 18:43:38 +01:00
aignatov-bio
bf058dea03
Add flyout for repository reminders [SCI-6501] (#3926) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 15:09:49 +01:00
aignatov-bio
10743921d4
Add reminders to stock modal [SCI-6557] (#3917) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:19:15 +01:00
aignatov-bio
d89ea7d77f
Add red dot for date/datetime reminder [SCI-6499] (#3924) 
Co-authored-by: Anton <anton@scinote.net>
 2022-03-09 14:18:34 +01:00
artoscinote
d577fcc824
Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) 
* Implement basic logic for Date/DateTime/Stock reminders [SCI-6554]

* Implement bell icon [SCI-6500]

* Refactor reminder cells scope [SCI-6554]
 2022-03-09 14:13:48 +01:00
artoscinote
e948fc20bc
Fix members dropdown CSS, order [SCI-6595] (#3919) 2022-03-07 17:11:35 +01:00
aignatov-bio
d9dc27c2b8
Small UX fixes for filters [SCI-6569] (#3881) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-22 12:07:46 +01:00
aignatov-bio
6cee35dfa5
Small ux fixes [SCI-6539][SCI-6516] (#3864) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-16 12:56:54 +01:00
ajugo
9b6a70cdb0
Improve RTF responsiveness - move button to the right side [SCI-5795] (#3854) 2022-02-16 10:32:01 +01:00
aignatov-bio
f2e4c579af
Multiple UX fixes for filters [SCI-6525] (#3858) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-15 15:03:25 +01:00
aignatov-bio
afce0e34c4
Fix css for saved filters dropdown [SCI-6516] (#3843) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-11 12:44:22 +01:00
artoscinote
bac8fbbe58
Disable filter save button on submit [SCI-6523] (#3833) 2022-02-11 10:14:19 +01:00
artoscinote
85ad4a692a
Fix assigned task filter issues [SCI-6492] (#3837) 2022-02-11 09:20:52 +01:00
Alex Kriuchykhin
f66b89c7bb
Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) 2022-02-04 14:24:15 +01:00
aignatov-bio
8c8c4344d6
Improve RTF responsiveness [SCI-5795] (#3813) 
Co-authored-by: Anton <anton@scinote.net>
 2022-02-01 14:38:09 +01:00
aignatov-bio
51b515fcee
Fix icons on tinyMCE [SCI-6477] (#3812) 
* Fix icons on tinyMCE [SCI-6477]

* mend

* mend

Co-authored-by: Anton <anton@scinote.net>
 2022-02-01 14:37:59 +01:00
artoscinote
dd8b38604f
Filter loading/saving fixes [SCI-6475] (#3803) 
* Filter loading/saving fixes [SCI-6475]

* More bugfixes & code improvements [SCI-6475]

* Fix loading user filter [SCI-6475]
 2022-02-01 14:37:13 +01:00
aignatov-bio
2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798) 
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-28 11:10:56 +01:00
Martin Artnik
5a1329f1df Fix loading of saved filters [SCI-6474] 2022-01-27 13:33:43 +01:00
artoscinote
d779f352a7
Merge pull request #3796 from biosistemika/features/repository-filters 
Features/repository filters
 2022-01-26 10:36:30 +01:00
aignatov-bio
371d5f0636
Add current/new amount section to stock [SCI-6416] (#3791) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-26 10:28:43 +01:00
aignatov-bio
86b26cfade
CSS fixes for bmt filters [SCI-6084] (#3764) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-25 10:22:11 +01:00
artoscinote
354bf4b808
Fix for Safari artefacts in TinyMCE [SCI-6154] (#3794) 2022-01-25 10:10:47 +01:00
Martin Artnik
711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +01:00
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
aignatov-bio
05547da457
Add stock table renders [SCI-6412] (#3787) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-19 13:19:56 +01:00
aignatov-bio
01f1b5bd10
Add stock column type (#3786) 
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
 2022-01-18 13:17:05 +01:00
aignatov-bio
8fcf4e9aa2
Add styling for repository filters [SCI-6232] (#3779) 
Co-authored-by: Anton <anton@scinote.net>
 2022-01-17 10:24:57 +01:00
ajugo
c570cef06c
Style corrections for printed protocol [SCI-6326] (#3782) 
* Printed protocol display improvements [SCI-6326]

* Fix new line

* Fix hound [SCI-6326]

* Using image_tag helper [SCI-6326]

* Move pictures to asset folder [SCI-6326]
 2022-01-14 15:02:04 +01:00
Anton
304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
artoscinote
3f87d250ce
Implement saving repository filters [SCI-6230] (#3748) 
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
 2022-01-05 15:02:09 +01:00
Martin Artnik
c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
artoscinote
49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
aignatov-bio
8ce321456e
Add time filter [SCI-6217] (#3738) 
* Add time filter [SCI-6217]

* Add datetime filter for inventory [SCI-6220]

* Refactor components structure

Co-authored-by: Anton <anton@scinote.net>
 2021-12-15 12:22:24 +01:00
aignatov-bio
00f30b8d6c
Add assigned tasks filters [SCI-6221] (#3726) 
* Add endpoint for repository tasks [SCI-6221]

* Add assigned tasks filter [SCI-6221]

Co-authored-by: Anton <anton@scinote.net>
 2021-12-07 15:28:20 +01:00
artoscinote
1c0a83a76e
Fix propagation and display of role on experiment role reset [SCI-6337] (#3725) 2021-12-07 11:42:14 +01:00
artoscinote
561746158e
Further fix scoping of table styles [SCI-6315] (#3720) 2021-12-06 10:40:08 +01:00
artoscinote
272752ae4f
Fix scoping of table styles [SCI-6315] (#3719) 2021-12-03 16:21:18 +01:00
artoscinote
3f7f576b29
Print protocol fixes [SCI-6318] (#3717) 
* Fix smart annotations [SCI-6318]

* Fix asset rendering [SCI-6316, SCI-6417]

* Copy fix [SCI-6315]

* Fix print protocol name handling [SCI-6318]

* CSS linter fixes

* Add support for handson tables [SCI-6318]

* Use partial for handsontable formulas [SCI-6318]
 2021-12-03 13:44:18 +01:00
artoscinote
78ab094bf2
Implement public user grouping, deletion and updates to manually assigned [SCI-6228] (#3701) 
* Implement public user grouping, deletion and updates to manually assigned [SCI-6228]

* PR fixes [SCI-6228]

* Permission check improvement [SCI-6228]
 2021-12-01 16:23:24 +01:00
artoscinote
9937d1d913
Add print feature to protocols [SCI-6028] (#3700) 
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
 2021-12-01 11:16:45 +01:00
aignatov-bio
12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698) 
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
 2021-11-25 20:34:22 +01:00
Anton
a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
aignatov-bio
2a135ac120
Fix repository archive title [SCI-6267] (#3671) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-17 14:53:04 +01:00
Anton
c00a7b7b8f Update bmt filters default state [SCI-6090] 2021-11-16 15:14:00 +01:00
aignatov-bio
06788bfeb6
Update CSS for BMT filters [SCI-6084] (#3652) 
* Update css for bmt filters [SCI-6084]

* Create shared component for dropdown [SCI-6084]

Co-authored-by: Anton <anton@scinote.net>
 2021-11-16 14:46:08 +01:00
artoscinote
d08882e7f2
Style and copy fix [SCI-6272] (#3670) 2021-11-16 11:25:47 +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
artoscinote
4ce0c53d36
Implemented reset role functionality [SCI-6261] (#3662) 
* Implemented reset role functionality [SCI-6261]

* Linter fixes [SCI-6261]
 2021-11-15 11:12:31 +01:00
artoscinote
9f92cfab1a
Fixed access modal styling issues [SCI-6241] (#3646) 
* Fixed access modal styling issues [SCI-6241]

* Refactor user access list to use flex [SCI-6241]

* Linter fixes [SCI-6241]
 2021-11-10 11:40:41 +01:00
aignatov-bio
d3e178e5a2
Small CSS fixes for permissions [SCI-6207] (#3638) 
Co-authored-by: Anton <anton@scinote.net>
 2021-11-09 09:26:22 +01:00
Alex Kriuchykhin
f11a4701d0
Merge pull request #3629 from artoscinote/ma_SCI_6193 
Added optional webhook secret key [SCI-6193]
 2021-11-08 21:00:40 +01:00
Martin Artnik
3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Oleksii Kriuchykhin
47b8347ce6 Add support of Okta SSO provider [SCI-6184] 2021-11-02 16:19:56 +01:00
Anton
f7d1541e01 Add scrollbars to filters dropdown [SCI-6085] 2021-11-02 12:18:00 +01:00
Oleksii Kriuchykhin
a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
aignatov-bio
22034089a6
Update experiment move service [SCI-6149] (#3599) 
* Update experiment move service [SCI-6149]

* Move permission check to helper [SCI-6149]

Co-authored-by: Anton <anton@scinote.net>
 2021-10-27 13:48:52 +02:00
aignatov-bio
1a05c3a40c
Update canvas task cards [SCI-5021] (#3608) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 12:06:26 +02:00
aignatov-bio
aa4b765407
Update assign/unassign rows to task [SCI-6150] (#3604) 
Co-authored-by: Anton <anton@scinote.net>
 2021-10-26 11:41:08 +02:00
Zmago Devetak
4a4c344a3a
Task UX: Update assigning a Task to user(s) (#3429) 
* add dynmic select for user assignment on task

* update the user assignment so it looks like tags picker

* fix code style

* Code style fixes [SCI-5871]

* Code style fixes [SCI-5871]

* Destroy and search action fixes [SCI-5871]

Co-authored-by: Martin Artnik <martin@scinote.net>
 2021-10-14 11:49:27 +02:00
aignatov-bio
328f1cfe4d
Add blank tasks to canvas [SCI-6133] (#3588) 2021-10-13 10:08:39 +02:00
Martin Artnik
49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
aignatov-bio
a99f9db520
Small CSS fixes [SCI-6017][SCI-6019] (#3548) 2021-09-17 14:15:01 +02:00
aignatov-bio
857ce2d90f
Fix title for archived folders [SCI-6049] (#3541) 2021-09-17 14:12:53 +02:00
Martin Artnik
ade1385392 Merge branch 'develop' into features/bmt-search 2021-09-06 10:51:04 +02:00
Martin Artnik
7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
Martin Artnik
206ba3d79c Reworked how search error works with repository table [SCI-5961] 2021-09-06 10:12:10 +02:00
Martin Artnik
ca6dfa2541 Display dropdown item info border using CSS [SCI-6013] 2021-09-02 12:58:25 +02:00
Martin Artnik
35e815449d Experiment dropdown layout fixes [SCI-6013] 2021-09-02 12:42:06 +02:00
Martin Artnik
6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00
Martin Artnik
896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
artoscinote
ef0e45be04 Implemented frontend for BMT-type repository [SCI-5991] (#3503) 
* Implemented frontend for BMT-type repository [SCI-5991]

* Refactor repository view, fix column reordering [SCI-5991]

* Remove type mapping for default columns in column management [SCI-5991]

* Repository table partial fix, remove non-relevant migration [SCI-5991]
 2021-08-30 10:49:15 +02:00
aignatov-bio
90d4a5f7d1 Add save bmt filters front end [SCI-5962] (#3505) 2021-08-30 10:49:15 +02:00
Martin Artnik
a872ea8a47 CSS fixes [SCI-5956] 2021-08-30 10:49:15 +02:00
Martin Artnik
9a87bad740 Implement filters and JSON building [SCI-5956] 2021-08-30 10:49:15 +02:00
aignatov-bio
958ee92db7 Add BMT filters interactions [SCI-5955] (#3478) 
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
 2021-08-30 10:49:14 +02:00
aignatov-bio
a61446acf5
Add close button to label printer modal [SCI-6000] (#3492) 2021-08-19 12:04:41 +02:00
aignatov-bio
852d2cc03c
CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970] (#3486) 
* CSS fixes for webhooks and barcodes [SCI-5972][SCI-5988][SCI-5969][SCI-5970]

* Small fixes [SCI-5972]
 2021-08-16 10:51:46 +02:00
Martin Artnik
861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote
f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration 
Features/bioeddie integration
 2021-08-03 13:32:53 +02:00
artoscinote
f24207588c
Merge pull request #3463 from biosistemika/features/webhooks 
Features/webhooks
 2021-08-03 13:32:12 +02:00
Martin Artnik
a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
Martin Artnik
ae174b276a Code review fixes and error handling improvements [SCI-5942] 2021-08-02 15:42:53 +02:00
aignatov-bio
43571b5692
Print labels changes [SCI-5943] (#3461) 2021-08-02 15:38:37 +02:00
aignatov-bio
02408ae885
Add printing status modal [SCI-5910] (#3454) 2021-07-29 12:24:46 +02:00
Martin Artnik
67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
aignatov-bio
a54f36a486
Add empty state for barcode printers [SCI-5935] (#3455) 2021-07-28 11:12:46 +02:00
aignatov-bio
8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
Martin Artnik
d54a743e64 Fixed handling of dropdown-selector max height [SCI-5898] 2021-07-22 09:37:25 +02:00
aignatov-bio
be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447) 
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
 2021-07-21 21:32:42 +02:00
aignatov-bio
f2e5dc8b2f
Add printers to addon page [SCI-5904][SCI-5931] (#3450) 
* Add printers to addon page [SCI-5904]

* Fix markup
 2021-07-21 13:48:38 +02:00
Martin Artnik
f55761a491 Invite member search design fixes [SCI-5892] 2021-07-19 15:42:26 +02:00
Martin Artnik
71aa418dc6 Fixed UX issues in user invites modal [SCI-5898] 2021-07-19 12:39:18 +02:00
Martin Artnik
96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Martin Artnik
40a8f3a434 Switch to using dropdownSelector for emails input [SCI-5099] 2021-07-09 11:20:48 +02:00
Martin Artnik
fe06effbd7 Fix linter errors [SCI-5099] 2021-07-09 09:40:06 +02:00
Martin Artnik
fb040bee07 Fix styling, functionality issues with invite users modal [SCI-5099] 2021-07-08 16:10:20 +02:00
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
artoscinote
52946d18e0
Merge pull request #3416 from artoscinote/ma_SCI_5099 
Rework the team invite modal functionality on members page [SCI-5099]
 2021-07-05 12:41:04 +02:00
Martin Artnik
5f528fcdb5 Rework the team invite modal functionality on members page [SCI-5099] 2021-07-05 12:39:54 +02:00
Martin Artnik
1c98d7cdd2 Fixed missing archived column in experiment table [SCI-5866] 2021-07-02 16:10:35 +02:00
Alex Kriuchykhin
f835f88e64
Merge pull request #3410 from okriuchykhin/ok_SCI_5097 
Update Invite new user to team modal [SCI-5097]
 2021-06-30 13:34:06 +02:00
artoscinote
723b594632
Merge pull request #3398 from artoscinote/ma_SCI_5828 
Expose experiment IDs in interface and reports [SCI-5828]
 2021-06-30 12:58:25 +02:00
Oleksii Kriuchykhin
ecec1ce194 Update Invite new user to team modal [SCI-5097] 2021-06-29 13:46:02 +02:00
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391) 
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
 2021-06-23 19:48:44 +02:00
Martin Artnik
b6588c2334 Reworked task view sidebar [SCI-5701] 2021-06-18 16:52:19 +02:00
Martin Artnik
a9d6c4bb94 Code style fixes [SCI-5828] 2021-06-18 14:19:35 +02:00
Martin Artnik
0866a2e251 Added experiment ID to card and table views [SCI-5828] 2021-06-18 14:12:59 +02:00
Martin Artnik
b5976312ba Fixed fade-out gradients in Safari [SCI-5780] 2021-06-14 09:19:25 +02:00
aignatov-bio
afe2a19c88
Add webhooks management [SCI-5767] (#3376) 
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
 2021-06-09 12:53:11 +02:00
aignatov-bio
4a6f6a787a
Update help menu [SCI-5643] (#3368) 2021-06-08 15:34:19 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
Miha Mencin
ef77c9d67d
Merge pull request #3363 from okriuchykhin/ok_SCI_5774 
Fix dates formatting in report templates [SCI-5774]
 2021-05-31 14:23:19 +02:00
Oleksii Kriuchykhin
92821d7f1e Fix dates formatting in report templates [SCI-5774] 2021-05-31 11:51:04 +02:00
aignatov-bio
519a0534fc Add generate PDF button for old reports [SCI-5754] 2021-05-27 14:55:27 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Alex Kriuchykhin
8e3e72654c
Merge pull request #3324 from aignatov-bio/ai-sci-5551-add-search-field-to-reports 
Add search field to reports page [SCI-5551]
 2021-05-17 11:50:03 +02:00
Miha Mencin
d952edd389
Merge pull request #3316 from okriuchykhin/ok_SCI_5702 
Add generation error states to reports [SCI-5702]
 2021-05-17 10:16:06 +02:00
zmagoD
de4c28069a fix experiment level styling issues and update the dropdown placeholerds 2021-05-16 11:04:04 +02:00
aignatov-bio
e953666762 Add search field to reports page [SCI-5551] 2021-05-13 21:41:26 +02:00
aignatov-bio
e16b3b0d61
Report wizard add red border to report name [SCI-5703] (#3309) 2021-05-12 12:22:40 +02:00
aignatov-bio
8f8e685793
Change report warning modals size [SCI-5717] (#3315) 2021-05-11 21:31:44 +02:00
aignatov-bio
114a590a22
Report wizard fix task and experiments long names [SCI-5711] (#3311) 2021-05-11 21:31:12 +02:00
aignatov-bio
131ff79034
Fix collased arrow in report wizard [SCI-5697] (#3306) 2021-05-11 21:29:59 +02:00
Oleksii Kriuchykhin
a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +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
d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +02:00
zmagoD
c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
Alex Kriuchykhin
57c90a60c4
Merge pull request #3287 from aignatov-bio/ai-sci-5686-add-default-scinote-report-template 
Add Scinote Report Template [SCI-5686]
 2021-05-06 10:59:33 +02:00
aignatov-bio
689967f82c Add Scinote Report Template [SCI-5686] 2021-05-05 15:13:06 +02:00
Oleksii Kriuchykhin
a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
aignatov-bio
e25bd039d5
Small css fix for report action dropdown (#3279) 2021-05-03 15:17:46 +02:00
aignatov-bio
7752267808
Add styling for template values [SCI-5630] (#3264) 2021-05-03 15:17:09 +02:00
zmagoD
47cb1b31dc fix code style 2021-05-02 11:36:10 +02:00
zmagoD
c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD
63bbc609ef style modal 2021-04-30 16:02:59 +02:00
aignatov-bio
7c75f170d0
Add repositories settings to report wizard [SCI-5648] (#3269) 
* Add repositories settings to report wizard [SCI-5648]

* Move repositories from report settings to content [SCI-5648]
 2021-04-28 09:54:00 +02:00
Oleksii Kriuchykhin
0a9a656313 Add flash message and notification for generated reports [SCI-5552] 2021-04-14 15:45:51 +02:00
aignatov-bio
bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio
e6edbf55f3 Add report wizard step 2 [SCI-5572] 2021-04-08 12:00:08 +02:00
aignatov-bio
a1d6c30ef7 Add report wizard step 3 [SCI-5611] 2021-04-07 16:37:08 +02:00
Oleksii Kriuchykhin
a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
aignatov-bio
5c4099af80 Fix css for repository header [SCI-5628] 2021-04-01 12:55:58 +02:00
aignatov-bio
82be23db81 Add project and template selector [SCI-5570] 2021-03-31 15:32:03 +02:00
aignatov-bio
0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +01:00
Miha Mencin
4fa1f350e4
Merge pull request #3221 from aignatov-bio/ai-sci-5564-small-breadcrumbs-fixes 
Small breadcrumbs fixes [SCI-5564]
 2021-03-24 09:46:09 +01:00
aignatov-bio
c1f0896670 Convert office icons to base64 [SCI-5513] 2021-03-19 15:10:23 +01:00
aignatov-bio
d3d79f4288 Small breadcrumbs fixes [SCI-5564] 2021-03-18 14:24:33 +01:00
aignatov-bio
3e5c2e83c7 Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550] 2021-03-17 12:54:25 +01:00
aignatov-bio
c99e8f19fd Add basic layout [SCI-5548] 2021-03-16 13:11:51 +01:00
aignatov-bio
e8310f9b2e
Merge pull request #3212 from aignatov-bio/ai-sci-5431-implement-flyout-for-long-breadcrumbs 
Add dropdown to breadcrumbs [SCI-5431]
 2021-03-12 14:33:19 +01:00
Urban Rotnik
c20a1f9bb6
Merge pull request #3195 from urbanrotnik/ur-sci-5513-missing-icons 
Fix CSS for missing icons [SCI-5513]
 2021-03-12 13:58:11 +01:00
aignatov-bio
d97225026c Fix gap after experiment name [SCI-5486] 2021-03-12 12:30:00 +01:00
aignatov-bio
63744b6a04 Add dropdown to breadcrumbs [SCI-5431] 2021-03-12 12:21:10 +01:00
Urban Rotnik
07ba11c140 Fix icons in export_all and print mode 2021-03-10 12:42:12 +01:00
aignatov-bio
9a88e9d030 Fix typo in experiments stylesheet 2021-03-09 13:15:01 +01:00
Urban Rotnik
919eeb2783 Fix titles to one line 
SCI-5518
 2021-03-08 22:04:19 +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
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
aignatov-bio
ea424e4a12
Merge pull request #3161 from mlorb/ml-sci-5323 
Implement styling for the inventories empty state [SCI-5323]
 2021-03-08 11:42:48 +01:00
aignatov-bio
a4227874e3 Add empty office files placeholder [SCI-5490] 2021-03-08 11:35:15 +01:00
aignatov-bio
7ff6cc17ad
Merge pull request #3197 from aignatov-bio/ai-sci-5483-fix-click-zone-for-manage-users-buttons 
Fix click zone for manage users buttons [SCI-5483]
 2021-03-08 11:31:41 +01:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio
16c2130d0f Fix gap after experiment title [SCI-5486] 2021-03-05 14:32:25 +01:00
aignatov-bio
ab9d0c018b Small CSS fixes for experiment card [SCI-5486] 2021-03-05 13:41:44 +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
dcea1b558b Fix click zone for manage users buttons [SCI-5483] 2021-03-02 15:32:53 +01:00
aignatov-bio
a131056279 Fix datetime for projects and experiments filters [SCI-5512] 2021-02-22 12:51:04 +01:00
Urban Rotnik
6ea39c9363 Add experiment thumbnail, update archived view for experiments 
SCI-5481
 2021-02-18 12:03:13 +01:00
aignatov-bio
1cfd9dd85e
Merge pull request #3163 from aignatov-bio/ai-sci-5469-update-experiment-card-css 
Update experiment card css [SCI-5469]
 2021-02-18 10:45:43 +01:00
aignatov-bio
060d5c1c2e
Merge pull request #3159 from aignatov-bio/ai-sci-5249-update-dashboard-widget-size 
Fix dashboard CSS [SCI-5249][SCI-5489]
 2021-02-16 12:43:36 +01:00
aignatov-bio
0368579799 Update experiment card css [SCI-5469] 2021-02-16 12:42:09 +01:00
Mojca Lorber
456d9c713f Implement styling for the inventories empty state 2021-02-15 21:01:31 +01:00
aignatov-bio
e02136e664 Add scrollbar to filter dropdown on experement page [SCI-5472] 2021-02-15 13:30:02 +01:00
aignatov-bio
cc2edaf71a Fix dahsboard CSS [SCI-5249][SCI-5489] 2021-02-15 12:40:26 +01:00
aignatov-bio
e09f5a0604
Merge pull request #3157 from aignatov-bio/ai-sci-5476-fix-empty-toolbar-state 
Fix toolbar empty state [SCI-5476]
 2021-02-15 10:29:27 +01:00
mlorb
20dc9967f5
Merge pull request #3113 from mlorb/ml-sci-5311 
Implement the option of deleting empty folders [SCI-5311]
 2021-02-15 10:27:05 +01:00
Urban Rotnik
8c80484445
Merge pull request #3155 from urbanrotnik/ur-sci-5471 
Fix dots, checkbox and duplicate button visibility on Experiment cards [SCI-5471]
 2021-02-15 10:24:25 +01:00
aignatov-bio
e10c7fc6c9 Fix toolbar empty state [SCI-5476] 2021-02-12 14:45:09 +01:00
Urban Rotnik
1ae0b42c2c Fix Dots and Checkbox visibility on experiment cards 2021-02-12 13:25:12 +01:00
Urban Rotnik
7e463c77c0 Fix typo in CSS 2021-02-12 06:55:23 +01:00
aignatov-bio
41cdc47702
Merge pull request #3151 from urbanrotnik/ur-sci-5475-move-experiment-bug 
Fix Move button on Experiment card [SCI-5475]
 2021-02-11 21:14:47 +01:00
Urban Rotnik
4cd2bce83f Fix Move button on Experiment card 2021-02-11 18:38:23 +01:00
Mojca Lorber
7071f4a6c5 Send selected folders param to modal 2021-02-11 18:27:16 +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
Mojca Lorber
ce451f86a8 Fix projects breadcrumbs style [SCI-5349] 2021-02-10 23:33:16 +01:00
Mojca Lorber
19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11:42 +01:00
aignatov-bio
486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
aignatov-bio
9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
mlorb
45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +01:00
Mojca Lorber
0d9b38a843 Add archived experiments card style 2021-02-07 19:04:30 +01:00
aignatov-bio
a339d821bd
Merge pull request #3105 from aignatov-bio/ai-sci-5255-update-marvin-js-model-styling 
Update marvinJS modal CSS [SCI-5255]
 2021-02-05 15:36:14 +01:00
aignatov-bio
554c0b964a Remove commented value [SCI-5255] 2021-02-05 15:26:01 +01:00
Miha Mencin
be6796c95a
Merge pull request #3137 from aignatov-bio/ai-sci-5365-add-experiments-list-view 
Add list view for experiments [SCI-5365]
 2021-02-05 09:58:52 +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
a843aac769 Add list view for experiments [SCI-5365] 2021-02-04 16:45:31 +01:00
Oleksii Kriuchykhin
c5b286c764 Fix corrupted SCSS file 2021-02-04 16:40:05 +01:00
Oleksii Kriuchykhin
c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Oleksii Kriuchykhin
8a0a0cbacc Add view only project users modal for project card [SCI-5337] 2021-02-04 11:25:35 +01:00
aignatov-bio
b4a6644f13
Merge pull request #3133 from aignatov-bio/ai-sci-5457-update-experiments-view-screen 
Connect front-end with back-end for experiments page [SCI-5457]
 2021-02-04 11:00:17 +01:00
Mojca Lorber
d897e20426 Implement new experiment card layout 2021-02-04 09:02:23 +01:00
aignatov-bio
a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio
8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
aignatov-bio
29cf9be1f6
Add filters to experiments pages [SCI-5366] (#3119) 
* Move filters to shared folder [SCI-5366]
 2021-01-29 13:24:02 +01:00
aignatov-bio
9a86cd9184
Update dashboard widgets height [SCI-5206][SCI-5249] (#3123) 2021-01-29 11:01:49 +01:00
Mojca Lorber
1080c22b30 Update Experiments page layout and the toolbar row 2021-01-28 22:47:08 +01:00
Alex Kriuchykhin
24d3ce3606
Merge pull request #3118 from okriuchykhin/ok_SCI_5369 
Add breadcrumbs to project experiments page [SCI-5369]
 2021-01-28 14:50:21 +01:00
aignatov-bio
8396c086f5
Add sticky toolbar for projects page [SCI-5401] (#3108) 
* Add sticky toolbar for projects page [SCI-5401]
 2021-01-25 15:36:23 +01:00
aignatov-bio
cea61a6bd2
Add hover effect to project table [SCI-5372] (#3111) 
* Add hover effect to projects table [SCI-5372]

* Fix markup [SCI-5372]
 2021-01-25 10:26:10 +01:00
Urban Rotnik
d54090fe0d Fix missing asset in report 
Use 40px asset in override so it will be properly compiled SCI-5446
 2021-01-25 07:49:19 +01:00
Mojca Lorber
c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Urban Rotnik
e3388b880c
Merge pull request #3109 from aignatov-bio/ai-sci-5438-fix-empty-search-state-for-tables 
Fix css for no results on projects page [SCI-5438]
 2021-01-21 15:45:34 +01:00
Urban Rotnik
b3e646fcea Clean up css 2021-01-21 15:40:53 +01:00
aignatov-bio
cfc8383004 Fix css for no results on projects page [SCI-5438] 2021-01-21 15:29:37 +01:00
aignatov-bio
908678fcff Update marvinJS modal css [SCI-5255] 2021-01-20 12:37:41 +01:00
Urban Rotnik
7cbea1facd
Fix card Restore/Archive actions (#3103) 2021-01-19 17:21:22 +01:00
aignatov-bio
07831c0294 Add new asset icons to report [SCI-5263] 2021-01-19 12:53:49 +01:00
Urban Rotnik
706ca4b118
Merge pull request #3093 from urbanrotnik/ur-sci-5388 
Set height on wholerow-clicked element [SCI-5388]
 2021-01-19 10:24:39 +01:00
Mojca Lorber
0837c73794 Fix red dot icon for projects filters 2021-01-18 14:02:28 +01:00
Urban Rotnik
3cf6047dbd Set height on wholerow-clicked element 2021-01-18 12:56:26 +01:00
aignatov-bio
823b9175bd
Small projects pages fixes [SCI-5330] (#3085) 2021-01-14 16:24:28 +01:00
Urban Rotnik
0e17cde499 Fix line height 2021-01-14 08:54:17 +01:00
Urban Rotnik
8d076d8c58 Fix border radius [SCI-5388] 2021-01-13 09:07:35 +01:00
mlorb
8fbdfa28d5
Merge pull request #3070 from mlorb/ml-sci-5333 
Add no results page for search on project page [SCI-5333]
 2021-01-12 12:02:37 +01:00
Urban Rotnik
c04f427c9e
Merge pull request #3065 from urbanrotnik/ur-sci-5377-missing-arrows 
Fix arrows for JS Tree [SCI-5377]
 2021-01-12 11:08:05 +01:00
Mojca Lorber
54a5528495 Add no results page for serach on project page [SCI-5333] 2021-01-12 09:18:19 +01:00
Urban Rotnik
244995cb3d Fix assets location and url references [SCI-5377] 2021-01-11 17:56:51 +01:00
Oleksii Kriuchykhin
684674952c Add Restore button to the archived Projects screen [SCI-5344] 2021-01-09 21:27:19 +01:00
Urban Rotnik
427b5d7107
Merge pull request #3059 from biosistemika/features/folders 
Features/folders into develop
 2021-01-08 06:26:44 +01:00
Urban Rotnik
6f155913ff
Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature 
Move projects/folders modal [SCI-5334]
 2021-01-07 17:45:19 +01:00
Urban Rotnik
3dc76a3e57 Fix typo, update carets 2021-01-07 17:42:04 +01:00
Urban Rotnik
3a52f62d85 Implement folders tree for move action 2021-01-07 17:42:01 +01:00
Urban Rotnik
ba13a0b14b Add jstree lib 2021-01-07 17:41:32 +01:00
aignatov-bio
0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
mlorb
e8b48e51f4
Merge pull request #3050 from mlorb/ml-sci-5336 
Fix table view of project page display of users [SCI-5336]
 2021-01-06 10:14:08 +01:00
aignatov-bio
ef57489cd9
Update repositories sidebar [SCI-5329] (#3031) 
* Update repositories sidebar [SCI-5329]
 2021-01-06 10:13:10 +01:00
Mojca Lorber
5298a91b48 Fix table view of project page display of users [SCI-5336] 2021-01-06 09:52:13 +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
Mojca Lorber
283bfc8759 Update css for users on project cards 2021-01-05 18:31:33 +01:00
Oleksii Kriuchykhin
696b8d19f0 Fix new project creation and archiving [SCI-5321][SCI-5326] 2021-01-05 14:14:01 +01:00
aignatov-bio
f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
aignatov-bio
2fe55250b9
Update settings navigation [SCI-5316] (#3028) 2021-01-05 09:11:05 +01:00
Urban Rotnik
216db90e4a
Merge pull request #3013 from urbanrotnik/ur-sci-5084-smart-annotation-missing-icon 
Fix cursor on SmartAnnotation [SCI-5084]
 2021-01-04 11:18:13 +01:00
mlorb
dafe8a072a
Merge pull request #3035 from mlorb/ml-sci-5095 
[SCI-5095] Change color of sidebar icons and labels
 2021-01-04 10:23:52 +01:00
Mojca Lorber
bd49e277cc [SCI-5059] Change font size for manage columns list 2020-12-29 11:27:52 +01:00
Mojca Lorber
80b472aba0 [SCI-5095] Change color of sidebar icons and labels 2020-12-29 11:15:22 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) 
* Add PDF Preview [SCI-5299]
 2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
mlorb
a999fb0c80
Change the layout of the archived projects cards and the list view [SCI-5267] (#3021) 
* change the layout of the archived projects cards and the list view

* change order in css
 2020-12-18 13:05:23 +01:00
Urban Rotnik
d3e38c89f8 Update BE sorting for archived fodlers&projects 
SCI-5306
 2020-12-18 11:27:17 +01:00
Urban Rotnik
7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik
87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Urban Rotnik
4f657ab343 Fix CSS 
SCI-5306
 2020-12-18 08:37:57 +01:00
mlorb
f6f7211d77
Update styling for projects filters and fix some js bugs [SCI-5210] (#3012) 
* Update styling for projects filters and fix some js bugs

* Fix hound
 2020-12-17 23:13:45 +01:00
Urban Rotnik
ad4ee65f6b
Merge pull request #3007 from urbanrotnik/ur-sci-5300 
Connect manage users modal with new projects cards [SCI-5300]
 2020-12-17 13:48:10 +01:00
Urban Rotnik
3eb667b6ba
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards 
Archived tasks cards [SCI-5274] [SCI-5275]
 2020-12-17 13:17:11 +01:00
Urban Rotnik
d4c84a38e5 Fix css 
[SCI-5274]
 2020-12-17 13:11:30 +01:00
Urban Rotnik
19f16555c6 Add checkbox and restore button 
[SCI-5275]
 2020-12-17 13:11:20 +01:00
Urban Rotnik
cd7b94b434 Fix users/comments tab showing 
[SCI-5274]
 2020-12-17 13:08:58 +01:00
Urban Rotnik
9a7ffb0645 Add Tags modal to archived tags screen 
[SCI-5274]
 2020-12-17 13:08:57 +01:00
Urban Rotnik
2ae075e893 Use canvas task card for archived task card 
[SCI-5274]
 2020-12-17 13:08:53 +01:00
aignatov-bio
2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) 
* Change experiment archived card [SCI-5270]
 2020-12-17 13:07:30 +01:00
Urban Rotnik
c7c6e2d0f2 Fix cursor on SmartAnnotation 2020-12-14 17:29:30 +01:00
aignatov-bio
30cfe78805
Add edit modal for project folders [SCI-5265] (#3002) 
Add edit modal for project folders [SCI-5265]
 2020-12-14 15:54:18 +01:00
Urban Rotnik
398978c69a Connect users modal to projects index page 2020-12-11 13:07:45 +01:00
Mojca Lorber
5cdab422df Update layout of the navigation for experiments, tasks list and task page 2020-12-10 15:15:36 +01:00
Urban Rotnik
207659a2c1 Fix markup [SCI-5266] 2020-12-10 13:36:38 +01:00
Urban Rotnik
152990b4d6 Add archived mode for Projects 
[SCI-5266]
 2020-12-09 08:51:55 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] (#2995) 
* Add projects sidebar navigation [SCI-5178]
 2020-12-08 16:07:26 +01:00
mlorb
9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968) 
* Implement actions dropdown on project card
* make comments counter to work
 2020-12-04 09:38:34 +01:00
Urban Rotnik
3700faa04a Update proejcts grid, include breadcrumbs, fix JS 
[SCI-5208]
 2020-12-03 12:29:28 +01:00
Oleksii Kriuchykhin
78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
Urban Rotnik
fcb82fd0d2
Merge pull request #2984 from okriuchykhin/ok_SCI_5204 
Project filters: add text field to the filters [SCI-5204]
 2020-11-27 12:04:46 +01:00
Oleksii Kriuchykhin
1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
aignatov-bio
d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete 
Add delete asset confirmation modal [SCI-5241]
 2020-11-26 15:35:40 +01:00
aignatov-bio
c6f4d23a78 Fix protocol preview file background 2020-11-26 15:35:06 +01:00
Urban Rotnik
85b22cd486 Fix syntax 2020-11-26 12:31:45 +01:00
Urban Rotnik
efd4f8abde Add members dropdown on project filters flyout 2020-11-26 12:29:43 +01:00
Urban Rotnik
34fbcb8f56 Add clear functionallity to projects filters 2020-11-26 09:23:22 +01:00
aignatov-bio
3078e60867 Small css fixes 2020-11-25 16:25:17 +01:00
aignatov-bio
c212d514d5 Fix delete asset in protocol repository 2020-11-25 13:13:06 +01:00
mlorb
e4001dd406
Merge pull request #2977 from mlorb/ml-sci-5048 
Implement ESC button to exit full-screen modals [SCI-5048]
 2020-11-25 09:55:16 +01:00
Mojca Lorber
2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio
f2ca55dbf8 Add new icons for assets 2020-11-24 15:37:45 +01:00
aignatov-bio
dc62e2780a
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout 
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
 2020-11-24 11:25:36 +01:00
aignatov-bio
ba39d8d31b Fix markup 2020-11-23 15:02:50 +01:00
aignatov-bio
84d681ecce Replace loading spinner 2020-11-23 14:14:54 +01:00
aignatov-bio
833c327e3a Fix empty state during loading 2020-11-23 12:44:23 +01:00
Mojca Lorber
c57da3380f Remove complete step button from protocol step and fix step number in Firefox 2020-11-23 10:18:27 +01:00
aignatov-bio
77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio
60ce51149d Add CRUD to comments 2020-11-20 20:25:28 +01:00
aignatov-bio
da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
aignatov-bio
96bf3dcea2
Merge pull request #2958 from aignatov-bio/ai-sci-5224-update-title-font-color-for-asset-dropdown 
Update title font color for asset dropdown [SCI-5224]
 2020-11-19 12:20:20 +01:00
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
Urban Rotnik
aba0034854 Convert some values to ems 2020-11-19 09:25:26 +01:00
Urban Rotnik
e893d40eea Add filters flyout for projects 2020-11-19 09:23:35 +01:00
aignatov-bio
2294d396f9 Add comments sidebar layout 2020-11-18 16:26:01 +01:00
aignatov-bio
14ccb5c6a6 Update title font color for asset dropdown 2020-11-17 12:47:45 +01:00
Mojca Lorber
ceb0923ce6 Fix tooltip display when editing inventory row 2020-11-16 16:16:47 +01:00
aignatov-bio
6c305011ca Update dashboard placeholders 2020-11-12 12:49:00 +01:00
aignatov-bio
7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
Miha Mencin
1cfb205df7
Merge pull request #2939 from aignatov-bio/ai-sci-5122-fix-navigation-on-small-screens 
Fix navigation on small screens [SCI-5122]
 2020-11-11 10:22:12 +01:00
aignatov-bio
71ddf680b2 Add highlight to report table 2020-11-10 15:15:18 +01:00
mlorb
a71e8ef9cf
Merge pull request #2940 from mlorb/ml-sci-5034 
Expose the new step button on task [SCI-5034]
 2020-11-10 13:10:55 +01:00
Urban Rotnik
0f5bf45cf6 Rebase, add toolbar, minor fixes css and JS 2020-11-06 13:56:21 +01:00
Urban Rotnik
9f12c5f343 New cards and list layout 2020-11-06 13:01:52 +01:00
Mojca Lorber
8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
aignatov-bio
2c64481cda Fix navigation on small screens 2020-11-05 15:20:34 +01:00
aignatov-bio
5b22f7d301 Fix dashboard small screen overlap 2020-11-05 14:47:19 +01:00
aignatov-bio
99b52e5d80 Fix markup 2020-11-05 08:44:48 +01:00
Oleksii Kriuchykhin
327baafcd7 Improve CSS structure for project toolbar [SCI-5129] 2020-11-04 16:10:40 +01:00
aignatov-bio
12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
aignatov-bio
0f80786433 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step 2020-11-02 18:52:46 +01:00
aignatov-bio
84a7d49023 Fix markup 2020-11-02 18:51:21 +01:00
aignatov-bio
f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports 
Add filer previews to reports [SCI-5110]
 2020-11-02 18:48:45 +01:00
aignatov-bio
eca39a00b5 Add attachments dropdown to step 2020-11-02 18:47:08 +01:00
Mojca Lorber
8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
Oleksii Kriuchykhin
258c57870f Implement the toolbar on the Team Projects page [SCI-5129] 2020-11-02 13:28:37 +01:00
Mojca Lorber
04e3b67968 Change the way buttons are toggled 2020-10-30 18:47:01 +01:00
Mojca Lorber
a52315fc79 Merge branch 'develop' into ml-sci-5033 2020-10-29 18:28:25 +01:00
Urban Rotnik
e923128c0e
Merge pull request #2927 from biosistemika/features/signature-requests 
Features/signature requests into develop
 2020-10-29 14:48:25 +01:00
aignatov-bio
d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
Oleksii Kriuchykhin
13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
aignatov-bio
23f9fb212d
Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal 
Update image edit modal [SCI-5105]
 2020-10-29 09:15:32 +01:00
aignatov-bio
16249201f3 Fix markup 2020-10-28 16:44:28 +01:00
aignatov-bio
2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
Miha Mencin
235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
aignatov-bio
bddd1956ab Fix font size and font weight for status label 2020-10-26 12:35:40 +01:00
Mojca Lorber
ec41bdd414 Move open mobile app button to main navigation 2020-10-26 09:28:44 +01:00
aignatov-bio
aefaf4d0c1 Update image edit modal 2020-10-25 16:57:50 +01:00
Urban Rotnik
b23f110184
Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters 
Add mark for active filters [SCI-5085]
 2020-10-25 16:06:59 +01:00
Urban Rotnik
c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228 
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
 2020-10-23 15:33:22 +02:00
Urban Rotnik
75351a3aed px to em 2020-10-23 14:11:56 +02:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Mojca Lorber
6d7b55301f Fix pwa url and change when banner is displayed 2020-10-21 14:56:20 +02:00
Urban Rotnik
2f99e3a464 Remove border, update copy 2020-10-21 09:58:35 +02:00
Urban Rotnik
e7d2d78935 Add mark for active filters 2020-10-20 16:45:54 +02:00
aignatov-bio
2968e677b8 Update image for doorkeeper auth 2020-10-19 16:23:20 +02:00
Mojca Lorber
23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
aignatov-bio
3fe3c2087f Fix hound issues 2020-10-16 11:27:23 +02:00
aignatov-bio
566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +02:00
aignatov-bio
016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
aignatov-bio
0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
Mojca Lorber
5013f224ee Fix ems 2020-10-14 13:16:38 +02:00
Mojca Lorber
a944525d25 Change px to em 2020-10-12 16:59:33 +02:00
Mojca Lorber
cf367baefa Merge branch 'develop' into ml-sci-4841 2020-10-12 14:43:03 +02:00
aignatov-bio
5d6c9e78fd Refactor dashboard layout 2020-10-06 16:09:26 +02:00
Mojca Lorber
4e4a4a2c4e Change Complete step button on task step 2020-10-02 15:02:42 +02:00
Oleksii Kriuchykhin
21fab4198c Merge branch 'develop' into features/local 2020-10-01 11:52:59 +02:00
Oleksii Kriuchykhin
25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio
1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +02:00
Mojca Lorber
94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio
780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
aignatov-bio
e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio
d719c26b6c Add error handling for MarvinJS 2020-09-23 12:26:26 +02:00
Mojca Lorber
23d6d93074 Fix css 2020-09-21 17:13:42 +02:00
Mojca Lorber
d9a78d20d7 Update empty states for smart annotation results and dismiss button 2020-09-18 08:50:01 +02:00
aignatov-bio
e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio
f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
mlorb
4acd0c4cb9
Merge pull request #2841 from mlorb/ml-sci-4984 
Add saving state for filters on dashboard [SCI-4984]
 2020-09-17 09:53:16 +02:00
Mojca Lorber
3c30ee904e Merge branch 'features/task-flows' into ml-sci-4984 2020-09-15 13:27:34 +02:00
mlorb
bf707a11a9
Merge branch 'features/task-flows' into ml-sci-4976 2020-09-15 12:59:49 +02:00
Mojca Lorber
fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Mojca Lorber
13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +02:00
aignatov-bio
c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
aignatov-bio
008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio
18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
Mojca Lorber
eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio
7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
aignatov-bio
946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +02:00
aignatov-bio
661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio
f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
aignatov-bio
5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +02:00
aignatov-bio
84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575 
Replace old arrow with new one [SCI-4575]
 2020-09-09 09:05:39 +02:00
aignatov-bio
ae1bec2a95
Merge pull request #2818 from mlorb/ml-sci-4572 
Change step checklist and table edit mode [SCI-4572]
 2020-09-09 09:02:56 +02:00
aignatov-bio
bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
Mojca Lorber
7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +02:00
Mojca Lorber
9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
aignatov-bio
d85703113a Add front-end checks 2020-09-03 14:34:34 +02:00
aignatov-bio
39105a807a
Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow 
Fix css for status flows [SCI-4970]
 2020-09-03 09:46:19 +02:00
Mojca Lorber
06d75fb07e Change step checklist and table edit mode 2020-09-02 18:04:37 +02:00
aignatov-bio
257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
Mojca Lorber
634dd2ae5e Add css variable 2020-09-02 12:00:52 +02:00
Mojca Lorber
d57eb68f93 Fix tables header corners 2020-09-01 16:25:30 +02:00
Urban Rotnik
ed5869ff8e Show status on task card 2020-09-01 14:56:48 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik
5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
aignatov-bio
21e4dcd96a Add wopi preview for office files 2020-08-25 13:22:36 +02:00
Alex Kriuchykhin
5006173d59
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard 
Add new statuses to dashboard [SCI-4856]
 2020-08-24 11:09:57 +02:00
Mojca Lorber
059c8c88d9 Fix css for modal-body 2020-08-20 14:12:45 +02:00
Mojca Lorber
a91aa6ce46 Fix Collapse and expand buttons position 2020-08-13 13:18:50 +02:00
aignatov-bio
56ff4e7702 Add new statuses to dashboard 2020-08-10 09:10:56 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik
cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Alex Kriuchykhin
e965844a9e
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports 
Add new statuses to reports [SCI-4837]
 2020-08-04 09:49:55 +02:00
Urban Rotnik
aaae33e603
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard 
Add start date to current task dashboard filter [SCI-4766]
 2020-08-03 11:56:24 +02:00
aignatov-bio
73911cf7ce Fix CSS for activities on task page 2020-07-30 13:30:23 +02:00
aignatov-bio
2f5231e832 Add start date to current task dashboard filter 2020-07-29 16:09:23 +02:00
aignatov-bio
15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio
6bd12e0397 Add modal for status flow 2020-07-27 13:48:21 +02:00
Alex Kriuchykhin
d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results 
Add pagination to results page [SCI-4732]
 2020-07-23 14:45:10 +02:00
aignatov-bio
a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
aignatov-bio
b214d2df77
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch 
Fix switch view margins [SCI-4815]
 2020-07-23 08:57:20 +02:00
Urban Rotnik
512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik
aacee14fc6 Add Status button 2020-07-22 15:30:47 +02:00
aignatov-bio
1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Urban Rotnik
7019e42736
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email 
Fix font size in dropdown [SCI-4816]
 2020-07-20 15:50:10 +02:00
aignatov-bio
691b8ec327 Fix switch view margins 2020-07-20 15:17:24 +02:00
Urban Rotnik
748dd7912b Fix font size in dropdown 2020-07-20 11:36:25 +02:00