Commit graph

5111 commits

Author SHA1 Message Date
aignatov-bio
fd6e622b95
Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates
Remove white spaces for date in global activities [SCI-3205]
2019-03-25 12:58:35 +01:00
aignatov-bio
282d67fdfd
Merge pull request #1578 from aignatov-bio/ai-sci-3218-reduce-white-space
Remove whitespace to breadcrumbs [SCI-3218]
2019-03-25 12:58:21 +01:00
Anton Ignatov
c584a0d606 Remove white spaces for date in global activites 2019-03-25 11:06:00 +01:00
Anton Ignatov
c8c211f245 Remove whitespace to breadcrumbs 2019-03-25 09:39:17 +01:00
mlorb
d26c885be7
Merge pull request #1571 from mlorb/ml-sci-3021
Implement changes to current activity loging [SCI-3021]
2019-03-21 08:20:02 +01:00
Mojca Lorber
c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Mojca Lorber
e34ddeaefd Remove activities from demo project 2019-03-20 13:25:59 +01:00
Mojca Lorber
8f8f4aa250 Move and update the activities locales 2019-03-20 13:20:35 +01:00
Mojca Lorber
4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Anton Ignatov
29b67be127 Fix team selection in global activities and add link from navbar 2019-03-20 10:33:22 +01:00
Mojca Lorber
42ff1c0a68 fix bug in revert protocol method 2019-03-20 09:43:38 +01:00
aignatov-bio
51f6644c16
Merge pull request #1567 from aignatov-bio/ai-sci-3166-finalize-the-global-activites
[SCI-3166] Finalize global activities front end
2019-03-20 09:02:48 +01:00
Mojca Lorber
cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Mojca Lorber
c476816359 Task activities refactoring, without tests 2019-03-19 15:33:57 +01:00
Mojca Lorber
7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik
1017836c0e Activities service fix 2019-03-19 14:12:39 +01:00
Urban Rotnik
fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +01:00
Anton Ignatov
f606210652 Rubocop fix 2019-03-19 13:52:03 +01:00
Anton Ignatov
87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +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