scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 10:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
9500 commits 69 branches 179 tags 165 MiB
Commit graph

2868 commits

Author SHA1 Message Date
aignatov-bio 6b023603f9
Add second template for reports [SCI-5617] (#3268) 2021-04-29 10:42:17 +02:00
Oleksii Kriuchykhin bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin 8a915c8acf Fix assets inclusion into report [SCI-5680] 2021-04-28 14:37:16 +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
Alex Kriuchykhin fe48e35cf0
Merge pull request #3263 from okriuchykhin/ok_SCI_5609 
Add additional custom fields for reports [SCI-5609]
 2021-04-23 10:53:59 +02:00
Oleksii Kriuchykhin ecbf747499 Switch to base64 encoded assets in wiked_pdf templates 2021-04-22 14:52:41 +02:00
Oleksii Kriuchykhin a67cc619ec Add additional custom fields for reports [SCI-5609] 2021-04-20 13:57:09 +02:00
aignatov-bio d18a54c874
Update create and update action for reports controller [SCI-5641] (#3260) 
Update create and update action [SCI-5641]
 2021-04-20 13:35:40 +02:00
Miha Mencin f95e9402bd
Merge pull request #3258 from okriuchykhin/ok_SCI_5613 
Fix save report PDF to Inventory [SCI-5613]
 2021-04-15 09:30:04 +02:00
Alex Kriuchykhin 80827ce761
Merge pull request #3257 from biosistemika/SCI-5623-add-external-id-to-user 
SCI-5623 add external id to user
 2021-04-14 16:15:43 +02:00
Oleksii Kriuchykhin fe8f006f6e Fix save report PDF to Inventory [SCI-5613] 2021-04-14 16:06:59 +02:00
Oleksii Kriuchykhin 0a9a656313 Add flash message and notification for generated reports [SCI-5552] 2021-04-14 15:45:51 +02:00
miha ac18cb7225 rename partial to include html 2021-04-14 14:07:55 +02:00
Oleksii Kriuchykhin df8354bde3 Move the docx creation to the Delayed job [SCI-5560] 2021-04-14 12:39:36 +02:00
aignatov-bio 85a13b7182 Update condition for project content [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio d991b631fb
Merge pull request #3252 from aignatov-bio/ai-sci-5593-add-logic-for-preparing-wizard-data-for-report 
Add logic for preparing wizard data for report [SCI-5593]
 2021-04-14 11:04:55 +02:00
miha e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +02:00
Alex Kriuchykhin 1df86c36d9
Merge pull request #3254 from okriuchykhin/ok_SCI_5637 
Implement PDF report generation in delayed job [SCI-5637]
 2021-04-13 16:37:16 +02:00
Oleksii Kriuchykhin f864f551d5 Implement PDF report generation in delayed job [SCI-5637] 2021-04-12 13:04:02 +02:00
aignatov-bio 101d46956c Add logic for preparing wizard data for report [SCI-5593] 2021-04-12 12:42:22 +02:00
Oleksii Kriuchykhin 67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
aignatov-bio 14f8e97b5f Add I18n for reports wizard second step [SCI-5572] 2021-04-08 12:04:34 +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
Alex Kriuchykhin aa21d7e415
Merge pull request #3247 from okriuchykhin/ok_SCI_5591 
Add dynamic form elements in report wizard step 1 [SCI-5591]
 2021-04-07 12:05:10 +02:00
aignatov-bio a46b9cb8ea Add document preview to reports [SCI-5559] 2021-04-07 11:15:22 +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 82be23db81 Add project and template selector [SCI-5570] 2021-03-31 15:32:03 +02:00
Alex Kriuchykhin c9688a58f7
Merge pull request #3241 from aignatov-bio/ai-sci-5571-add-template-partial-to-report 
Add template partials to reports [SCI-5571]
 2021-03-31 11:36:56 +02:00
aignatov-bio ecca155fab Added layout for footer and header [SCI-5571] 2021-03-30 23:43:34 +02:00
aignatov-bio ad8e404bca Add template partials to reports [SCI-5571] 2021-03-30 13:40:36 +02:00
Miha Mencin 6ad3f7b92f
Merge pull request #3239 from okriuchykhin/ok_SCI_5595_v2 
Remove canvas-to-blob library [SCI-5595]
 2021-03-29 14:03:35 +02:00
Oleksii Kriuchykhin 2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
aignatov-bio 1c93131ff1 Fix folders breadcrumbs [SCI-5597] 2021-03-26 11:58:18 +01:00
aignatov-bio 0ba6eec73c
Merge pull request #3232 from aignatov-bio/ai-sci-5564-fix-breadcrumbs-for-experiments-page 
Remove the project from experiments page breadcrumbs [SCI-5564]
 2021-03-25 15:41:49 +01:00
aignatov-bio b5cb46908c
Merge pull request #3225 from aignatov-bio/ai-sci-5563-add-reload-action-to-inline-asset 
Add reload action for assets [SCI-5563]
 2021-03-25 15:40:36 +01:00
aignatov-bio 9281a5631c Remove project from experiments page breadcrumbs [SCI-5564] 2021-03-25 14:32:05 +01:00
aignatov-bio 32b1db629a Change button_to to link_to [SCI-5563] 2021-03-25 14:21:24 +01: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 e4256342d9 Fix smart annotation in experiment details modal [SCI-5583] 2021-03-22 15:36:10 +01:00
aignatov-bio 7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +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
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
Urban Rotnik 8202181095
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications 
Bring back old notifications [SCI-4140]
 2021-03-09 14:54:08 +01:00
Urban Rotnik ee39224f73
Merge pull request #3206 from urbanrotnik/ur-sci-5518 
Fix titles hovering breadcrumbs [SCI-5518]
 2021-03-09 13:59:20 +01:00
Urban Rotnik 8bacc74c17
Merge pull request #3187 from urbanrotnik/ur-sci-5439 
Fix report completed_on time and username [SCI-5439]
 2021-03-09 13:27:24 +01:00
Urban Rotnik 419b69ef60 Fix syntax error 
SCI-5518
 2021-03-08 22:04:28 +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 dd302142eb
Merge pull request #3194 from urbanrotnik/ur-sci-5498 
Fix grayed links when subjects gets deleted [SCI-5498]
 2021-03-08 14:12:05 +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 ab33f51a59
Merge pull request #3184 from aignatov-bio/ai-sci-5460-add-long-names-navigation-tootip 
Add titles to navigation items [SCI-5460]
 2021-03-08 10:17:52 +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
Urban Rotnik fd6165bc55 Fix grayed links when subjects gets deleted 2021-03-02 11:13:08 +01:00
aignatov-bio 89ac76a766 Fix duplcated new step button [SCI-5474] 2021-02-26 12:29:31 +01:00
Urban Rotnik 8ca8c84efd Fix report completed_on time and username (partially) 
SCI-5439
We cannot realy on last_modified_by, because it can be changed after step completion
 2021-02-25 13:24:21 +01:00
Urban Rotnik 1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
aignatov-bio 24134174fc Add titles to navigation items [SCI-5460] 2021-02-23 15:00:11 +01:00
Oleksii Kriuchykhin bdd717b21b Refactor view project users modal [SCI-5387] 2021-02-22 22:37:32 +01:00
Oleksii Kriuchykhin e8b4a30b87 Improve inventory table loading speed [SCI-5509] 2021-02-22 10:34:06 +01:00
Urban Rotnik 3bca05fc94 Prevent showing empty files for experiments without Tasks 
SCI-5481
 2021-02-18 12:03:28 +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 d2c03f27c3
Merge pull request #3170 from aignatov-bio/ai-sci-5492-fix-shared-inventories 
Fix shared inventories [SCI-5492]
 2021-02-18 11:05:18 +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 99c3e1430b Fix shared inventories [SCI-5492] 2021-02-17 15:14:32 +01:00
aignatov-bio 171468444d Fix method on experiment archive action 2021-02-16 12:55:41 +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 cc2edaf71a Fix dahsboard CSS [SCI-5249][SCI-5489] 2021-02-15 12:40:26 +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
mlorb 78a76ea3a1
Merge pull request #3154 from mlorb/ml-sci-5470 
Add no results page on experiments page [SCI-5470]
 2021-02-15 10:26:26 +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
Urban Rotnik 1ae0b42c2c Fix Dots and Checkbox visibility on experiment cards 2021-02-12 13:25:12 +01:00
Mojca Lorber b600f22248 Add no results page on experiment page 2021-02-12 12:12:26 +01:00
aignatov-bio 8191306411 Fix experiment archive page route [SCI-5479] 2021-02-12 09:55:26 +01:00
Urban Rotnik b831d5fa14 Fix duplicate button permissions 2021-02-12 07:12:26 +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
aignatov-bio 1a3c715d72
Merge pull request #3149 from aignatov-bio/ai-sci-5468-connect-details-modal-to-more-button 
Add action to more button [SCI-5468]
 2021-02-11 13:56:54 +01:00
aignatov-bio f6422a50ac Add action to more button 2021-02-11 12:41:22 +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 2fad6f5f8e
Merge pull request #3146 from aignatov-bio/ai-sci-5477-fix-archived-project-routes 
Fix archived project routes and experiment archived date [SCI-5477]
 2021-02-10 18:38:13 +01:00
aignatov-bio 8adbd11197 Fix archived project routes and experiment archived date [SCI-5477] 2021-02-10 15:05:53 +01:00
aignatov-bio 486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
aignatov-bio 8853d297ed
Merge pull request #3143 from urbanrotnik/ur-sci-5455-search-results-breadcrumbs 
Add breadcrumbs to GlobalSearch results [SCI-5455]
 2021-02-09 21:44:54 +01:00