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

3123 commits

Author SHA1 Message Date
Andrej f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik 5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
aignatov-bio 4b2f520779
Merge pull request #5788 from aignatov-bio/ai-sci-8870-fixed-rtf-preview-for-new-files 
Fix rtf preview for new images [SCI-8870]
 2023-07-19 09:57:56 +02:00
Anton 36ffe3a444 Fix asset result edit mode [SCI-8891] 2023-07-19 09:42:00 +02:00
Giga Chubinidze 6bfbb83df5 Error at inviting user to SciNote 2023-07-19 11:07:17 +04:00
Anton 1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
aignatov-bio bab8e2c330
Merge pull request #5796 from aignatov-bio/ai-sci-8883-fix-snapshot-table-render 
Fix snapshot table render [SCI-8883]
 2023-07-18 14:16:13 +02:00
wandji 7dcc774414
Refactor html partial rendering in json responses [SCI-8811] (#5763) 
* Remove redundant use of respond_to in controlller actions with just one responder format [SCI-8811]

* Remove redundant begin block and replace 303 status code with :see_other [SCI-8811]
 2023-07-18 13:36:41 +02:00
Anton f710691709 Fix snapshot table render [SCI-8883] 2023-07-18 11:43:55 +02:00
Anton d37f335f17 Fix rtf preview for new images [SCI-8870] 2023-07-18 11:08:39 +02:00
artoscinote e79c73f8c4
Merge pull request #5777 from wandji20/wb-SCI-8851 
Fix issue archiving task result tables and when downloading archived result table
 2023-07-18 08:18:11 +02:00
Soufiane 5736c444f6
Remove not used code for global activities [SCI-4851] (#5773) 
* Fix broken task/activity [SCI-4851]

* Remove unused code for global activities [SCI-4851]
 2023-07-17 15:36:22 +02:00
wandji 063c1209ba
Fix issue when viewing task repository snapshot [SCI-8871] (#5785) 2023-07-17 13:15:04 +02:00
Anton bd1e81f894 Fix preview generation [SCI-8855] 2023-07-17 13:05:33 +02:00
wandji20 3ee5049654 Fix issue archiving task result tables and when downloading archived tables [SCI-8851] 2023-07-15 11:33:44 +01:00
wandji ebe1bd583f
Fix issue json response for creating result table [SCI-8853] (#5768) 
* Fix issue json resposnse for creating result table [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix issues when editing and updating results text/table for task [SCI-8853]

* Fix linter errors [SCI-8853]
 2023-07-14 12:30:36 +02:00
Oleksii Kriuchykhin a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin 092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +02:00
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Alex Kriuchykhin d419608f18
Connect protocol parsing service to rails backend [SCI-8817] (#5759) 2023-07-13 11:41:53 +02:00
Soufiane 78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Soufiane 6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758) 
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
 2023-07-12 15:42:34 +02:00
G-Chubinidze ac399e5722
Activities - Issues after rails upgrade [SCI-8824] (#5755) 2023-07-12 11:11:10 +02:00
Soufiane 2f669c93d5
Fix projects issues after rails upgrade [SCI-8827] (#5754) 2023-07-12 11:10:17 +02:00
ajugo 32fc7698d2
Implement welcome modal for shareable links [SCI-8748] (#5729) 2023-07-11 16:01:42 +02:00
Alex Kriuchykhin b852cf92fe
Fix displaying of tinyMCE images in search results [SCI-8823] (#5751) 2023-07-11 14:47:15 +02:00
ajugo 632716e2cd
Remove task manage permission [SCI-8528] (#5672) 2023-07-11 09:29:17 +02:00
artoscinote 4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683) 
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
 2023-07-11 09:27:15 +02:00
Soufiane d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane 6aaa68f320
Fix reports issues after rails upgrade [SCI-8830] (#5748) 2023-07-11 09:20:29 +02:00
Soufiane e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
Soufiane b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00
Soufiane 8fb14645bf
Match protocol template print permissions to show [SCI-8803] (#5726) 2023-07-07 11:01:31 +02:00
ajugo 6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723) 
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
 2023-07-06 16:05:03 +02:00
Soufiane 33bb79d17a
Implement details and notes sections of shareable links [SCI-8750] (#5710) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-06 15:10:26 +02:00
Soufiane 6049c7d8b9
Activities for shareable links [SCI-8652] (#5694) 
Define new activities for task shareable links [SCI-8652]
 2023-07-06 15:01:32 +02:00
Anton 4b82ba9613 Merge branch 'features/rails-upgrade' into features/remove-front-end-gems 2023-07-06 11:14:48 +02:00
Soufiane 94ead579e6
Create the general layout for shareable links [SCI-8749] (#5699) 2023-07-06 09:19:29 +02:00
ajugo 836d1b6be1
Add permissions for shareable links and some fixes for controller [SCI-8747] (#5709) 
Add permissions for shareable links and som fixes for controller [SCI-8747]
 2023-07-05 16:21:26 +02:00
Alex Kriuchykhin 5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] (#5716) 2023-07-05 12:43:23 +02:00
Alex Kriuchykhin b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
artoscinote 1e8304d883
Merge pull request #5697 from wandji20/wb-SCI-8487 
Add filter to remove archived inventories from report widget [SCI-8487]
 2023-07-03 14:48:23 +02:00
ajugo 6dc4b646c5
Add handling for deleted ActiveStorage files [SCI-8264] (#5624) 
Add handling for deleted ActiveStorage files [SCI-8264]
 2023-07-03 13:13:19 +02:00
Anton b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
Martin Artnik c7d992ab83 Fixes for saving of result table metadata [SCI-8774] 2023-07-03 12:35:29 +02:00
Martin Artnik 0f3b524492 Fix and amend result table metadata saving [SCI-8774] 2023-06-30 14:11:03 +02:00
wandji20 eb017ff564 Add filter to remove archived inventories from report widget [SCI-8487] 2023-06-30 02:22:57 +01:00
ajugo 563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Giga Chubinidze a2aab6cbeb Parsing (import) protocols - Notifications update [SCI-8693] 2023-06-28 09:05:11 +04:00
artoscinote 5fe463d293
Merge pull request #5674 from sboursen-scinote/sb_SCI-8164-8726 
[SCI-8164][SCI-8726]
 2023-06-26 15:43:29 +02:00
sboursen-scinote 706c2e492b Fix CSS and icon inconsistencies [SCI-8164][SCI-8726] 
- Use the correct arrow-left/arrow-right icons.
- Show the tasks of active experiments in archived branch in the Navigator.
- Fix minor style issues in P/E/T.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-26 15:22:36 +02:00
artoscinote fa60cb6589
Merge pull request #5664 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-26 13:00:19 +02:00
Soufiane fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-23 12:10:58 +02:00
Giga Chubinidze ef94a4f2bb logic refactor, url removal 2023-06-23 13:39:54 +04:00
artoscinote 496fbc9eca
Merge pull request #5653 from rekonder/aj_SCI_8719 
Remove breadcrumbs project table and fix project filtering [SCI-8719]
 2023-06-23 09:54:00 +02:00
Oleksii Kriuchykhin e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Andrej 3d2f9eae1e Remove breadcrumbs project table and fix filtering [SCI-8719] 2023-06-22 13:44:27 +02:00
Oleksii Kriuchykhin 66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
artoscinote 4fe0ad026d
Change the way ConnectedDevice logging is added to TokensController [SCI-8287] (#5634) 2023-06-20 12:50:36 +02:00
sboursen-scinote ef16771f00 Add breadcrumbs to Fluics page [SCI-8675] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-19 12:20:53 +02:00
Soufiane 966b92e8d2
Activities update for grant project access to all team members [SCI-8383] (#5598) 
* Create new activities for granting/revoking access to all team members on projects [SCI-8383]
 2023-06-16 13:08:02 +02:00
Soufiane b254f5614b
Inventory export FE [SCI-6546] (#5608) 
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]
 2023-06-16 10:48:39 +02:00
Anton d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
G-Chubinidze 0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
Giga Chubinidze 41d42d47bd update addon controller 2023-06-14 05:15:18 +04:00
Giga Chubinidze 88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Soufiane 23e248ca02
Changed wording for activities [SCI-8243] (#5356) 
* Change wording for access activities in projects and protocols [SCI-8243]
* Add project activity for changing all team members role via project option-edit [SCI-8243]
 2023-06-13 16:55:40 +02:00
artoscinote 820bf7808a
Merge pull request #5586 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-13 14:49:14 +02:00
Anton b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00
Giga Chubinidze 673718f1db Breadcrumbs on label/protocol template page [SCI-8476] 2023-06-13 11:25:14 +04:00
artoscinote 91aab57914
Merge pull request #5580 from sboursen-scinote/sb_SCI-8545 
Improvement of dropdown in Assign to task modal [SCI-8545]
 2023-06-12 14:38:16 +02:00
Anton 16d4a09cfa Update left navigation 2023-06-12 14:23:26 +02:00
Soufiane 2e16302812
Team admin can see all projects in Navigator [SCI-8549] [SCI-8381] (#5575) 
Disable project links if team admin is missing read permission [SCI-8381]
 2023-06-12 12:55:32 +02:00
sboursen-scinote 43bf1cf0eb Add loading state to select_search [SCI-8545] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-12 10:49:31 +02:00
Alex Kriuchykhin f0c2624179
Implement inventories export backend logic [SCI-8444] (#5578) 2023-06-12 10:29:17 +02:00
artoscinote 98cb0df46b
Fix issues with assign to task dropdowns [SCI-8588] (#5568) 2023-06-06 15:31:40 +02:00
Alex Kriuchykhin eacf2c0c23
Use correct permissions in repository row assigning filters [SCI-8616] (#5565) 2023-06-06 13:53:12 +02:00
Alex Kriuchykhin 3869475e3d
Fix links to archived items in breadcrumbs [SCI-8562] (#5538) 2023-06-01 14:28:47 +02:00
Alex Kriuchykhin d4fb499a17
Fix task archiving permissions, archived labels in breadcrumbs [SCI-8586] (#5535) 2023-06-01 11:31:54 +02:00
ajugo d3006c9862
Fix archive/restore of protocol templates [SCI-8579] (#5521) 2023-05-31 09:38:24 +02:00
ajugo 14b3a1318b
Fix empty page for inventory and fix task title [SCI-8556] (#5511) 
* Remove empty state for inventory [SCI-8556]

* Fix shrinking of the task title on task page [SCI-8556]
 2023-05-30 11:19:10 +02:00
Alex Kriuchykhin 9819425ba1
Fix displaying of archived folders in active view [SCI-8542] (#5513) 2023-05-30 11:14:24 +02:00
Alex Kriuchykhin d4afd5be8f
Fix folders display in the navigator [SCI-8542] (#5496) 2023-05-29 11:49:39 +02:00
ajugo 2e9fe37040
Fix repository table reloading and flash messages [SCI-8554] (#5504) 
* Fix repository table reloading and flash messages [SCI-8554]

* Pass function for repository reload [SCI-8554]
 2023-05-29 11:48:13 +02:00
artoscinote f233d4d73f
Merge pull request #5499 from G-Chubinidze/gc_SCI_8448 
breadcrumb css issue & archive projects url fix [SCI-8448]
 2023-05-29 10:22:22 +02:00
Giga Chubinidze 1039d784d3 fixed archive projects breadcrumb link url 2023-05-28 03:46:04 +04:00
aignatov-bio 876987bc70
Merge pull request #5490 from aignatov-bio/ai-sci-8504-css-issues-on-task 
Fix css issues on task [SCI-8504]
 2023-05-26 17:10:09 +02:00
aignatov-bio 642932bbcc
Merge pull request #5475 from rekonder/aj_SCI_8490 
Add empty states for PET [SCI-8490]
 2023-05-26 11:14:38 +02:00
Anton 6716a5880e Fix css issues on task [SCI-8504] 2023-05-26 11:12:47 +02:00
Soufiane 6c43cb6dad
Add breadcrumbs to archived results page [SCI-8087] (#5485) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-25 16:49:33 +02:00
Andrej 9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +02:00
G-Chubinidze 3ea85cb2ef
Remove old client_api code [SCI-8144] (#5223) 
Remove obsolete client_api code
 2023-05-24 12:45:31 +02:00
aignatov-bio 4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299 
Implement the bottom action toolbar - inventories [SCI-8299]
 2023-05-24 12:06:47 +02:00
aignatov-bio 56a36e96da
Merge pull request #5471 from aignatov-bio/ai-sci-8508-fixed-navigator-folder-controller 
Fix navigator folder controller [SCI-8508]
 2023-05-24 11:10:44 +02:00
Anton cd8b49f220 Fix navigator folder controller [SCI-8508] 2023-05-24 11:04:12 +02:00
aignatov-bio 5c3ebc2509
Merge pull request #5459 from G-Chubinidze/gc_SCI_8404 
(A) label for archived projects, inventories and protocol tempates in breadcrumbs [SCI-8404]
 2023-05-24 10:53:23 +02:00
Soufiane f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441) 
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
 2023-05-24 10:47:27 +02:00
Giga Chubinidze 379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04:00
Giga Chubinidze b20912c52e removed unnecessary code 2023-05-24 02:54:05 +04:00
Giga Chubinidze e553909755 moved logic to controllers & concern 2023-05-24 02:52:26 +04:00