Commit graph

2284 commits

Author SHA1 Message Date
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