Commit graph

13090 commits

Author SHA1 Message Date
aignatov-bio d7e8f0303f
Merge branch 'features/navigation-refactor-v2' into ai-sci-8016-left-navigation-refactor 2023-04-19 10:33:09 +02:00
artoscinote 4624580af7
Merge pull request #5324 from scinote-eln/develop
April 2023 Release
2023-04-19 10:25:38 +02:00
artoscinote 1457d09da8
Bump version to 1.27.1 2023-04-19 10:22:04 +02:00
G-Chubinidze 5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] (#5302)
* well plate implementation without nested dropdown

* Implement dropdown submenu [SCI-7931]

* minor code cleanup

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
2023-04-18 15:42:53 +02:00
artoscinote 08b758736c
Merge pull request #5320 from aignatov-bio/ai-fix-marvin-js-icon
Fix marvin js icon
2023-04-18 14:13:30 +02:00
Anton 265272f212 Fix marvin js icon 2023-04-18 14:09:41 +02:00
artoscinote 009bffa77a
Merge pull request #5319 from sboursen-scinote/sb_SCI-8286
Update config after protocol.io changed page_id [SCI-8286]
2023-04-18 12:50:31 +02:00
sboursen-scinote b8b33fe480 Update configuration after protocol.io changed default page_id to 0 [SCI-8286] 2023-04-18 12:43:56 +02:00
artoscinote 1c3026e642
Merge pull request #5318 from artoscinote/ma_SCI_8323
Fix display of special characters in teams dropdown [SCI-8323]
2023-04-18 12:00:39 +02:00
Martin Artnik cccb5cd54e Fix display of special characters in teams dropdown [SCI-8323] 2023-04-18 11:59:00 +02:00
aignatov-bio 54cbcb4657
Merge pull request #5317 from aignatov-bio/ai-sci-7926-add-new-buttons-tyle
Add tailwind [SCI-7926]
2023-04-18 11:53:02 +02:00
Anton bc2959dfb4 Add new button styles and tailwind [SCI-7926] 2023-04-18 11:36:12 +02:00
ajugo 0868f60242
Fix error handling for protocols [SCI-8341] (#5316) 2023-04-18 11:22:17 +02:00
aignatov-bio c763882fe6
Merge pull request #5315 from aignatov-bio/ai-sci-8235-fix-login-page
Fix signup page layout [SCI-8235]
2023-04-18 11:05:44 +02:00
Anton 2bbc98c531 Fix signup page layout 2023-04-18 11:03:00 +02:00
aignatov-bio 6ee87c72ef
Merge pull request #5310 from aignatov-bio/ai-sci-8327-add-webhook-menu-permission-check
Add webhook menu permission check [SCI-8327]
2023-04-18 10:38:40 +02:00
aignatov-bio 20f9b41b78
Merge pull request #5314 from aignatov-bio/ai-sci-8331-small-fixes-for-notifications
Small fixes for notifications [SCI-8331]
2023-04-17 15:35:29 +02:00
Anton 1526553467 Small fixes for notificaitions [SCI-8331] 2023-04-17 15:23:52 +02:00
aignatov-bio 3ac857cb5d
Merge pull request #5313 from aignatov-bio/ai-sci-8326-fix-white-border-on-task-screen
Fix white border at task page and remove teams/users escaping for navigation [SCI-8326]
2023-04-17 11:52:35 +02:00
Anton 737a53633e Fix white border at task page and remove teams/users escaping for navigation [SCI-8326] 2023-04-17 11:36:08 +02:00
aignatov-bio 83790be734
Merge pull request #5112 from aignatov-bio/ai-sci-7960-add-disclaimer-to-login-page
Add disclaimer modal [SCI-7960]
2023-04-17 11:25:06 +02:00
aignatov-bio 18590b502d
Merge pull request #5309 from aignatov-bio/ai-sci-8325-fix-date-sorting-in-notifications
Fix date sorting in notifications [SCI-8325]
2023-04-17 11:23:37 +02:00
Anton 8202d2e817 Add disclaimer modal [SCI-7960] 2023-04-17 11:22:50 +02:00
ajugo b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton ad966c1608 Add webhook menu permission check [SCI-8327] 2023-04-14 14:59:14 +02:00
Anton c990301f1b Fix date sorting in notifications [SCI-8325] 2023-04-14 14:46:57 +02:00
artoscinote 7f7cf50b30
Merge pull request #5307 from aignatov-bio/ai-sci-8322-fix-search-page-scrolling
Fix search page scrolling [SCI-8322]
2023-04-14 14:42:08 +02:00
Anton 3f0f32113b Fix search page scrolling [SCI-8322] 2023-04-14 13:42:41 +02:00
aignatov-bio ea4fe49699
Merge pull request #5306 from aignatov-bio/ai-sci-8317-fix-messages-filter-in-notification-flyout
Fix messages filter in notifcation flyout [SCI-8317]
2023-04-14 13:28:03 +02:00
aignatov-bio 9ab1d8c73e
Merge pull request #5305 from aignatov-bio/ai-sci-8288-fix-navigation-sidebar
Fix navigation sidebar [SCI-8288]
2023-04-14 13:22:02 +02:00
Anton 6966c6cba4 Fix messages filter in notifcation flyout [SCI-8317] 2023-04-14 13:16:34 +02:00
Anton acd6413ca3 Fix navigation sidebar [SCI-8288] 2023-04-14 11:38:28 +02:00
aignatov-bio 134e7373c7
Merge pull request #5280 from sboursen-scinote/sb_SCI-8237-alternative-solution
Title for publishing template protocol draft must include next version value (Alt) [SCI-8237]
2023-04-14 10:37:51 +02:00
artoscinote dd97a83de1
Merge pull request #5303 from G-Chubinidze/gc_SCI_7459
Not saved checklist item at pasting text [SCI-7459]
2023-04-14 10:28:38 +02:00
sboursen-scinote 4783ffcc4f Fix the issue with the published version number and refactor the code [SCI-8237] 2023-04-14 09:56:35 +02:00
Giga Chubinidze 5fa59ec2a0 Not saved checklist item at pasting text [SCI-7459] 2023-04-13 21:58:49 +04:00
aignatov-bio cbd84b94b4
Merge pull request #5288 from aignatov-bio/ai-sci-8280-add-counters-logic-to-notifications
Add counters logic for notifications [SCI-8280]
2023-04-13 15:35:56 +02:00
Anton cb7f41e516 Add counters logic for notifications [SCI-8280] 2023-04-13 15:35:21 +02:00
ajugo e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +02:00
artoscinote 19c98653a5
Merge pull request #5299 from sboursen-scinote/sb_SCI-8223
CSS: Protocol template list of smaller issues (Update) [SCI-8223]
2023-04-13 15:00:33 +02:00
aignatov-bio 3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:59:39 +02:00
sboursen-scinote ea384caa60 Fix Hound [SCI-8223] 2023-04-13 14:58:28 +02:00
Anton caf21959bd Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309] 2023-04-13 14:54:03 +02:00
sboursen-scinote 14895dd9f1 Change the position of the edit buttons in the versions modal [SCI-8223] 2023-04-13 14:49:30 +02:00
aignatov-bio 9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
artoscinote 549ae8dae1
Merge pull request #5296 from G-Chubinidze/gc_SCI_8086
experiment workflow image border color change
2023-04-13 12:53:15 +02:00
Giga Chubinidze f641c56c07 experiment workflow image border color change 2023-04-13 14:51:14 +04:00
Soufiane 4245807a69
Display the last protocol version when dashboard recent works is clicked [SCI-8266] (#5268) 2023-04-13 11:38:30 +02:00
dependabot[bot] 1d5fb1fcb2
Bump nokogiri from 1.13.10 to 1.14.3 (#5284)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.10 to 1.14.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.10...v1.14.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-12 16:03:26 +02:00
artoscinote d4c5f8a30f
Merge pull request #4988 from sboursen-scinote/sb_SCI-7815
Wrong selection of select all checkbox for P/E/T, report, protocol templates tables [SCI-7815]
2023-04-12 15:48:54 +02:00