scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-20 14:31:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
10194 commits 41 branches 184 tags 168 MiB
Commit graph

2405 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
1e3197875c Fix repositories selection in report wizard and deleted repositories handling [SCI-5831] 2021-06-17 16:23:27 +02:00
Martin Artnik
47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +02:00
Alex Kriuchykhin
b73972dbbf
Merge pull request #3389 from artoscinote/ma_SCI_5819 
Set scinote template if missing when generating reports [SCI-5819]
 2021-06-16 12:27:02 +02:00
aignatov-bio
7313b5fa16
Add archived and deleted repositories to reports [SCI-5781] (#3387) 
* Add archived and deleted repositories to reports [SCI-5781]

* Small markup fix [SCI-5781]
 2021-06-16 10:56:08 +02:00
Martin Artnik
2427086372 Set scinote template if missing when generating reports [SCI-5819] 2021-06-15 12:54:48 +02:00
Miha Mencin
60c309e1cd
Merge pull request #3375 from artoscinote/ma_SCI_5787 
Fix changing report project, fix typo [SCI-5787]
 2021-06-09 13:43:23 +02:00
aignatov-bio
afe2a19c88
Add webhooks management [SCI-5767] (#3376) 
* Add webhooks managment [SCI-5767]

* Markup fixes [SCI-5676]
 2021-06-09 12:53:11 +02:00
Martin Artnik
6d98b7eb2b Fix changing report project, fix typo [SCI-5787] 2021-06-08 15:07:00 +02:00
Oleksii Kriuchykhin
86fcda3c09 Fix date formatting for the API [SCI-5785] 2021-06-07 10:34:58 +02:00
zmagoD
784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
aignatov-bio
9559ed88aa
Add webhooks index page [SCI-5766] (#3366) 2021-06-03 14:00:43 +02:00
zmagoD
3d79dd32ad update endpoint type 2021-05-31 21:48:18 +02:00
aignatov-bio
3c7592657c Add activity filters [SCI-5765] 2021-05-31 13:39:10 +02:00
zmagoD
debff7bc85 fix code style 2021-05-29 19:25:46 +02:00
zmagoD
28cb7ee81d add user roles enpoint and update scenarios 2021-05-29 15:28:10 +02:00
Alex Kriuchykhin
967ec1fdbf
Merge pull request #3349 from aignatov-bio/ai-sci-5758-small-report-wizard-fixes 
Small report wizard fixes [SCI-5758]
 2021-05-27 14:28:21 +02:00
Oleksii Kriuchykhin
7a5c7e0526 Fix reports docx job arguments [SCI-5763] 2021-05-26 14:34:58 +02:00
aignatov-bio
f586865696 Small report wizard fixes [SCI-5758] 2021-05-25 13:14:57 +02:00
zmagoD
7e6789200a fix new API endpoints and add test cases 2021-05-23 17:31:02 +02:00
zmagoD
300c1521fd add new API endpoints and fix/update ExperimentMember and MyModuleMember modules 2021-05-22 18:36:30 +02:00
zmagoD
be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
Oleksii Kriuchykhin
64ce35c8da Refactor DOCX report generator [SCI-5735] 2021-05-21 16:40:38 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Miha Mencin
6142c2d89d
Merge pull request #3336 from aignatov-bio/ai-sci-5740-default-template-selection 
Add default template selection [SCI-5740]
 2021-05-20 15:11:33 +02:00
Oleksii Kriuchykhin
7bfde7dc1e Render report element children container only if children are present [SCI-5739] 2021-05-20 14:16:39 +02:00
aignatov-bio
1b56190116 Add default template selection [SCI-5740] 2021-05-20 13:18:57 +02:00
aignatov-bio
c961b493fc
Small fixes in reports templates [SCI-5723] (#3327) 
* Small fixes in reports templates [SCI-5723]

* Update template name validation [SCI-5723]
 2021-05-18 15:19:51 +02:00
aignatov-bio
e8b115ca7a Change results sorting [SCI-5727] 2021-05-17 15:17:32 +02:00
Miha Mencin
d952edd389
Merge pull request #3316 from okriuchykhin/ok_SCI_5702 
Add generation error states to reports [SCI-5702]
 2021-05-17 10:16:06 +02:00
zmagoD
c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
Oleksii Kriuchykhin
a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
aignatov-bio
44a17dc014 Fix ordering tasks in report and wizard [SCI-5706] 2021-05-11 09:40:51 +02:00
zmagoD
5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
Miha Mencin
56a6c0825d
Merge pull request #3296 from okriuchykhin/ok_SCI_5699 
Improve handling of selected inventories in reports [SCI-5699]
 2021-05-10 10:48:09 +02:00
Miha Mencin
b4b7783cd3
Merge pull request #3301 from okriuchykhin/ok_SCI_5691 
Hide empty projects in reports editor [SCI-5691]
 2021-05-10 10:47:23 +02:00
Miha Mencin
4886a78be9
Merge pull request #3297 from okriuchykhin/ok_SCI_5694 
Add flash messages for report generation [SCI-5694]
 2021-05-10 10:46:49 +02:00
zmagoD
d145dd6d36 add my module assigments modals 2021-05-09 16:59:10 +02:00
zmagoD
ac91d9c2c4 add assign user permission to experiment level 2021-05-08 18:06:07 +02:00
Oleksii Kriuchykhin
b056eb797f Hide empty projects in reports editor [SCI-5691] 2021-05-07 18:28:13 +02:00
Oleksii Kriuchykhin
e4d852b9f5 Fix report PDF generation job params [SCI-5708] 2021-05-07 17:00:34 +02:00
Oleksii Kriuchykhin
06109889c5 Add flash messages for report generation [SCI-5694] 2021-05-07 16:23:35 +02:00
Oleksii Kriuchykhin
62b919cd8f Improve handling of selected inventories in reports [SCI-5699] 2021-05-07 14:55:01 +02:00
Alex Kriuchykhin
7bc6abd9bb
Merge pull request #3290 from okriuchykhin/ok_SCI_5614 
Improve report saving performance and error handling [SCI-5614]
 2021-05-07 11:51:57 +02:00
Alex Kriuchykhin
eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619 
Add default settings to existing reports [SCI-5619][SCI-5672]
 2021-05-07 11:38:41 +02:00
Alex Kriuchykhin
7a256838c1
Merge pull request #3292 from aignatov-bio/ai-sci-5638-add-missing-activities-for-new-reports 
Add new activities to reports [SCI-5638]
 2021-05-07 11:26:21 +02:00
Oleksii Kriuchykhin
b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
aignatov-bio
2fc5bd2521
Fix report processing state after create and update [SCI-5678] (#3276) 2021-05-06 14:22:02 +02:00
aignatov-bio
bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin
c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
miha
36788db816 SCI-5698 Make the decision to redirect to 2fa more readable 2021-05-06 08:14:39 +02:00
miha
f23ff73610 SCI-5693 skip 2fa if bypass is set 2021-05-05 17:29:21 +02:00
miha
136f0cd17f SCI-5693 refactor of 2fa procedure 2021-05-04 20:51:34 +02:00
Oleksii Kriuchykhin
a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
zmagoD
47cb1b31dc fix code style 2021-05-02 11:36:10 +02:00
zmagoD
c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD
11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
aignatov-bio
86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
zmagoD
8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +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
zmagoD
c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +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
zmagoD
04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +02:00
zmagoD
3333241c9a add CTA for project members modal SCI-5645 2021-04-18 12:23:29 +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
f13f3691b1 Fix blob permissions check to support multiple attachments [SCI-5613] 2021-04-14 16:07:01 +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
Oleksii Kriuchykhin
a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +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
bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +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
miha
56ebc3dc07 [SCI-5635] add a migration to fix broken steps, fix the api so it sets last_modified_by_id, minor step model refactor 
migration fix

remove the conditoin for set_last_modified_by callback

set the last_modified_by_id in before_save callback (in case it is not set yet)

remove trailing spaces

Set last modified in protocl import service
 2021-04-12 09:59:00 +02:00
Oleksii Kriuchykhin
67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
aignatov-bio
e6edbf55f3 Add report wizard step 2 [SCI-5572] 2021-04-08 12:00: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
miha
961fa9ab4e [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari 2021-04-06 09:59: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
d04858d26e Fix markup [SCI-5571] 2021-03-30 23:47:34 +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
aignatov-bio
1c93131ff1 Fix folders breadcrumbs [SCI-5597] 2021-03-26 11:58:18 +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
Oleksii Kriuchykhin
943c01cada Remove simple_token_authentication [SCI-5595] 2021-03-25 14:55:22 +01:00
aignatov-bio
0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +01:00
aignatov-bio
7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +01:00
Oleksii Kriuchykhin
d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +01:00
Oleksii Kriuchykhin
413187e6da Fix filtering on current tasks widget [SCI-5555] 2021-03-12 13:33:37 +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
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
a4112984ea fixup! Add breadcrumbs on Experiments and Tasks pages 2021-03-08 11:51:11 +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
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
Urban Rotnik
235f19cf25 Store Table/Cards view setting per user 
SCI-5450
 2021-03-04 14:56:59 +01:00
Oleksii Kriuchykhin
d557739f2e Remove notification service check from health check endpoint [SCI-5526] 2021-03-04 09:38:25 +01:00
Urban Rotnik
401224ae11 Add breadcrumbs on Experiments and Tasks pages 2021-03-04 09:00:58 +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
Oleksii Kriuchykhin
bdd717b21b Refactor view project users modal [SCI-5387] 2021-02-22 22:37:32 +01:00
Miha Mencin
63dd680385
Merge pull request #3177 from urbanrotnik/ur-sci-5514 
Fix repository empty index show condition [SCI-5514]
 2021-02-22 10:56:02 +01:00
Urban Rotnik
42f8062fe0 Fix repository empty index show condition 2021-02-22 10:18:52 +01:00
aignatov-bio
58a5126a13 Fix normalize_module_position method [SCI-5508] 2021-02-19 14:41:57 +01:00
Urban Rotnik
2daf5aad2a
Merge pull request #3168 from urbanrotnik/ur-sci-5493-external-protocols-preview 2021-02-18 14:50:30 +01:00
Oleksii Kriuchykhin
7d89088b14 Multiple small bugfixes [SCI-5494] 2021-02-18 13:55:03 +01:00
Urban Rotnik
6851746bf6 Fix HTTParty request after gem upgrade 2021-02-17 13:34: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
Mojca Lorber
b600f22248 Add no results page on experiment page 2021-02-12 12:12:26 +01:00
Mojca Lorber
7071f4a6c5 Send selected folders param to modal 2021-02-11 18:27:16 +01:00
aignatov-bio
bcc9d6c85c Fix sort for experiments page [SCI-5479] 2021-02-11 15:38:10 +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
Mojca Lorber
19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11:42 +01:00
aignatov-bio
8adbd11197 Fix archived project routes and experiment archived date [SCI-5477] 2021-02-10 15:05:53 +01:00
mlorb
45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +01:00
aignatov-bio
2972fac96e
Merge pull request #3140 from aignatov-bio/ai-sci-5407-add-folders-link-to-search 
Add folder links to global search [SCI-5407]
 2021-02-05 15:24:23 +01:00
aignatov-bio
7c99eaed8f Add folder links to global search [SCI-5407] 2021-02-05 12:39:26 +01:00
Mojca Lorber
ad61e59593 Change the title Projects to folder/subfolder title [SCI-5456] 2021-02-05 11:04:58 +01:00
Oleksii Kriuchykhin
c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Alex Kriuchykhin
1466ae114f
Merge pull request #3027 from okriuchykhin/ok_SCI_5246 
Remove Demo project and Samples inventory [SCI-5246][SCI-5248]
 2021-02-04 11:28:09 +01:00
Oleksii Kriuchykhin
8a0a0cbacc Add view only project users modal for project card [SCI-5337] 2021-02-04 11:25:35 +01:00
aignatov-bio
a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio
7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
Oleksii Kriuchykhin
6b2a94f045 Add empty repositories index page [SCI-5248] 2021-02-01 15:02:08 +01:00
Oleksii Kriuchykhin
324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
aignatov-bio
8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
Oleksii Kriuchykhin
75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Oleksii Kriuchykhin
b872c6fd14 Add breadrumbs to project experiments page [SCI-5369] 2021-01-25 16:06:48 +01:00
Urban Rotnik
ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112) 
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
 2021-01-22 11:24:08 +01:00
Mojca Lorber
c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Alex Kriuchykhin
adb9442677
Small bugfixes [SCI-5432] (#3107) 2021-01-21 11:24:25 +01:00
Urban Rotnik
33b68b8aa7 Fix permissions for result deletion 2021-01-20 09:00:45 +01:00
Alex Kriuchykhin
f15d984d47
Fix navigation between archived and active projects [SCI-5419] (#3100) 
* Fix navigation between archived and active projects [SCI-5419]
 2021-01-19 11:28:59 +01:00
Urban Rotnik
eae3a7fc16 Scope exported projects to visible_to user 2021-01-19 10:57:30 +01:00
Urban Rotnik
ddbc22b274 Fix folders exports, add error message 
SCI-5351
 2021-01-19 09:47:42 +01:00
Urban Rotnik
05bcb7c502
Merge pull request #3086 from urbanrotnik/ur-sci-5394-missing-archived-results 
Fix missing results of archived task [SCI-5394]
 2021-01-15 13:53:13 +01:00
Urban Rotnik
c9bbc64751 Fix missing results of archived task 
[SCI-5394]
 2021-01-15 11:40:25 +01:00
aignatov-bio
adb9084787
Fix comments red dot and ordering of comments [SCI-5384] (#3084) 
* Fix comments red dot and ordering of comments [SCI-5384]
 2021-01-14 16:28:11 +01:00
Oleksii Kriuchykhin
8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +01:00
Urban Rotnik
ef82fcc5ee
Merge pull request #3075 from urbanrotnik/ur-sci-5379-clean-folder-info 
Remove project_folder in callback [SCI-5379]
 2021-01-12 15:17:16 +01:00
Alex Kriuchykhin
5f506b7459
Merge pull request #3072 from okriuchykhin/ok_SCI_5383 
Fix folder creation for archived view [SCI-5383]
 2021-01-12 13:50:20 +01:00
Oleksii Kriuchykhin
78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
Urban Rotnik
485aa0d541 Remove project_folder in callback 2021-01-12 13:04:36 +01:00
Urban Rotnik
3ad14e06b2
Merge pull request #3067 from urbanrotnik/ur-sci-5379-clean-folder-info 
Remove project_folder reference on project archive [SCI-5379]
 2021-01-12 11:27:08 +01:00
Alex Kriuchykhin
04f68facd3
Merge pull request #3064 from okriuchykhin/ok_SCI_5344 
Add Restore button to the archived Projects screen [SCI-5344]
 2021-01-12 10:59:39 +01:00
Urban Rotnik
baba7fc9e7 Remove project_folder reference on project archive [SCI-5379] 2021-01-11 13:54:21 +01:00
aignatov-bio
e88848cd75
Fix comments counter [SCI-5371] (#3063) 2021-01-11 10:03:13 +01:00
Oleksii Kriuchykhin
684674952c Add Restore button to the archived Projects screen [SCI-5344] 2021-01-09 21:27:19 +01:00
Urban Rotnik
427b5d7107
Merge pull request #3059 from biosistemika/features/folders 
Features/folders into develop
 2021-01-08 06:26:44 +01:00
Urban Rotnik
6f155913ff
Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature 
Move projects/folders modal [SCI-5334]
 2021-01-07 17:45:19 +01:00
Urban Rotnik
5d79eaa843 Pass projects mode(archived/active) to move_to modal for list [SCI-5334] 2021-01-07 17:42:05 +01:00
Urban Rotnik
20acd9b693 Fix controller and tests 2021-01-07 17:41:39 +01:00
aignatov-bio
276d6abe19
Update archive navigation for tasks page [SCI-5347] (#3052) 
* Update archive navigation for tasks page [SCI-5347]
 2021-01-07 17:18:52 +01:00
aignatov-bio
1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) 
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
 2021-01-07 13:16:05 +01:00
aignatov-bio
1515ffa3f5
Add searching to projects member filter [SCI-5373] (#3054) 2021-01-07 13:01:14 +01:00
aignatov-bio
ef57489cd9
Update repositories sidebar [SCI-5329] (#3031) 
* Update repositories sidebar [SCI-5329]
 2021-01-06 10:13:10 +01:00
Oleksii Kriuchykhin
696b8d19f0 Fix new project creation and archiving [SCI-5321][SCI-5326] 2021-01-05 14:14:01 +01:00
Alex Kriuchykhin
a8991356b5
Merge pull request #3033 from okriuchykhin/ok_SCI_5341 
Fix restore action for experiments and tasks [SCI-5341]
 2021-01-05 10:09:39 +01:00
aignatov-bio
f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
Oleksii Kriuchykhin
58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +01:00
Alex Kriuchykhin
163a2d1e60
Merge pull request #3042 from okriuchykhin/ok_SCI_5340 
Make active projects view default [SCI-5340]
 2021-01-04 11:56:22 +01:00
Oleksii Kriuchykhin
ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Oleksii Kriuchykhin
738f668ba9 Disable comment adding for archived objects [SCI-5339] 2020-12-30 11:46:56 +01:00
Oleksii Kriuchykhin
f76eb170a1 Fix restore action for experiments and tasks [SCI-5341] 2020-12-28 22:21:38 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) 
* Add PDF Preview [SCI-5299]
 2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Urban Rotnik
7c967d32f1 Reset invalid state 
SCI-5306
 2020-12-18 09:46:05 +01:00
Urban Rotnik
63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search 
SCI-5306
 2020-12-18 09:43:11 +01:00
Urban Rotnik
87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Oleksii Kriuchykhin
069704cb78 Fix redirects after 2FA sign in [SCI-4973] 2020-12-17 19:32:15 +01:00
Miha Mencin
f284ef1592
Merge pull request #3009 from okriuchykhin/ok_SCI_5276 
Archiving: update archived TASK screen layout [SCI-5276]
 2020-12-17 13:46:35 +01:00
Oleksii Kriuchykhin
7bb334e737 Archiving: update archived TASK screen layout [SCI-5276] 2020-12-17 13:26:44 +01:00
Urban Rotnik
3eb667b6ba
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards 
Archived tasks cards [SCI-5274] [SCI-5275]
 2020-12-17 13:17:11 +01:00
Urban Rotnik
9a7ffb0645 Add Tags modal to archived tags screen 
[SCI-5274]
 2020-12-17 13:08:57 +01:00
aignatov-bio
2ca7b81cea
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011) 
* Change experiment archived card [SCI-5270]
 2020-12-17 13:07:30 +01:00
Miha Mencin
ba3db65437
Merge pull request #3008 from okriuchykhin/ok_SCI_5273 
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
 2020-12-17 09:44:40 +01:00
Oleksii Kriuchykhin
2a666a3718 Implement additional preview type PDF of the whole document [SCI-5297] 2020-12-16 12:51:10 +01:00
aignatov-bio
30cfe78805
Add edit modal for project folders [SCI-5265] (#3002) 
Add edit modal for project folders [SCI-5265]
 2020-12-14 15:54:18 +01:00
Oleksii Kriuchykhin
94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] (#2995) 
* Add projects sidebar navigation [SCI-5178]
 2020-12-08 16:07:26 +01:00
aignatov-bio
188013dd56 Change permission for sorting in steps and asset view [SCI-5289] 2020-12-08 10:45:43 +01:00
Urban Rotnik
1332ad2fcd Fix project creation activity [SCI-5181] 2020-12-04 14:13:43 +01:00
Urban Rotnik
7773afbcdb Add activities for Project Folders [SCI-5181] 2020-12-04 12:03:49 +01:00
aignatov-bio
6bd021d88a
Add gallery view after image update [SCI-5286] (#2993) 
* Add gallery view after image update [SCI-5286]
 2020-12-04 11:47:24 +01:00
Alex Kriuchykhin
7a4f60f25e
Merge pull request #2989 from mlorb/ml-sci-5240 
[SCI-5240] Implement Create new folder function
 2020-12-04 09:57:05 +01:00
mlorb
9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968) 
* Implement actions dropdown on project card
* make comments counter to work
 2020-12-04 09:38:34 +01:00
Mojca Lorber
bdc8cfc5d5 Fix merging 2020-12-03 13:04:55 +01:00
Mojca Lorber
9253cf5ade Change javascript for modal handeling and some other small fixes 2020-12-03 12:53:19 +01:00
mlorb
74f0f0474a
Merge branch 'features/folders' into ml-sci-5240 2020-12-03 12:50:19 +01:00
Oleksii Kriuchykhin
dc15accc86 Update sidebar usages in partials [SCI-5177] 2020-12-03 10:21:53 +01:00
Oleksii Kriuchykhin
9546b8f71d Prepare backend for the improved navigation [SCI-5177] 2020-12-03 10:19:11 +01:00
Alex Kriuchykhin
92d579ab8e
Merge pull request #2935 from okriuchykhin/ok_SCI_5135 
Generate backend for moving the projects and folders [SCI-5135]
 2020-12-02 14:59:01 +01:00
Urban Rotnik
87b5552b27 Add equals team validations for project and folder 2020-12-02 14:53:46 +01:00
Urban Rotnik
df2b8ab3df Remove jsonapi_parameters gem, accept rails params in controller 2020-12-02 13:15:49 +01:00
Urban Rotnik
7c1a0a9044 Add projects to project_folder serializer 2020-12-02 13:15:49 +01:00
Urban Rotnik
97733498d9 Include project_folders at Projects API endpoints 2020-12-02 13:15:48 +01:00
Urban Rotnik
a4fc01d595 Add jsonapi_parameters gem, use relationships for parent_folder relation 2020-12-02 13:15:48 +01:00