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
Urban Rotnik
088fa79874
Add Project Folders API endpoints
2020-12-02 13:15:48 +01:00
Oleksii Kriuchykhin
dfce57d481
Generate backend for moving the projects and folders [SCI-5135]
2020-12-02 12:11:01 +01:00
Urban Rotnik
13d157d1c7
Merge pull request #2983 from urbanrotnik/ur-sci-5252-technician-can-not-complete-step
...
Remove manage permissions check from step toggle [SCI-5252]
2020-12-01 13:37:40 +01:00
Mojca Lorber
d7e3b57d0d
[SCI-5240] Implement Create new folder function
2020-12-01 09:59:08 +01:00
Oleksii Kriuchykhin
78e050ccc0
Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]
2020-11-27 14:27:24 +01:00
Urban Rotnik
dc9fae6af0
Remove manage permissions check from step toggle
2020-11-27 11:37:39 +01:00
Alex Kriuchykhin
80a53e14c2
Merge pull request #2966 from okriuchykhin/ok_SCI_5235
...
Fix permission check for archived tasks [SCI-5235]
2020-11-27 10:46:25 +01:00
aignatov-bio
d162fb6d35
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete
...
Add delete asset confirmation modal [SCI-5241]
2020-11-26 15:35:40 +01:00
aignatov-bio
c6f4d23a78
Fix protocol preview file background
2020-11-26 15:35:06 +01:00
Urban Rotnik
efd4f8abde
Add members dropdown on project filters flyout
2020-11-26 12:29:43 +01:00
aignatov-bio
d13ff053b5
Merge pull request #2960 from aignatov-bio/ai-sci-5228-fix-sorting-of-assets-in-reports
...
Fix assets sorting in report [SCI-5228]
2020-11-26 11:46:50 +01:00
Urban Rotnik
be49216e71
Fix teams tests
2020-11-25 20:02:45 +01:00
Urban Rotnik
5717e37f2b
Remove obsolete code, fix tests
2020-11-25 18:34:46 +01:00
Urban Rotnik
afc6d12b49
Project and folders sorting
2020-11-25 18:34:39 +01:00
Oleksii Kriuchykhin
0de237cece
Implement project search with grouping by folder [SCI-5207]
2020-11-25 11:59:02 +01:00
aignatov-bio
dc62e2780a
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout
...
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
2020-11-24 11:25:36 +01:00
Alex Kriuchykhin
1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136
...
Implement search endpoint for Projects & folders search [SCI-5136]
2020-11-23 13:09:33 +01:00
aignatov-bio
60ce51149d
Add CRUD to comments
2020-11-20 20:25:28 +01:00
Oleksii Kriuchykhin
eafc4cf367
Fix permission check for archived tasks [SCI-5235]
2020-11-20 14:39:17 +01:00
aignatov-bio
da4b8aaf2f
Add comments list
2020-11-20 12:29:40 +01:00
Oleksii Kriuchykhin
86e5078622
Add project folders to global search [SCI-5180]
2020-11-20 11:10:03 +01:00
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews
...
Features/office file previews merge branch
2020-11-19 11:11:39 +01:00
aignatov-bio
fcdad51222
Fix assets sorting in report
2020-11-17 15:33:25 +01:00
miha
ef880d8373
SCI-5223 return the missing method into controller
2020-11-16 15:49:26 +01:00
Oleksii Kriuchykhin
6dfeae2283
Make folders selectable for 'Export all' functionality [SCI-5183]
2020-11-13 14:39:10 +01:00
aignatov-bio
45efc9a43a
Remove skip asset permission check for wopi creation
2020-11-12 14:13:30 +01:00
Mojca Lorber
1618d79144
Merge branch 'develop' into ml-sci-5152
2020-11-11 10:47:43 +01:00
Oleksii Kriuchykhin
038cd8d5d7
Fix repository state columns handling [SCI-5190]
2020-11-10 17:24:04 +01:00
Oleksii Kriuchykhin
ee1bcd7aac
Implement search endpoint for Projects & folders search [SCI-5136]
2020-11-09 16:16:09 +01:00
Mojca Lorber
9893e8d5c8
Add 403 error handling to current tasks dashboard widget
2020-11-06 10:39:04 +01:00
aignatov-bio
e8592d911d
Fix markup
2020-11-05 10:04:27 +01:00
aignatov-bio
8145a292fd
Clear code and add missed I18n translation
2020-11-05 10:03:15 +01:00
aignatov-bio
5d0ab1f2e9
Fix markup
2020-11-04 13:32:34 +01:00
aignatov-bio
12fdea8d89
Add context menu to attahcments
2020-11-04 13:08:40 +01:00
aignatov-bio
0f80786433
Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step
2020-11-02 18:52:46 +01:00
aignatov-bio
84a7d49023
Fix markup
2020-11-02 18:51:21 +01:00
aignatov-bio
eca39a00b5
Add attachments dropdown to step
2020-11-02 18:47:08 +01:00
Mojca Lorber
8aed48d1ae
Merge branch 'develop' into features/office-file-previews
2020-11-02 13:45:06 +01:00
Mojca Lorber
04e3b67968
Change the way buttons are toggled
2020-10-30 18:47:01 +01:00
Urban Rotnik
042231469c
Fix syntax
2020-10-30 13:37:59 +01:00
aignatov-bio
6193f91192
Update view mode switcher logic
2020-10-29 16:42:05 +01:00
aignatov-bio
12991e8fd3
Commit add asset preview mode switcher to step
2020-10-29 16:42:05 +01:00
aignatov-bio
21f584a2c4
Fix markup
2020-10-29 14:30:26 +01:00
aignatov-bio
131d487e69
Add file preview to list view
2020-10-29 14:30:26 +01:00
aignatov-bio
d99e279ecc
Add gallery to file preview
2020-10-29 14:30:26 +01:00
aignatov-bio
c56f7912ef
Update file preview
2020-10-29 14:23:32 +01:00
Urban Rotnik
bb5c703696
Merge pull request #2878 from urbanrotnik/ur-sci-5040
...
Support multiple file upload in TinyMCE fields [SCI-5040]
2020-10-29 14:14:38 +01:00
Oleksii Kriuchykhin
13fcfedf41
Refactor experiment workflow image generation [SCI-5063]
2020-10-29 13:16:09 +01:00
Urban Rotnik
bf4062b7cb
Refactor rescue block
2020-10-29 09:12:12 +01:00
Miha Mencin
235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2
...
Release/1.20.2
2020-10-28 13:58:25 +01:00
Alex Kriuchykhin
8ef5bafc1a
Revert "Init user session for devise controllers after token auth [SCI-5123]"
2020-10-27 13:20:14 +01:00
Urban Rotnik
cb9db57645
Merge pull request #2909 from urbanrotnik/ur-sci-5006
...
Add lock icon to current task section on dashboard [SCI-5006]
2020-10-27 08:20:55 +01:00
Alex Kriuchykhin
792edb62d6
Merge pull request #2919 from okriuchykhin/ok_SCI_5123
...
Init user session for devise controllers after token auth [SCI-5123]
2020-10-26 17:21:56 +01:00
Oleksii Kriuchykhin
00a2f5f41b
Init user session for devise controllers after token auth [SCI-5123]
2020-10-26 16:35:49 +01:00
Urban Rotnik
b94a3a6cb8
Clean up controller
2020-10-26 16:17:39 +01:00
Miha Mencin
840b84aa9a
Merge pull request #2916 from okriuchykhin/ok_SCI_5139
...
Add activities for step completion and checklist toggling through API [SCI-5139]
2020-10-26 14:19:31 +01:00
Urban Rotnik
431b9161b6
Code cleanup
2020-10-26 11:03:43 +01:00
Oleksii Kriuchykhin
4d64883963
Add activities for step completion and checklist toggling through API [SCI-5139]
2020-10-25 22:33:50 +01:00
Oleksii Kriuchykhin
5f70984919
Add token authentication to Active Storage controllers [SCI-5123]
2020-10-23 19:22:31 +02:00
Urban Rotnik
aa1520bfb8
Merge branch 'develop' into jg_sci_2228
2020-10-22 14:21:39 +02:00
Urban Rotnik
58013e215d
Add lock icon to current task section on dashboard
2020-10-22 08:09:51 +02:00
aignatov-bio
016fc8a632
Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews
2020-10-15 15:25:54 +02:00
aignatov-bio
0a4b89cf39
Merge branch 'develop' into features/office-file-previews
2020-10-15 15:19:56 +02:00
aignatov-bio
f1a5811d5f
Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port
...
Render wopi preview only in view port
2020-10-14 21:29:56 +02:00
Oleksii Kriuchykhin
7cd12bfb07
Fix protocol repository save/load timestamps [SCI-5067]
2020-10-06 15:30:04 +02:00
Oleksii Kriuchykhin
6c367428a1
Fix team switcher [SCI-5080]
2020-10-02 14:25:44 +02:00
aignatov-bio
9010f9c1db
Merge pull request #2876 from aignatov-bio/ai-sci-5066-fix-switch-team
...
Fix switch team on link for object from other team [SCI-5066]
2020-09-30 10:09:19 +02:00
Urban Rotnik
7c312a844f
Fix updating updated_at on protocol while load/sync with repository
2020-09-29 15:37:40 +02:00
aignatov-bio
9d64121577
Refactor WOPI discovery
2020-09-29 12:58:05 +02:00
Urban Rotnik
dc0072e707
Support multiple file upload in TinyMCE fields
2020-09-29 08:21:31 +02:00
aignatov-bio
16fe11f0f7
Fix smitch team on link for object from other team
2020-09-28 17:16:18 +02:00
aignatov-bio
1ed65eddfa
Move ordering to front-end
2020-09-25 15:06:09 +02:00
Alex Kriuchykhin
fb28fa557b
Merge pull request #2872 from okriuchykhin/ok_SCI_5062
...
Improve performance of fetching of statuses [SCI-5062]
2020-09-25 15:00:30 +02:00
Alex Kriuchykhin
3eb448c39b
Merge pull request #2862 from okriuchykhin/ok_SCI_5001
...
Add Endpoins for Project Membership manipulation [SCI-5001]
2020-09-25 14:25:20 +02:00
Oleksii Kriuchykhin
134e549ed5
Improve performance of fetching of statuses [SCI-5062]
2020-09-25 10:14:57 +02:00
Urban Rotnik
f4f0bc706a
Fix step deletion
2020-09-25 08:43:03 +02:00
aignatov-bio
780db9d134
Add assets view switcher
2020-09-24 17:10:36 +02:00
Oleksii Kriuchykhin
2cda80dc5f
Add Endpoins for Project Membership manipulation [SCI-5001]
2020-09-23 11:03:29 +02:00
Alex Kriuchykhin
136ce06022
Merge pull request #2851 from okriuchykhin/ok_SCI_4999
...
Add Create and Update endpoints for experiments [SCI-4999]
2020-09-22 10:20:00 +02:00
Alex Kriuchykhin
e19efe3975
Merge pull request #2850 from okriuchykhin/ok_SCI_4997
...
Add Create and Update endpoints for projects [SCI-4997]
2020-09-21 13:22:12 +02:00
aignatov-bio
e5d3fac112
Merge branch 'features/smart-annotation-improvements' into develop
2020-09-17 14:52:51 +02:00
aignatov-bio
6ed8757eb1
Merge branch 'features/task-flows' into develop
2020-09-17 14:52:05 +02:00
aignatov-bio
86667feb6b
Add remembered state for smart annotation
2020-09-17 11:43:07 +02:00
Oleksii Kriuchykhin
0147e1aee1
Add Create and Update endpoints for experiments [SCI-4999]
2020-09-16 23:15:36 +02:00
Oleksii Kriuchykhin
dd4a62bb45
Add Create and Update endpoints for projects [SCI-4997]
2020-09-16 17:03:39 +02:00
Alex Kriuchykhin
6269802be4
Merge pull request #2843 from okriuchykhin/ok_SCI_4881
...
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-09-15 12:53:01 +02:00
Oleksii Kriuchykhin
db3de835f8
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-09-15 11:58:35 +02:00
Oleksii Kriuchykhin
57716fd89c
Fix API and tests for new task completion logic [SCI-5004]
2020-09-15 11:19:25 +02:00
Oleksii Kriuchykhin
73cf620960
Add Completion and Uncompletion consequences [SCI-5004]
2020-09-14 20:06:48 +02:00
Oleksii Kriuchykhin
a7c6ab9d89
Move some consequence executon into background process [SCI-4978]
2020-09-11 16:18:39 +02:00
aignatov-bio
008563a7f4
Update user smart annotation
2020-09-11 13:00:13 +02:00
Urban Rotnik
0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state
...
Add error message for locked task, update some permission checks[SCI-4982]
2020-09-09 14:04:08 +02:00
Urban Rotnik
45a09e5a3c
Fix tests
2020-09-09 13:17:07 +02:00
aignatov-bio
f4a13a73cb
Refactor smart annotation front-end
2020-09-09 12:25:34 +02:00
Urban Rotnik
aa88b6bdb4
Move redirect to controller
2020-09-09 11:26:43 +02:00
aignatov-bio
687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks
...
Add completed/uncompleted methods to my_module [SCI-4972]
2020-09-09 08:20:36 +02:00
Alex Kriuchykhin
c413ac21a1
Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses
...
Add API endpoints for workflows [SCI-4831]
2020-09-08 16:23:05 +02:00
Urban Rotnik
d9b691103c
Add permission error message
2020-09-08 15:42:30 +02:00
aignatov-bio
bd1d6a772b
Add completed/uncompleted methods to my_module
2020-09-08 09:45:09 +02:00
Oleksii Kriuchykhin
dea75553a3
Fix handling of duplicated step positions [SCI-4880]
2020-09-07 10:44:00 +02:00
aignatov-bio
5cb497b61d
Split params validation to create and update
2020-09-03 09:49:00 +02:00
aignatov-bio
4c7312faf9
Add tests for new workflow endpoints
2020-09-02 11:43:00 +02:00
aignatov-bio
68f31ce7ec
Add api endpoints for workflows
2020-09-01 15:01:38 +02:00
aignatov-bio
e1229f5606
Fix test and status validations
2020-09-01 14:49:58 +02:00
aignatov-bio
9ff5e8bd7d
Add task state change error handling and validation
2020-09-01 12:41:00 +02:00
Urban Rotnik
581cd69963
Add activities for status change
2020-09-01 11:48:04 +02:00
Urban Rotnik
a259800590
Merge branch 'develop' into jg_sci_2228
2020-08-31 16:29:23 +02:00
Urban Rotnik
4eebfa5461
Controller action for card inline preview
2020-08-28 11:05:52 +02:00
aignatov-bio
6229ba6041
Add morkflow generator
2020-08-27 12:13:13 +02:00
aignatov-bio
c07ebe90fa
Add migration for task states
2020-08-27 11:34:59 +02:00
Oleksii Kriuchykhin
ed2eb81c68
Switch to position swapping when updating step position [SCI-4880]
2020-08-25 15:46:23 +02:00
Oleksii Kriuchykhin
a206890a8c
Fix step position adjusting on move and destroy [SCI-4880]
2020-08-25 15:46:21 +02:00
Urban Rotnik
5923a4c014
Merge branch 'develop' into features/task-flows
2020-08-25 15:30:22 +02:00
aignatov-bio
21e4dcd96a
Add wopi preview for office files
2020-08-25 13:22:36 +02:00
Alex Kriuchykhin
5006173d59
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard
...
Add new statuses to dashboard [SCI-4856]
2020-08-24 11:09:57 +02:00
Alex Kriuchykhin
121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881
...
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-08-21 11:01:49 +02:00
Alex Kriuchykhin
ccf4e2a747
Merge pull request #2759 from okriuchykhin/ok_SCI_4817
...
Refactor task archive and move permissions [SCI-4817]
2020-08-21 11:01:05 +02:00
aignatov-bio
19a0d05467
Fix for checklist ordering
2020-08-14 12:32:39 +02:00
Urban Rotnik
38d3411007
Update checklist item positions with validations skip
2020-08-13 20:06:03 +02:00
Urban Rotnik
7d186156a0
Fix permission check lapsus
2020-08-11 17:00:36 +02:00
mlorb
02bb29cf79
Merge pull request #2772 from mlorb/ml-sci-4907
...
Fix inventory card view for snapshots as default view [SCI-4907]
2020-08-11 14:43:19 +02:00
Mojca Lorber
5d15e73866
Fix failing tests
2020-08-11 13:33:44 +02:00
Mojca Lorber
7af9c387cf
Fix errors
2020-08-11 10:27:23 +02:00
Urban Rotnik
29152eeb6d
Merge pull request #2783 from urbanrotnik/ur-sci-4920-permission-repository-fix
...
Fix permission check [SCI-4920]
2020-08-10 15:59:21 +02:00
Miha Mencin
b333700f40
Merge pull request #2779 from okriuchykhin/ok_SCI_4910
...
Fix rendering of RTE in API [SCI-4910]
2020-08-10 15:26:35 +02:00
Urban Rotnik
e429c78d56
Fix permission check
2020-08-10 15:22:49 +02:00
aignatov-bio
67b6592470
Merge pull request #2781 from aignatov-bio/ai-sci-4919-fix-dashboard-calendar
...
Fix dashboard calendar due date selection [SCI-4919]
2020-08-10 14:34:23 +02:00
aignatov-bio
a3ad8b5aab
Fix dashboard calendar due date selection
2020-08-10 12:55:56 +02:00
Miha Mencin
1080ad2821
Merge pull request #2778 from okriuchykhin/ok_SCI_4911
...
Add created_at and user to API Step serializer [SCI-4911]
2020-08-10 10:27:53 +02:00
Urban Rotnik
3c1c562e4c
Override password reset action, sign_in user only if 2fa disabled
2020-08-10 09:24:15 +02:00
aignatov-bio
56ff4e7702
Add new statuses to dashboard
2020-08-10 09:10:56 +02:00
Oleksii Kriuchykhin
91d9f5d6ee
Fix rendering of RTE in API [SCI-4910]
2020-08-07 16:51:57 +02:00
Oleksii Kriuchykhin
3d3fd1625c
Add created_at and user to API Step serializer [SCI-4911]
2020-08-07 14:54:05 +02:00
Miha Mencin
ae013b6fa8
join two renders
2020-08-06 14:06:23 +02:00
Miha Mencin
04c294adb1
Fix the failing test: repository row should be in correct repository
2020-08-06 13:23:40 +02:00
Mojca Lorber
3a8fc01ff7
Fix inventory card view for snapshots as default view
2020-08-05 15:43:43 +02:00
Oleksii Kriuchykhin
ce8d12e1c4
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
2020-08-05 09:59:58 +02:00
Urban Rotnik
073979534c
Merge branch 'features/task-flows' into develop_to_task_flows
2020-08-04 16:43:05 +02:00
Urban Rotnik
e221d960e7
Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard"
...
This reverts commit 8b6d57058c
, reversing
changes made to 957ac92669
.
2020-08-04 15:07:22 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows
2020-08-04 14:50:46 +02:00
Urban Rotnik
cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults
...
Add ordering for result page [SCI-4895]
2020-08-04 11:17:43 +02:00
Alex Kriuchykhin
a9bc5b664a
Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal
...
Add modal for status flow [SCI-4835]
2020-08-04 09:47:40 +02:00
Alex Kriuchykhin
22015beeb5
Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload
...
Extend asset API upload to support base64 [SCI-4813]
2020-08-04 09:43:01 +02:00
Urban Rotnik
9b06510dcc
Update PUT result file endpoint, refactor
2020-08-03 15:14:58 +02:00
Urban Rotnik
aaae33e603
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard
...
Add start date to current task dashboard filter [SCI-4766]
2020-08-03 11:56:24 +02:00
Urban Rotnik
ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items
...
Add export for assigned items [SCI-4748]
2020-08-03 11:30:31 +02:00
aignatov-bio
536367362c
Add statuses to dashboard filters
2020-07-31 10:59:10 +02:00
aignatov-bio
2f5231e832
Add start date to current task dashboard filter
2020-07-29 16:09:23 +02:00
aignatov-bio
15b5f9bb68
Add ordering for result page
2020-07-28 15:39:29 +02:00
aignatov-bio
68fc6ec58a
Add sorting my module statuses
2020-07-27 16:36:21 +02:00
aignatov-bio
9f7efe6068
Add backend for status flow show
2020-07-27 13:48:21 +02:00
aignatov-bio
6bd12e0397
Add modal for status flow
2020-07-27 13:48:21 +02:00
Oleksii Kriuchykhin
1a8333612a
Merge branch 'features/pwa' into develop
2020-07-27 09:47:41 +02:00
Oleksii Kriuchykhin
7bedbd3511
Fix canvas update method [SCI-4817]
2020-07-24 18:38:53 +02:00
Oleksii Kriuchykhin
94588e4698
Refactor task archive and move permissions [SCI-4817]
2020-07-24 17:00:42 +02:00
Urban Rotnik
4958139699
Extend asset API upload to support base64
2020-07-24 14:57:03 +02:00
Urban Rotnik
025378cd0e
Fix translations and JS
2020-07-23 15:53:46 +02:00
Alex Kriuchykhin
26cfa001c8
Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test
...
Add test for canvas_controller [SCI-4769]
2020-07-23 15:18:01 +02:00
Alex Kriuchykhin
d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results
...
Add pagination to results page [SCI-4732]
2020-07-23 14:45:10 +02:00
aignatov-bio
04a6a2a250
Small fixes
2020-07-23 11:35:22 +02:00
Alex Kriuchykhin
cb9fe04584
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters
...
Fix global activities filters [SCI-4785]
2020-07-23 10:09:36 +02:00
Urban Rotnik
512d6f3229
Add actions for update status, clean old complete actions
2020-07-22 16:12:34 +02:00
aignatov-bio
005bfb2ba7
Fix merge conflicts
2020-07-22 12:37:18 +02:00
aignatov-bio
ddfe8231d8
Merge branch 'features/2fa' into develop
2020-07-22 11:56:36 +02:00
Urban Rotnik
3232b4d6bf
Add test for canvas_controller
2020-07-21 13:49:59 +02:00
aignatov-bio
75930b99c3
Fix global activities filters
2020-07-20 15:01:00 +02:00
aignatov-bio
e69e3ea8d3
Add export for assigned items
2020-07-17 15:17:09 +02:00
aignatov-bio
7c4bfad09b
Add pagination to results page
2020-07-16 15:47:19 +02:00
aignatov-bio
c592954400
Add UX
2020-07-13 16:05:23 +02:00
aignatov-bio
7d20bf6fea
Add recovery screen
2020-07-13 09:51:04 +02:00
Oleksii Kriuchykhin
b4fab62d38
Merge branch 'develop' into ok_SCI_4776
2020-07-10 13:40:46 +02:00
aignatov-bio
fef6e5f1db
Add recovery strategy for 2fa
2020-07-09 17:01:00 +02:00
Urban Rotnik
721f3accbe
Merge pull request #2694 from urbanrotnik/ur-sci-4790
...
Show assigned users modal also for view only [SCI-4790]
2020-07-09 16:12:20 +02:00
Urban Rotnik
d2415c3b1d
Show assigned users modal also for view
2020-07-09 15:11:53 +02:00
Urban Rotnik
d8d0f7ef8e
Fix counter in assign dropdown menu on task
2020-07-09 14:50:37 +02:00
Urban Rotnik
b11f166c38
Fix cucumber tests
2020-07-09 13:14:07 +02:00
aignatov-bio
6245e19069
Merge pull request #2718 from biosistemika/master
...
Merge master to develop
2020-07-09 12:56:31 +02:00
Urban Rotnik
950f65b90e
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout
...
Improve report layout [SCI-4771]
2020-07-09 11:48:33 +02:00
mlorb
efbef2c876
Merge pull request #2384 from mlorb/ml-sci-4261
...
Clean up controllers for manage repository columns [SCI-4261]
2020-07-09 09:18:23 +02:00
Mojca Lorber
de9df7f1b0
Add NotImplementedError
2020-07-08 13:28:12 +02:00
Urban Rotnik
d6f37ce28e
Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message
...
Remove flash message for redirects from root url [SCI-4568]
2020-07-08 11:42:05 +02:00
Urban Rotnik
5d067077b1
Add logo and timestamp to PDF and Doc reports
2020-07-08 10:48:29 +02:00
aignatov-bio
be3a1994f8
Add basic UX to 2FA
2020-07-07 13:09:48 +02:00
aignatov-bio
13f7653667
Merge branch 'develop' into features/2fa
2020-07-07 13:05:45 +02:00
Urban Rotnik
ceddfdd978
Remove flash message for redirects from root url
2020-07-07 11:13:36 +02:00
Oleksii Kriuchykhin
aa38d92982
Improve completed_on generation for steps/my_modules [SCI-4776]
2020-07-07 09:34:51 +02:00
aignatov-bio
b127d8c754
Improve active/archive switcher
2020-07-06 14:03:55 +02:00
Oleksii Kriuchykhin
dc481cf236
Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776]
2020-07-03 16:48:29 +02:00
aignatov-bio
9b33cbc104
Rename ensure 2fa method
2020-07-02 11:24:33 +02:00
aignatov-bio
46256c89c9
Fix tests
2020-07-01 15:44:52 +02:00
aignatov-bio
742fb0d27b
Small 2fa improvments
2020-07-01 14:41:55 +02:00
aignatov-bio
4b9881e31e
Add 2fa to user settings page
2020-07-01 13:25:06 +02:00
Urban Rotnik
62a4a5f203
Add 2fa login
2020-07-01 12:46:26 +02:00
Mojca Lorber
22b71bc9cb
Merge branch 'develop' into ml-sci-4261
2020-06-30 13:47:32 +02:00
Mojca Lorber
cf9c3be4cf
Move before actions in RepositoryColumnsController
2020-06-30 13:44:49 +02:00
aignatov-bio
1c34762af3
Merge pull request #2690 from aignatov-bio/ai-sci-4791-fix-shared-inventories-in-task-repositories-dropdown
...
Fix repositories dropdown on task page [SCI-4791]
2020-06-29 09:51:51 +02:00
Alex Kriuchykhin
faa76a6442
Merge pull request #2660 from okriuchykhin/ok_SCI_4707_v2
...
Improve user input filtering on user settings page and for task tags [SCI-4707]
2020-06-29 09:30:45 +02:00
aignatov-bio
968963c24b
Fix repositories dropdown on task page
2020-06-26 11:19:40 +02:00
Oleksii Kriuchykhin
7ea577d8d4
Merge branch 'features/inventory-archiving' into develop
2020-06-24 14:04:54 +02:00
Alex Kriuchykhin
2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button
...
SCI-4780 replace delete button with archive button
2020-06-24 13:16:11 +02:00
Alex Kriuchykhin
e1b862a332
Merge pull request #2679 from urbanrotnik/ur-sci-4741-api-endopints-update
...
Filter out non active repositories and rows [SCI-4741]
2020-06-24 12:51:13 +02:00
Alex Kriuchykhin
8a17b721db
Merge pull request #2678 from urbanrotnik/ur-sci-4878
...
Update all rows on repository archive/restore [SCI-4787]
2020-06-24 12:06:41 +02:00
Oleksii Kriuchykhin
8e0ed286fb
Improve repositories loading for archive/restore [SCI-4780]
2020-06-24 12:01:38 +02:00
Urban Rotnik
2f4bf95373
Revert scrope
2020-06-24 11:42:59 +02:00
Oleksii Kriuchykhin
29f62419bd
Improve repository archive/restore actions [SCI-4780]
2020-06-24 11:32:20 +02:00
aignatov-bio
5fc3146174
Update my module repositories dropdown list
2020-06-24 11:23:17 +02:00
miha
41bb825f33
SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller
2020-06-23 22:59:21 +02:00
Urban Rotnik
c565cbe579
Filter out non active repositories and rows
2020-06-23 10:23:22 +02:00
Urban Rotnik
30de400cf9
Merge pull request #2676 from mlorb/ml-sci-4786
...
Revert default_scope for active repositories [SCI-4786]
2020-06-22 16:17:39 +02:00
Mojca Lorber
be19190ff1
Revert default_scope for active repositories
2020-06-22 14:57:35 +02:00
aignatov-bio
6f2d5b359e
Add action buttons to repository index
2020-06-19 15:54:45 +02:00
Mojca Lorber
3d59bbd50e
Fix default scope bugs
2020-06-18 18:08:53 +02:00
Mojca Lorber
6e8062179c
Implement archiving and restoring of whole inventories
2020-06-18 18:07:23 +02:00
aignatov-bio
e7659da0e7
Fix tests
2020-06-18 14:09:29 +02:00
aignatov-bio
323929b270
Add restore/delete buttons
2020-06-18 14:09:29 +02:00
Urban Rotnik
123375f494
Update scopes in reports
2020-06-18 09:33:12 +02:00
Urban Rotnik
41c1230db1
Remove position check from contorller
2020-06-17 11:55:43 +02:00
Urban Rotnik
83bd8c3ad4
Add default scope for non archived repositories
2020-06-16 09:18:22 +02:00
Oleksii Kriuchykhin
0641ad094f
Improve user input filtering on user settings page and for task tags [SCI-4707]
2020-06-15 15:41:06 +02:00
Urban Rotnik
39eb8145c2
Rename params method
2020-06-11 16:11:23 +02:00
Urban Rotnik
c7d6c4d60e
Add repository_rows restoring and archiving actions on FE
2020-06-09 22:16:55 +02:00
Urban Rotnik
fabfd7ddaf
Add controller action for Archive&Restore
2020-06-09 19:18:30 +02:00
aignatov-bio
4a6d7d0e12
Add archived inventories
2020-06-04 19:07:10 +02:00
aignatov-bio
66a77d8de9
Add sidebar reload on view change
2020-06-04 18:41:45 +02:00
Oleksii Kriuchykhin
48865c8cea
Clear the obsolete code for assiging inventory items to the task [SCI-4571]
2020-06-03 22:54:45 +02:00
Miha Mencin
d89dce9f72
Merge pull request #2632 from okriuchykhin/ok_SCI_4715
...
Remove inventory links of unshared inventory [SCI-4715]
2020-06-02 10:46:33 +02:00
Oleksii Kriuchykhin
6afebdc5da
Remove inventory links of unshared inventory [SCI-4715]
2020-06-01 17:50:31 +02:00
mlorb
26bdabb0c3
Merge pull request #2609 from mlorb/ml-sci-4529
...
Add rename task and rename experiment activities [SCI-4529]
2020-06-01 12:58:36 +02:00
aignatov-bio
4d6282510d
Merge pull request #2629 from aignatov-bio/ai-sci-4599-fix-ordering-for-projects-in-sidebar
...
Fixed projects ordering in sidebar on team page [SCI-4599]
2020-06-01 11:19:29 +02:00
aignatov-bio
2269299b61
Fixed projects ordering in sidebar on team page
2020-06-01 10:55:23 +02:00
aignatov-bio
aee75a2f83
Add repository list view
2020-06-01 10:24:03 +02:00
Alex Kriuchykhin
c6291ef09e
Merge pull request #2623 from aignatov-bio/ai-sci-4709-filter-assigned-private-tasks
...
Filter private assigned tasks [SCI-4709]
2020-05-29 18:19:42 +02:00
Alex Kriuchykhin
26449fdfe2
Merge pull request #2625 from okriuchykhin/ok_SCI_4712
...
Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]
2020-05-29 09:52:08 +02:00
Oleksii Kriuchykhin
8027cc6a49
Fix assigned repositories list and snapshot creation for shared repositories [SCI-4712]
2020-05-28 16:15:05 +02:00
aignatov-bio
116747f261
Filter private assigned tasks
2020-05-28 15:35:19 +02:00
aignatov-bio
34eaf4a138
Merge pull request #2618 from aignatov-bio/ai-sci-4599-order-elements-in-sidebar
...
Add name order for porject/experiment/task sidebar [SCI-4599]
2020-05-28 14:23:53 +02:00
Mojca Lorber
285280827a
Refactor repository column base controller
2020-05-28 12:18:46 +02:00
Mojca Lorber
c673e27109
Merge branch 'develop' into ml-sci-4261
2020-05-28 08:18:24 +02:00
Oleksii Kriuchykhin
0465dba2cf
Fix file dowload from MS Office online [SCI-4673]
2020-05-27 16:59:28 +02:00
aignatov-bio
aaff5eb67f
Add name order for porject/experiment/task sidebar
2020-05-27 13:31:00 +02:00
aignatov-bio
15f58be1c2
Fix snapshot date creation
2020-05-26 15:59:49 +02:00
Mojca Lorber
9b7d321666
Add rename task and rename experiment activities
2020-05-26 15:34:20 +02:00
Miha Mencin
79ba0b3708
Merge pull request #2605 from biosistemika/SCI-4674-tehnician-snapshots-permissions
...
SCI-4674 allow tehnician to create, delete and select snapshot
2020-05-25 16:55:33 +02:00
Miha Mencin
77e1feda97
SCI-4674 name permissions more properly
2020-05-25 16:29:00 +02:00
Miha Mencin
5994e8c6a6
SCI-4674 create special permissions for snapshots on task
2020-05-25 15:49:31 +02:00
Miha Mencin
cd70d9c5a6
SCI-4674 allow tehnician to create, delete and select snapshot
2020-05-25 15:03:37 +02:00
Alex Kriuchykhin
6ada4dc723
Merge pull request #2604 from okriuchykhin/ok_SCI_4669
...
Fix viewing of office files in repository snapshots [SCI-4669]
2020-05-25 13:55:31 +02:00
Oleksii Kriuchykhin
3cabe2250b
Fix viewing of office files in repository snapshots [SCI-4669]
2020-05-25 12:30:08 +02:00
Mojca Lorber
76a1f73989
Change order of snapshots versions
2020-05-25 12:15:24 +02:00
aignatov-bio
100108bd43
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search
...
Improve search through assigned tasks [SCI-4642]
2020-05-25 09:09:19 +02:00
Oleksii Kriuchykhin
c98b042585
Improve handling of unassigned inventories with existing snapshots [SCI-4661]
2020-05-22 17:36:04 +02:00
Alex Kriuchykhin
b5e0e4649c
Merge pull request #2597 from urbanrotnik/4663-fix-button-visibility
...
Fix for snapshot creation [SCI-4672]
2020-05-22 16:38:29 +02:00
Urban Rotnik
a407bf857f
Fix for show and create
2020-05-22 16:19:21 +02:00
aignatov-bio
3287070df7
Improve search through assigned tasks
2020-05-22 14:36:28 +02:00
Mojca Lorber
92861fdd32
Expand assigned inventory after updating assigned items on task
2020-05-21 22:36:09 +02:00
aignatov-bio
d3781a7048
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view
...
Add private tasks to assigned task list [SCI-4660]
2020-05-21 12:57:59 +02:00
Miha Mencin
7de12990a9
SCI-4628 moving snapshot provisioning logic into repository model, making snapshot unique selection validation conditional
2020-05-21 00:36:24 +02:00
aignatov-bio
d16930e987
Add private tasks to assigned task list
2020-05-20 17:23:48 +02:00
aignatov-bio
f8b246eb2a
Fix repositories order in dropdown
2020-05-19 16:18:01 +02:00
Alex Kriuchykhin
afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629
...
Prevent the inventory items editing while snapshot is being created [SCI-4629]
2020-05-19 10:10:34 +02:00
Oleksii Kriuchykhin
8b968f6f67
Fix selection of the default snapshot on tasks [SCI-4637]
2020-05-18 11:06:42 +02:00
Oleksii Kriuchykhin
c0521c3ca7
Prevent the inventory items editing while snapshot is being created [SCI-4629]
2020-05-15 17:46:59 +02:00
Urban Rotnik
a2ade6e0ec
Merge branch 'develop' into features/new-task-layout
2020-05-15 14:27:56 +02:00
aignatov-bio
ce1540aaa9
Small task inventories corrections
2020-05-14 16:41:02 +02:00
Oleksii Kriuchykhin
ba1661b40f
Fix handling of deleted repositories for snapshots [SCI-4596]
2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin
c74fa3c244
Make snapshots selectable [SCI-4596]
2020-05-13 17:58:05 +02:00
Alex Kriuchykhin
76d1196724
Merge pull request #2544 from okriuchykhin/ok_SCI_4597
...
Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]
2020-05-13 16:42:47 +02:00
aignatov-bio
8e20dccc66
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab
...
Add recent protocol tab to load protocal from repository [SCI-4509]
2020-05-08 13:17:26 +02:00
aignatov-bio
6997586357
Merge pull request #2541 from aignatov-bio/ai-sci-4591-merge-assign-unassign-service
...
Merge assign and unassign service [SCI-4591]
2020-05-08 13:15:06 +02:00
aignatov-bio
d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
...
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
2020-05-08 12:39:28 +02:00
aignatov-bio
d3faec1070
Rename service
2020-05-08 12:28:37 +02:00
aignatov-bio
2728df5bac
Move helper method to my_module_helper
2020-05-08 11:56:29 +02:00
aignatov-bio
c9545ddb19
Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab
2020-05-08 10:28:33 +02:00
aignatov-bio
29903f570d
Merge assign and unassign service
2020-05-07 13:51:07 +02:00
aignatov-bio
8ec7a4b7b4
Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
2020-05-07 13:03:00 +02:00
aignatov-bio
8076d8f464
Create helper for partial
2020-05-07 12:51:18 +02:00
Urban Rotnik
a38b850601
Merge pull request #2520 from urbanrotnik/ur-sci-4522-activity-links
...
Activities links [SCI-4522] & [SCI-4514]
2020-05-06 22:11:58 +02:00
Oleksii Kriuchykhin
25f9c5bc7d
Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597]
2020-05-06 15:17:54 +02:00
Urban Rotnik
8ff7c33431
Fix start date activity message
2020-05-06 12:34:45 +02:00
aignatov-bio
938f00484b
Fix markup
2020-04-29 15:17:15 +02:00
aignatov-bio
19d30e2019
Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task
2020-04-29 15:13:38 +02:00
Alex Kriuchykhin
0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552
...
Implement background processing of repository snapshots [SCI-4552]
2020-04-29 12:03:23 +02:00
aignatov-bio
61bbca6bcf
Fix path names and markup
2020-04-28 19:12:17 +02:00
Urban Rotnik
5c72200801
Remove tooltips settings for user
2020-04-28 12:44:47 +02:00
aignatov-bio
b9c5089c2b
Add search to assigned tasks dropdown
2020-04-28 12:41:59 +02:00
Oleksii Kriuchykhin
e6ad5047e0
Implement background processing of repository snapshots [SCI-4552]
2020-04-28 12:09:36 +02:00
aignatov-bio
0604815c00
Add assigned task dropdown to repository
2020-04-24 15:43:10 +02:00
aignatov-bio
f65b50c6ff
Fix rebase conflicts
2020-04-23 16:36:22 +02:00
Urban Rotnik
de4e4ca967
Add before_action for team switch
2020-04-23 16:20:01 +02:00
aignatov-bio
d48997464d
Fix markup
2020-04-23 15:25:28 +02:00
aignatov-bio
34d6e903a4
Add assign items modal and update modal for task inventories
2020-04-23 15:24:40 +02:00
aignatov-bio
10fdd0c1c7
Merge branch 'develop' into features/new-task-layout
2020-04-23 14:07:40 +02:00
Urban Rotnik
38c198705c
Change current_team to target team, add id param to link
2020-04-23 12:40:43 +02:00
Oleksii Kriuchykhin
943285d4a0
Fix Azure AD user creation on sign in [SCI-4544]
2020-04-22 16:47:06 +02:00
Oleksii Kriuchykhin
f811d11c59
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
2020-04-21 14:49:36 +02:00
aignatov-bio
be47efce74
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list
...
Add repositories dropdown list [SCI-4506]
2020-04-16 14:17:17 +02:00
mlorb
9584b11d45
Merge pull request #2507 from mlorb/ml-sci-4505
...
Add the user management section of to the Details section of task layout [SCI-4505]
2020-04-16 13:47:31 +02:00
Alex Kriuchykhin
436f0bf63d
Merge pull request #2506 from okriuchykhin/ok_SCI_4516
...
Add repository snapshots with service, refactor item assigning [SCI-4516]
2020-04-15 17:32:25 +02:00
aignatov-bio
0d1dd74f02
Fix typo
2020-04-14 18:17:54 +02:00
Mojca Lorber
e9959747d6
small refactor
2020-04-14 17:25:36 +02:00
aignatov-bio
f00561cc22
Fix markup
2020-04-14 13:10:13 +02:00
aignatov-bio
c1cac01b28
Add repositories dropdown list
2020-04-14 12:10:16 +02:00
aignatov-bio
fe718349da
Add recent protocol tab to load protocal from repository
2020-04-09 17:29:39 +02:00
Oleksii Kriuchykhin
837437309e
Fix failing tests [SCI-4516]
2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin
3a67c99982
Switch to STI for repositories, fix cell values snapshotting [SCI-4516]
2020-04-09 12:33:04 +02:00
Mojca Lorber
f22f076e6c
Add the user management secion of to the Details section of task layout
2020-04-08 16:24:59 +02:00
aignatov-bio
087f71a82f
Add full view for my-module repository
2020-04-07 21:02:16 +02:00
Oleksii Kriuchykhin
a9c3102835
Add repository snapshots with service, refactor item assigning [SCI-4516]
2020-04-07 18:26:39 +02:00
aignatov-bio
845e8c3d6d
Fix loading process
2020-04-07 12:36:01 +02:00
aignatov-bio
7fdc169ba2
Add simple view to repository table
2020-04-06 19:52:41 +02:00
aignatov-bio
fc810b5524
Merge pull request #2503 from aignatov-bio/ai-sci-4507-add-assigned-repositories-list
...
Add assigned repositories list [SCI-4507]
2020-04-03 13:59:26 +02:00
aignatov-bio
dd3f2cb219
Update my_module assigned repository method
2020-04-03 12:33:42 +02:00
aignatov-bio
9678372dd5
Add assigned repositories list
2020-04-02 12:05:07 +02:00
aignatov-bio
af02201b43
Add decimals to repository column API
2020-04-01 13:29:21 +02:00
Oleksii Kriuchykhin
3c53be1f9a
Add start date to the task [SCI-4504]
2020-03-31 14:17:14 +02:00
Alex Kriuchykhin
92279d07ad
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state
...
Refactor sidebar [SCI-4380]
2020-03-30 09:56:51 +02:00
Oleksii Kriuchykhin
c5dd572e8e
Fix annotation notifications for inventory rows [SCI-4469]
2020-03-23 18:45:36 +01:00
Alex Kriuchykhin
2a2e479cd3
Merge pull request #2470 from okriuchykhin/ok_SCI_4408
...
Enable time fraction for task due date [SCI-4408]
2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin
a518bfe023
Enable time fraction for task due date [SCI-4408]
2020-03-16 17:55:35 +01:00
Oleksii Kriuchykhin
2e2e6be31c
Fix file view permission check in inventories [SCI-4440]
2020-03-12 11:52:46 +01:00
aignatov-bio
d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout
...
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
2020-03-12 11:26:23 +01:00
aignatov-bio
b898f03767
Add user check to project filter in quick start widget
2020-03-11 14:51:21 +01:00
Miha Mencin
26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard
...
Features/dashboard
2020-03-10 18:06:23 +01:00
Miha Mencin
aeeb0b79a4
Merge pull request #2459 from aignatov-bio/ai-sci-4445-add-error-handling-new-task-modal
...
Add error handling to create task modal [SCI-4445]
2020-03-10 17:39:56 +01:00
aignatov-bio
63a5459d21
Add error handling to create task modal
2020-03-10 13:16:56 +01:00
Alex Kriuchykhin
769ba76afa
Merge pull request #2445 from okriuchykhin/ok_SCI_4379
...
Improve file upload checks [SCI-4382]
2020-03-10 09:47:23 +01:00
aignatov-bio
180b736769
Refactor recent work service
2020-03-09 15:10:51 +01:00
aignatov-bio
4328634e78
Remove uneditable projects from create task widget
2020-03-09 13:38:38 +01:00
Alex Kriuchykhin
4bea0781da
Merge pull request #2418 from okriuchykhin/ok_SCI_4276
...
Add API endpoints for new column types [SCI-4276]
2020-03-09 12:58:54 +01:00
Miha Mencin
62b934f012
Merge branch 'develop' into features/dashboard
2020-03-09 09:56:32 +01:00
aignatov-bio
e729aa043e
Add recent work widget
2020-03-06 13:51:18 +01:00
aignatov-bio
6f395b8e36
Merge pull request #2450 from aignatov-bio/ai-sci-4421-sorting-task-without-due-date
...
Add alphabetical order for tasks without due date [SCI-4421]
2020-03-05 14:52:58 +01:00
aignatov-bio
3494d1071e
Merge pull request #2448 from aignatov-bio/ai-sci-4416-add-yellow-due-dates
...
Refactor current task widget [SCI-4416]
2020-03-05 14:46:16 +01:00
aignatov-bio
79560e517d
Fix markup
2020-03-05 14:40:46 +01:00
aignatov-bio
f9be7a2cb8
Add alphabetical order for tasks without due date
2020-03-05 12:58:25 +01:00
Alex Kriuchykhin
f201826eb8
Merge pull request #2426 from okriuchykhin/ok_SCI_4383
...
Add global repositories limit [SCI-4383]
2020-03-05 12:45:02 +01:00
Mojca Lorber
8325ed80f0
Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard
2020-03-04 23:26:01 +01:00
aignatov-bio
77d66b65b1
Refactor current task for addons integration
2020-03-04 13:21:52 +01:00
aignatov-bio
30545f5cf4
Merge pull request #2443 from aignatov-bio/ai-sci-4409-fix-visibilty-of-tasks
...
Fix task visibility for current task widget [SCI-4409]
2020-03-03 16:35:22 +01:00
mlorb
ba438e7728
Merge branch 'features/dashboard' into ml-sci-4354
2020-03-03 16:29:47 +01:00
Mojca Lorber
4f37260571
Fix controller
2020-03-03 16:17:29 +01:00
aignatov-bio
9fa8818a5d
Fix markup
2020-03-03 16:10:52 +01:00
aignatov-bio
da4967b3d0
Fix markup
2020-03-03 16:09:19 +01:00
aignatov-bio
7d7cdce91a
Add file size limitation to tinyMCE
2020-03-03 15:55:17 +01:00
Oleksii Kriuchykhin
11a5536af5
Improve file upload checks [SCI-4382]
2020-03-03 15:26:40 +01:00
aignatov-bio
3dc94a225d
Small visual improvments for current tasks widget
2020-03-03 14:21:16 +01:00
aignatov-bio
eb4a783337
Fix task visibility for current task widget
2020-03-03 13:13:46 +01:00
mlorb
4d52fc9b45
Merge branch 'features/dashboard' into ml-sci-4354
2020-03-03 13:00:05 +01:00
Mojca Lorber
52493fd834
Add pagination for current tasks on dashboard
2020-03-03 12:07:21 +01:00
aignatov-bio
d9bfd8c28e
Add search to current task widget
2020-03-03 09:50:44 +01:00
Oleksii Kriuchykhin
a819e1b8f4
Merge branch 'hotfix/1.17.11' into develop
2020-03-02 11:58:25 +01:00
Alex Kriuchykhin
409c4b7f65
Merge pull request #2438 from okriuchykhin/ok_SCI_4356
...
Improve loading of tasks statistics for dashboard [SCI-4356]
2020-02-28 16:38:39 +01:00
Oleksii Kriuchykhin
78ceb41a9e
Improve loading of tasks statistics for dashboard [SCI-4356]
2020-02-28 16:17:32 +01:00
aignatov-bio
0ae5e51cb3
Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create
2020-02-28 14:37:27 +01:00
aignatov-bio
8b273acaca
Update all sidebars
2020-02-28 14:03:08 +01:00
Miha Mencin
1fd876bb40
Merge pull request #2425 from mlorb/ml-sci-4348
...
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
2020-02-28 12:11:31 +01:00
Mojca Lorber
3c09923d96
Refactoring current tasks backend
2020-02-28 11:51:08 +01:00
aignatov-bio
9e15d1ea42
Refactor experiment sidebar
2020-02-27 16:04:44 +01:00
Mojca Lorber
f29ce66bea
Refactor backend, add empty state and fix some small scc changes
2020-02-26 11:07:17 +01:00
aignatov-bio
8e05908753
Small fixes
2020-02-25 17:19:11 +01:00
aignatov-bio
32d6f9a43a
Split my_module create service to seperate services
2020-02-25 13:46:44 +01:00
aignatov-bio
a28d729aeb
Add end point
2020-02-24 17:09:10 +01:00
Oleksii Kriuchykhin
0cb9584a2b
Fix empty mime type for ActiveStorage local file service [SCI-4360]
2020-02-24 16:04:35 +01:00
aignatov-bio
0675b137ad
Add team and task status for calendars scope
2020-02-22 18:15:18 +01:00
Oleksii Kriuchykhin
63e557ea9e
Add global repositories limit [SCI-4383]
2020-02-21 14:40:17 +01:00
Mojca Lorber
9bd2e8bec4
Dashboard current tasks visual layout and backend
2020-02-21 10:41:42 +01:00
aignatov-bio
cf4dbd5ff4
Add calendar widget
2020-02-20 17:02:38 +01:00
Oleksii Kriuchykhin
9d0d75acc5
Add API endpoints for new column types [SCI-4276]
2020-02-18 15:13:46 +01:00
aignatov-bio
ff45b17b53
Fix localization and small markup fixes
2020-02-17 15:32:43 +01:00
aignatov-bio
a438f6b4f0
Finished filters
2020-02-17 10:47:10 +01:00
aignatov-bio
485597a9ef
Add front-end part
2020-02-14 12:07:40 +01:00
aignatov-bio
5c0a769f87
General dashboard layout
2020-02-13 13:50:29 +01:00
aignatov-bio
463b99195c
Remove shared inventories with view permission from dropdown list
2020-02-12 11:16:55 +01:00
Oleksii Kriuchykhin
5be4ffb139
Fix multiple file result creation [SCI-4346]
2020-02-11 20:08:36 +01:00
Alex Kriuchykhin
9c763f2111
Merge pull request #2383 from okriuchykhin/ok_SCI_4220
...
Extend inventory import to support new data types [SCI-4220]
2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin
5470bb9b9b
Fix file result only name update [SCI-4321]
2020-02-07 15:21:50 +01:00
Mojca Lorber
2727614603
Clean up controllers for manage repository columns
2020-02-04 16:05:16 +01:00
Oleksii Kriuchykhin
632b54cb98
Merge branch 'develop' into ok_SCI_4220
2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin
b0c785f4fb
Extend inventory import to support new data types [SCI-4220]
2020-02-03 15:20:01 +01:00
Urban Rotnik
3db48c44f7
Add ordered scope
2020-01-30 13:47:14 +01:00
Urban Rotnik
1bb54d20cf
Teams ordering fixed
2020-01-30 13:46:04 +01:00
Miha Mencin
81023f8c69
SCI-4300 sckip permission checking for list
2020-01-27 14:27:46 +01:00
Oleksii Kriuchykhin
8c2b1e5037
Fix global search for repositories and checklists update [SCI-4251]
2020-01-16 15:30:19 +01:00
Miha Mencin
b23c874f9e
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost
...
Sci 4199 selected checklist is lost
2020-01-15 15:28:34 +01:00
mlorb
e44903bae5
Merge branch 'develop' into ml-sci-4150-v2
2020-01-15 14:47:25 +01:00
Miha Mencin
5bfa5c7939
SCI-4199 disabling delimiter, adding warning
2020-01-15 13:59:28 +01:00
Oleksii Kriuchykhin
eed68a2590
Refactor repository cell clonning to support all data types [SCI-4204]
2020-01-14 16:55:10 +01:00
Mojca Lorber
9176301b7b
Refactor manage repository columns, move it from page into modal
2020-01-14 11:13:19 +01:00
Oleksii Kriuchykhin
01b8d2226d
Optimize repository table counters [SCI-4224]
2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin
7b82e33eb6
Fix repository filtering and improve speed [SCI-4224]
2020-01-13 16:09:07 +01:00
aignatov-bio
bdb970b8d4
Fix flash message for datetime column
2020-01-10 13:22:29 +01:00
Alex Kriuchykhin
f1babb2237
Merge pull request #2279 from okriuchykhin/ok_SCI_4000
...
Fix sidebar update for inline editing [SCI-4000]
2020-01-10 10:34:27 +01:00
Alex Kriuchykhin
d2e12e0683
Merge pull request #2265 from okriuchykhin/ok_SCI_4146
...
Restrict files to only images in RTE fields [SCI-4146]
2020-01-10 10:34:00 +01:00
Oleksii Kriuchykhin
1624f9d5ab
Disable comment edit mode if comment is not editable [SCI-4149]
2020-01-08 12:32:59 +01:00
Oleksii Kriuchykhin
d9b9243da7
Merge branch 'develop' into features/new-column-types
2020-01-07 16:03:33 +01:00
Oleksii Kriuchykhin
16b591b110
Fix sidebar update for inline editing [SCI-4000]
2020-01-06 16:07:23 +01:00
aignatov-bio
3bd44dc5ab
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model
...
Refactor checklist column data structure [SCI-4168]
2019-12-24 11:12:36 +01:00
Urban Rotnik
400c109592
Refactor StatusesJS for new dropdown
2019-12-23 14:34:11 +01:00
Miha Mencin
882ec711fe
Merge pull request #2276 from biosistemika/master
...
Master
2019-12-20 17:39:46 +01:00
aignatov-bio
54800cb69b
Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model
2019-12-20 15:46:39 +01:00
aignatov-bio
16c4879e56
Merge migrations and update sorting
2019-12-20 15:42:54 +01:00
Oleksii Kriuchykhin
b945171f2f
Fix creation of new tasks on canvas [SCI-4171]
2019-12-19 15:48:25 +01:00
Urban Rotnik
7153711570
Move delimiter from column to metadata
2019-12-18 10:22:52 +01:00
Miha Mencin
b67911c81a
Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9
2019-12-17 14:48:50 +01:00
Oleksii Kriuchykhin
403a3e0140
Restrict files to only images in RTE fields [SCI-4146]
2019-12-16 16:05:40 +01:00
Alex Kriuchykhin
792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
...
Implement SSO with Azure AD [SCI-4142]
2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin
0094528a02
Improve connected accounts unlinking [SCI-4142]
2019-12-12 14:57:27 +01:00
aignatov-bio
eed56b59aa
Fix markup
2019-12-11 15:08:18 +01:00
aignatov-bio
7664f4be78
Add checklist and list edit mode
2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin
1aa334fdaa
Merge branch 'develop' into release-1-17-8
2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin
ff4ef818fb
Implement SSO with Azure AD [SCI-4142]
2019-12-10 17:24:53 +01:00
aignatov-bio
7fc9c0d1e4
Adding frontend for checklist edit mode
2019-12-10 15:58:59 +01:00
Urban Rotnik
5055490a23
Refactor asset value methods
2019-12-10 14:29:36 +01:00
Urban Rotnik
82b93bf9a4
Fix failing tests
2019-12-10 14:29:35 +01:00
Urban Rotnik
508a9b4e3e
RepositoryRows controller refactor
2019-12-10 14:29:35 +01:00
Urban Rotnik
0c990ef8cf
Add functions for creating new cells with values
2019-12-10 14:29:34 +01:00
Mojca Lorber
8503dd7007
Add numeric repository column type
2019-12-09 16:38:21 +01:00
aignatov-bio
09079fbcda
Fix naming and tests
2019-12-09 13:48:36 +01:00
aignatov-bio
d8676596f1
Add checklists column type
2019-12-09 13:48:36 +01:00
Urban Rotnik
7661a24a44
Remove scope for before_action
2019-12-06 11:15:17 +01:00
Urban Rotnik
2c0a6ed085
Remove current_user vars
2019-12-06 11:12:07 +01:00
Oleksii Kriuchykhin
03667f619f
Merge branch 'release-1-17-7' into develop
2019-12-05 13:03:39 +01:00
Urban Rotnik
ee5c2ac93d
Add edit renderer for Assets
2019-12-04 14:52:52 +01:00
aignatov-bio
d5f9604e1c
Fix file post process method
2019-12-03 10:17:47 +01:00
Urban Rotnik
3ab1967703
Add Edit renderer for Statuses
2019-12-02 11:03:05 +01:00
Alex Kriuchykhin
fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098
...
Refactor Azure configuration and connected accounts [SCI-4098]
2019-11-29 11:30:33 +01:00
Urban Rotnik
5f2407e3fb
Add view renders for DateTime column types
2019-11-29 10:50:14 +01:00
Urban Rotnik
65d8d0e35b
DateTime HTML and JS simplified
2019-11-29 10:19:57 +01:00
Urban Rotnik
5ae29d549e
Add manage modal for DateTime values
2019-11-29 10:19:55 +01:00
Urban Rotnik
fe4aa12ced
Add DateTime columns CRUD endpoints
2019-11-29 10:19:14 +01:00
Urban Rotnik
dc6cc3bc62
Show after create flash messages
2019-11-29 10:19:12 +01:00
Urban Rotnik
b2ce600820
Add delimiter column for repository_column
2019-11-29 10:19:10 +01:00
Urban Rotnik
b2b6296cb5
Improve update items action, JS and views
2019-11-29 10:19:10 +01:00
Urban Rotnik
24acf1f84b
Fix edit mode for File and Text
2019-11-29 10:19:08 +01:00
Urban Rotnik
1e8261ac2a
Update InventoryColumns API for new Status Type
2019-11-29 10:19:07 +01:00
Urban Rotnik
7ab12baef9
Add API endpoint for StatusItems
2019-11-29 10:19:07 +01:00
Mojca Lorber
bcb8cc1840
Remove byebug
2019-11-29 10:17:54 +01:00
Mojca Lorber
305104f639
Refactor text inventory type
2019-11-29 10:17:53 +01:00
Urban Rotnik
37b7d5aa64
Use values from extends
2019-11-29 10:17:52 +01:00