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

11460 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin 827567c167
Merge pull request #4515 from rekonder/aj_SCI_7314 
Fixed the existing templates  [SCI-7314]
 2022-10-12 11:49:09 +02:00
Alex Kriuchykhin 0831d4599c
Merge pull request #4518 from artoscinote/ma_SCI_7323 
Remove legacy protocol links [SCI-7323]
 2022-10-12 11:48:04 +02:00
Martin Artnik b67bea81b8 Remove legacy protocol links [SCI-7323] 2022-10-12 11:01:16 +02:00
Oleksii Kriuchykhin f0ea7ea2a4 Add option to disable local password log in [SCI-7298] 2022-10-12 10:30:09 +02:00
Andrej 230aea15fc Update experiment templates [SCI-7314] 2022-10-11 15:55:56 +02:00
ajugo e96ccdb1d5
Fix start date on locked task and correct format of number [SCI-7098] (#4366) 2022-10-11 11:31:53 +02:00
Alex Kriuchykhin 99ffbf47ab
Merge pull request #4512 from okriuchykhin/ok_SCI_7297 
Fix report creation permission check [SCI-7297]
 2022-10-11 11:01:31 +02:00
ajugo 0493d6f31d
Fix label template preview issues [SCI-7313] (#4514) 
* Add preview label at open modal [SCI-7313]

* Add density and unit to the label template [SCI-7313]
 2022-10-11 10:58:37 +02:00
Alex Kriuchykhin 4c9f96f7f7
Merge pull request #4510 from okriuchykhin/ok_SCI_7292 
Add logic for user role updates for team child objects [SCI-7292]
 2022-10-11 10:49:08 +02:00
Oleksii Kriuchykhin f68e85532c Fix report creation permission check [SCI-7297] 2022-10-10 16:16:54 +02:00
Alex Kriuchykhin 3592faea78
Merge pull request #4511 from okriuchykhin/ok_SCI_7230 
Fix filtering by user role for teams table [SCI-7320]
 2022-10-10 16:07:34 +02:00
Alex Kriuchykhin 4ac46f876a
Merge pull request #4509 from rekonder/aj_SCI_7315 
Fix selected printer for printing [SCI-7315]
 2022-10-10 15:59:29 +02:00
Alex Kriuchykhin 3a9b568358
Merge pull request #4508 from rekonder/aj_SCI_7318 
Fix view permission at label template table [SCI-7318]
 2022-10-10 15:59:02 +02:00
Oleksii Kriuchykhin a88e936693 Fix filtering by user role for teams table [SCI-7230] 2022-10-10 15:48:38 +02:00
Oleksii Kriuchykhin 9322052f9d Add logic for user role updates for team child objects [SCI-7292] 2022-10-10 15:27:42 +02:00
Andrej 5d6b454756 Fix selected printer for printing [SCI-7315] 2022-10-10 13:33:35 +02:00
Andrej 42193bbe81 Fix view permission at label template table [SCI-7318] 2022-10-07 17:16:40 +02:00
Alex Kriuchykhin 5158b3e155
Merge pull request #4505 from okriuchykhin/ok_SCI_7308 
Fix user invitation modal [SCI-7308]
 2022-10-07 14:53:34 +02:00
Alex Kriuchykhin 4d529cfcb5
Merge pull request #4499 from okriuchykhin/ok_SCI_7291 
Update teams table with new user assignments system [SCI-7291]
 2022-10-07 14:53:19 +02:00
Alex Kriuchykhin ca6ba51999
Merge pull request #4467 from okriuchykhin/ok_SCI_7261 
Connect update fluics template button with controller action [SCI-7261]
 2022-10-07 14:53:07 +02:00
Oleksii Kriuchykhin 0e95b7ea66 Connect update fluics template button with controller action [SCI-7261] 2022-10-07 14:52:23 +02:00
artoscinote 8ca02ec619
Merge pull request #4507 from G-Chubinidze/gc_SCI_7251 
fixed can not set due date on task card issue [SCI-7251]
 2022-10-07 12:40:56 +02:00
G-Chubinidze 47e4244d9e
Update _manage_due_date_modal.html.erb 2022-10-07 14:38:59 +04:00
Giga Chubinidze 8b5ff3955b fixed can not set due date on task card issue [SCI-7251] 2022-10-07 14:14:29 +04:00
Oleksii Kriuchykhin 173e3b09cd Fix user invitation modal [SCI-7308] 2022-10-06 17:55:51 +02:00
Alex Kriuchykhin c5fb97cb0c
Merge pull request #4487 from artoscinote/ma_SCI_7283 
Fix team folder permission [SCI-7283]
 2022-10-06 15:48:45 +02:00
Alex Kriuchykhin 07d470b2ff
Merge pull request #4479 from okriuchykhin/ok_SCI_7271 
Fix label printing status modal [SCI-7271]
 2022-10-06 15:46:36 +02:00
Alex Kriuchykhin 0f394b34ce
Merge pull request #4495 from okriuchykhin/ok_SCI_7289 
Fix search in team members table [SCI-7289]
 2022-10-06 15:46:03 +02:00
Alex Kriuchykhin 9152cee31f
Merge pull request #4496 from okriuchykhin/ok_SCI_7290 
Fix user role loading for Team in permission checking concern [SCI-7290]
 2022-10-06 15:45:48 +02:00
Alex Kriuchykhin d648492bad
Merge pull request #4500 from okriuchykhin/ok_SCI_7293 
Fix project visibility for team admins [SCI-7293]
 2022-10-06 15:45:29 +02:00
Alex Kriuchykhin 5ab361123e
Merge pull request #4501 from okriuchykhin/ok_SCI_7295 
Assign user to public projects after adding to a team [SCI-7295]
 2022-10-06 15:45:17 +02:00
artoscinote 77b91b467a
Merge pull request #4485 from rekonder/aj_SCI_7270 
Add label printer modal to task [SCI-7270][7296]
 2022-10-06 15:01:31 +02:00
ajugo 5f38464369
Fix open label template in new tab [SCI-7302] (#4503) 2022-10-06 14:57:45 +02:00
artoscinote e89266d337
Merge pull request #4504 from rekonder/aj_SCI_7312 
Add name to zebra printer initialization [SCI-7312]
 2022-10-06 14:55:14 +02:00
Andrej 16a7dd261f Add name to zebra printer initialization [SCI-7312] 2022-10-06 14:52:15 +02:00
ajugo 88d9ece237
Fix zebra printer library load [SCI-7310] (#4502) 2022-10-06 13:52:49 +02:00
ajugo f87b42d042
Remove icon from the status repository column at label print time [SCI-7267] (#4471) 
* Remove icon from the status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]
 2022-10-06 11:53:12 +02:00
ajugo eef93c42d8
Disable print modal button for offline printer statuses [SCI-7276] (#4493) 
* Disable print modal button for offline printer statuses [SCI-7276]

* Disable print modal button for offline printer statuses [SCI-7276]
 2022-10-06 11:19:51 +02:00
aignatov-bio bd535dc9ad
Add dimension saving to label templates [SCI-7268] (#4489) 2022-10-06 11:09:10 +02:00
Alex Kriuchykhin ae8f5526be
Merge pull request #4490 from aignatov-bio/ai-sci-7287-fix-validation-on-print-modal 
Fix validation on print modal [SCI-7287]
 2022-10-06 10:42:36 +02:00
Oleksii Kriuchykhin 9a05bf04bd Assign user to public projects after adding to a team [SCI-7295] 2022-10-05 22:40:46 +02:00
Oleksii Kriuchykhin b87ed7db8e Fix project visibility for team admins [SCI-7293] 2022-10-05 19:40:45 +02:00
Oleksii Kriuchykhin 0a8ebef095 Update teams table with new user assignments system [SCI-7291] 2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin cf34ddcbd1 Fix user role loading for Team in permission checking concern [SCI-7290] 2022-10-04 13:53:45 +02:00
ajugo 7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] (#4492) 2022-10-04 09:57:47 +02:00
Andrej 884fe58525 Fix label print open issue [SCI-7296] 2022-10-03 17:33:42 +02:00
Oleksii Kriuchykhin 830248ada9 Fix search in team members table [SCI-7289] 2022-10-03 16:56:15 +02:00
Andrej e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +02:00
Alex Kriuchykhin d70428c6fe
Merge pull request #4477 from okriuchykhin/ok_SCI_7258 
Fix label printers dropdown on print modal [SCI-7258]
 2022-10-03 10:37:42 +02:00
Oleksii Kriuchykhin b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00