Commit graph

6112 commits

Author SHA1 Message Date
Urban Rotnik
c65d1af18d Fix failing tests 2019-03-13 09:53:34 +01:00
Urban Rotnik
b6a8556601 Add activities for exporting Projects, Inventory items 2019-03-12 09:15:06 +01:00
Urban Rotnik
e7b57aa4f7 Add creating activities for Team actions 2019-03-12 09:15:06 +01:00
Urban Rotnik
3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik
cfe2888bea Repository columns actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
2a7bbac733 Repository actions logging 2019-03-12 09:11:00 +01:00
Urban Rotnik
976831e7d3 Edit and Archive experiment activity logging 2019-03-12 09:11:00 +01:00
Urban Rotnik
1a3c97b978 Add new enum values for Activity type_of 2019-03-12 09:11:00 +01:00
Urban Rotnik
ea59482bef
Merge pull request #1551 from urbanrotnik/ur-SCI-3103-implement-changes-to-activity-logging
Global activities creating service [SCI-3103]
2019-03-12 09:03:09 +01:00
Anton Ignatov
b6480b04a9 Fixed conflicts 2019-03-11 15:36:56 +01:00
Oleksii Kriuchykhin
af94f79f0d Submit image as FormData [SCI-2879] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
7315db73f1 Add missing semicolon [SCI-2856] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
37dc8298b7 Fix webpack config [SCI-2856] 2019-03-11 15:13:06 +01:00
Oleksii Kriuchykhin
9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin
ded74044de Fix circle icon in image editor [SCI-2855] 2019-03-11 15:10:38 +01:00
Oleksii Kriuchykhin
feb75f62e1 Add workaround for image caching in fabric js [SCI-2855] 2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin
80e525fd97 Improve image editor behaviour [SCI-2855] 2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin
89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +01:00
Urban Rotnik
3992336db9 Add type and value_for attributes to user hash 2019-03-11 08:37:22 +01:00
Urban Rotnik
b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Urban Rotnik
ad8e5973fa Remove not null constraint from project_id in Activity table 2019-03-11 08:36:15 +01:00
Urban Rotnik
9ed3313f0f Create project activity refactored 2019-03-11 08:36:15 +01:00
Urban Rotnik
117944117b Add service for activity creation 2019-03-11 08:36:15 +01:00
Luka Murn
5987be79c3
Change line length in rubocop to 120 2019-03-08 14:09:38 +01:00
Alex Kriuchykhin
bc3d5ae87c
Merge pull request #1535 from okriuchykhin/ok_SCI_3024_v3
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
2019-03-08 14:05:44 +01:00
Oleksii Kriuchykhin
e3bacd6b9a Fix global activities page after refactoring [SCI-2994][SCI-3024] 2019-03-08 13:09:27 +01:00
Jure Grabnar
eceda4909f Move edit_file permission for wopi file in a special function
Used for overwritting it in addons.

Closes SCI-2949
2019-03-08 12:22:35 +01:00
Oleksii Kriuchykhin
0b87e8e1e4 Merge branch 'features/global-activities' into ok_SCI_3024_v3 2019-03-08 10:29:51 +01:00
Alex Kriuchykhin
bb29a97962
Merge pull request #1557 from okriuchykhin/ok_SCI_3151
Improve JS files inclusion in export all [SCI-3151]
2019-03-07 17:46:45 +01:00
Oleksii Kriuchykhin
af9daf3a5e Improve JS files inclusion in export all [SCI-3151] 2019-03-07 17:42:47 +01:00
Alex Kriuchykhin
ec1aec3bf1
Merge pull request #1556 from okriuchykhin/ok_SCI_3048
Fix local storage file download links [SCI-3048]
2019-03-07 16:58:30 +01:00
Oleksii Kriuchykhin
0c99ea9c5c Fix local storage file download links [SCI-3048] 2019-03-07 16:46:05 +01:00
Alex Kriuchykhin
3da3ef0e8e
Merge pull request #1555 from okriuchykhin/ok_SCI_3151
Embed tables JS files to main HTML of Export All [SCI-3151]
2019-03-07 14:34:28 +01:00
Oleksii Kriuchykhin
8cc95bf491 Embed tables JS files to main HTML of Export All [SCI-3151] 2019-03-07 14:23:10 +01:00
Alex Kriuchykhin
d5110a4f87
Merge pull request #1554 from okriuchykhin/ok_SCI_3150
Fix JS files inclusion in export all report [SCI-3150]
2019-03-07 11:17:51 +01:00
Oleksii Kriuchykhin
2b239e2f35 Fix JS files inclusion in export all report [SCI-3150] 2019-03-07 11:14:38 +01:00
Luka Murn
4e2b971e9b
Update VERSION to 1.15.6 2019-03-06 10:43:52 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
2019-03-06 10:34:04 +01:00
aignatov-bio
125d2a3b9b
New inline tags editing in task [SCI 3093] (#1529)
* Adding inline tags selection
2019-03-06 09:18:45 +01:00
aignatov-bio
b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
2019-03-06 09:17:34 +01:00
Miha Mencin
8fbda40c49
Merge pull request #1552 from biosistemika/mm-sci-3119-create-templates-at-login
put the scheduling logic into session create action
2019-03-05 10:56:48 +01:00
Miha Mencin
9807c80286 move the create action to the tope section of controller 2019-03-05 10:49:36 +01:00
Miha Mencin
67fe486874 put the scheduling logic into session create action 2019-03-05 10:43:39 +01:00
aignatov-bio
6dcaea973d
Merge pull request #1550 from aignatov-bio/ai-sci-3123-keep-title-bold
Bold text for read messages SCI-3123
2019-03-05 10:30:16 +01:00
Miha Mencin
0bd40dca4e
Merge pull request #1549 from biosistemika/mm-sci-3119-create-templates-at-login
Prepare a mechanism to schedule the template creation at user login
2019-03-05 09:24:23 +01:00
Miha Mencin
6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin
fa7bba9de7 scheduling creation of demo project at the sign in time
remove wrong schema, fix comment, add migration
2019-03-04 18:26:15 +01:00