Anton
a95ca75362
Add new protocol modal [SCI-7810]
2023-02-21 14:15:53 +01:00
Anton
ea9d2d8291
Merge branch 'develop' into features/protocol_versioning
2023-02-14 11:07:58 +01:00
Martin Artnik
4e779e70a4
Merge branch 'develop' into features/tiny_mce_6
2023-01-04 14:21:02 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views
2022-12-22 13:33:25 +01:00
ajugo
5ab804c35a
Implement general protocol repository toolbar [SCI-7557] ( #4698 )
...
* Implement general protocol repository toolbar [SCI-7557]
* Move protocolsio page [SCI-7557]
2022-12-19 13:18:24 +01:00
Martin Artnik
c828d02b99
Merge branch 'develop' into features/tiny_mce_6
2022-12-07 14:07:43 +01:00
Oleksii Kriuchykhin
49fbc2c561
Add basic modal for direct task creation [SCI-7197]
2022-11-18 17:00:11 +01:00
aignatov-bio
0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027
...
Session end implementation [SCI-7027]
2022-11-10 11:03:02 +01:00
Anton
bacd3524e8
Add tags manager to experiment table view [SCI-7368]
2022-11-02 15:17:10 +01:00
Anton
bc86f11404
Add experiment table view [SCI-7174]
2022-10-21 12:22:38 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] ( #4455 )
2022-09-23 12:34:43 +02:00
Andrej
ec77c2a076
Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027
2022-09-16 10:44:07 +02:00
Andrej
ac7c873385
Session end implementation [SCI-7027]
2022-09-16 09:57:40 +02:00
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] ( #4385 )
...
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]
* Cleanup and refactor [SCI-7081]
* Clean up legacy plugins [SCI-7150]
* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +02:00
ajugo
b58e3cd4d8
Add zebra settings screen [SCI-7016] ( #4310 )
...
* Add zebra settings screen [SCI-7016]
* Fix hound [SCI-7016]
2022-08-04 11:14:35 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] ( #4292 )
...
* Initial label template datatable [SCI-7018]
* Add new columns to LabelTemplate and update datatable view [SCI-7018]
* Fix after rebase [SCI-7018]
* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02: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
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
artoscinote
561746158e
Further fix scoping of table styles [SCI-6315] ( #3720 )
2021-12-06 10:40:08 +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
Martin Artnik
57d5e6c2a7
Merge branch 'develop' into features/barcodes
2021-08-03 13:36:36 +02:00
aignatov-bio
43571b5692
Print labels changes [SCI-5943] ( #3461 )
2021-08-02 15:38:37 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] ( #3366 )
2021-06-03 14:00:43 +02:00
Oleksii Kriuchykhin
29c83ffbb1
Merge branch 'develop' into features/new-reports
2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin
a307a16033
Fix handsontable assets inclusion in report templates [SCI-5692]
2021-05-04 16:05:19 +02:00
Oleksii Kriuchykhin
8a915c8acf
Fix assets inclusion into report [SCI-5680]
2021-04-28 14:37:16 +02:00
Oleksii Kriuchykhin
2f6194a99f
Remove canvas-to-blob library [SCI-5595]
2021-03-29 14:02:30 +02:00
Oleksii Kriuchykhin
67b3f853d7
Merge branch 'develop' into features/folders
2020-12-18 14:51:21 +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
Mojca Lorber
5cdab422df
Update layout of the navigation for experiments, tasks list and task page
2020-12-10 15:15:36 +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
Urban Rotnik
aa1520bfb8
Merge branch 'develop' into jg_sci_2228
2020-10-22 14:21:39 +02:00
Mojca Lorber
23f01ac6a9
Add 'Open in APP' button to the task
2020-10-19 12:17:03 +02:00
Urban Rotnik
a259800590
Merge branch 'develop' into jg_sci_2228
2020-08-31 16:29:23 +02:00
aignatov-bio
6bd12e0397
Add modal for status flow
2020-07-27 13:48:21 +02:00
aignatov-bio
e8325ea736
Remove duplicate assets from initializers
2020-04-07 12:39:06 +02:00
aignatov-bio
7fdc169ba2
Add simple view to repository table
2020-04-06 19:52:41 +02:00
Mojca Lorber
a342e3d31f
Add emojionearea for status column type
2020-01-16 14:58:59 +01:00
Mojca Lorber
9d4796cf90
refactor repository column javascript
2019-11-29 10:17:44 +01:00
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Luka Murn
83bb89fdf5
Cherry-picked commit from ZZ (and LM)'s various changes
2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
4ea6b56582
Fix Step and Result file previews [SCI-3539]
2019-07-01 23:30:20 +02:00
Jure Grabnar
b3c3b68dc2
Add external preview to External Protocols tab
...
Closes SCI-3563
2019-06-19 22:54:20 +02:00
Oleksii Kriuchykhin
01a5a17bb4
Update Handsontable to 6.2.2 [SCI-3526]
2019-06-04 14:31:37 +02:00
Jure Grabnar
613843d095
Temp commit
2019-04-04 16:58:55 +02:00
Oleksii Kriuchykhin
0b87e8e1e4
Merge branch 'features/global-activities' into ok_SCI_3024_v3
2019-03-08 10:29:51 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] ( #1521 )
...
* Adding side pane filtering and top pane
2019-03-06 10:34:04 +01:00
Oleksii Kriuchykhin
0930277c4e
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
2019-02-27 16:02:53 +01:00
aignatov-bio
5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] ( #1482 )
...
* System notification view and notification partial (SCI 2956 and SCI 3001)
2019-02-13 13:06:14 +01:00
