Commit graph

5090 commits

Author SHA1 Message Date
Mojca Lorber
70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Alex Kriuchykhin
2e987ceed3
Merge pull request #1570 from okriuchykhin/ok_SCI_2997
Add viewing permissions for global activities [SCI-2997]
2019-03-19 11:09:35 +01:00
Oleksii Kriuchykhin
0c71493fdb Add viewing permissions for global activities [SCI-2997] 2019-03-18 15:38:19 +01:00
Urban Rotnik
3802d417ce
Merge pull request #1562 from urbanrotnik/ur-SCI-3138-new-activities
New global activities [SCI-3138]
2019-03-18 09:07:50 +01:00
Urban Rotnik
5dccdbab17 fixup! Fix failing tests 2019-03-15 11:12:10 +01:00
Urban Rotnik
2ea2700837 fixup! Fix failing tests 2019-03-15 10:30:51 +01:00
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
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
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
Oleksii Kriuchykhin
0b87e8e1e4 Merge branch 'features/global-activities' into ok_SCI_3024_v3 2019-03-08 10:29:51 +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
Oleksii Kriuchykhin
c3705ccb25 Improve group collapse JS code [SCI-2994][SCI-3024] 2019-03-04 13:44:43 +01:00
Oleksii Kriuchykhin
0930277c4e Add views and helpers for global activities individual cards [SCI-2994][SCI-3024] 2019-02-27 16:02:53 +01:00
Alex Kriuchykhin
af5cc4a5bb
Merge pull request #1526 from okriuchykhin/ok_SCI_3014_v2
Add main global activities bussiness logic [SCI-3014]
2019-02-27 14:00:31 +01:00
Oleksii Kriuchykhin
0266f6bd3c Change search on subject query constaruction logic [SCI-3014] 2019-02-27 13:21:05 +01:00
Oleksii Kriuchykhin
74a60d443d Merge branch 'features/global-activities' into ok_SCI_3014_v2 2019-02-26 13:46:25 +01:00
Urban Rotnik
11c14d2360
Merge pull request #1523 from urbanrotnik/ur-SCI-3026-migration-for-lagacy-activity
Activity model update (original JIRA issue is migration for lagacy activity)[3026]
2019-02-26 13:41:54 +01:00
Oleksii Kriuchykhin
61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Urban Rotnik
c8ab9f8ff8 Fix tests 2019-02-26 08:04:05 +01:00
Urban Rotnik
5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Miha Mencin
a93402d69f sci-2992 routes 2019-02-25 16:50:38 +01:00
Miha Mencin
76c3db0b11 added layout, added css, added select2 lib, WIP 2019-02-25 16:50:38 +01:00
Urban Rotnik
5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
aignatov-bio
0bf7cb4c59
Merge pull request #1519 from biosistemika/ai-adding-multiple-select-plugin
Adding new Select2 library with customizations
2019-02-25 16:46:07 +01:00
Jure Grabnar
4edab957a4
Merge pull request #1516 from jbargu/jg_sci_3069_due_date_red
Due date is not red for today anymore [SCI-3069]
2019-02-25 13:20:50 +01:00
Anton Ignatov
6971d1a55d Adding new Select2 library with customization 2019-02-22 16:40:33 +01:00
aignatov-bio
aa8a2b040a
Merge pull request #1518 from biosistemika/features/system-notifications
Notification changes on settings page [SCI 3084] (#1517)
2019-02-22 14:01:38 +01:00
aignatov-bio
606708987f
Notification changes on settings page [SCI 3084] (#1517)
* Fix css and update text settings
2019-02-22 13:20:51 +01:00
Jure Grabnar
f9cb8c8803 Add utc conversion to due_date 2019-02-22 10:47:39 +01:00
Jure Grabnar
87dcf301fb Change due_date calculation to DateTime#end_of_day 2019-02-22 10:23:12 +01:00
Jure Grabnar
fb533eb9d3
Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed
Add action_name to sidebar cache as dependency [SCI-2930]
2019-02-22 10:04:57 +01:00
Jure Grabnar
7f0ea48dff
Merge pull request #1515 from jbargu/jg_sci_3080_demo_project_rename
Rename Demo project and create rake task to create it on existing users [SCI-3080]
2019-02-22 10:01:39 +01:00
Jure Grabnar
96f2da1e8b Shift due day calculations for 1 day
Closes SCI-3069.
2019-02-22 08:01:15 +01:00