Commit graph

311 commits

Author SHA1 Message Date
Urban Rotnik
86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Urban Rotnik
8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
aignatov-bio
e6102c72c7
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties

* Adding test for activities
2019-04-02 11:50:37 +02:00
Urban Rotnik
b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
2019-04-01 14:32:54 +02:00
Jure Grabnar
ebc2d8ee75 Fix experiment_spec test using the old variable
Closes SCI-3244
2019-04-01 12:50:35 +02:00
Mojca Lorber
f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Jure Grabnar
f3e6a35121 Update PermissionEval tests with team check 2019-03-21 10:45:21 +01:00
Mojca Lorber
c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Jure Grabnar
5de51f9c58 Prevent smart annotations accessing other teams when importing protocol
Closes SCI-3163
2019-03-20 12:58:22 +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
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
fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +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
b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +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
Miha Mencin
51b3aea49a added uniquness validator and index on user_projects and user_teams relations
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
2019-02-27 15:09:47 +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
Urban Rotnik
5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
Miha Mencin
bcd0b433b6
Merge pull request #1514 from biosistemika/features/system-notifications
Features/system notifications
2019-02-21 16:38:58 +01:00
aignatov-bio
5f78d83f9c
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance

* Remove search and fix duplicate bug

* Fix specs for new method
2019-02-21 16:15:13 +01:00
aignatov-bio
5fdba554d2
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
2019-02-20 17:22:57 +01:00
Urban Rotnik
82ea31e275 Add validation limits for system notification fields 2019-02-20 16:05:15 +01:00
Urban Rotnik
7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
aignatov-bio
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
2019-02-19 13:51:18 +01:00
Urban Rotnik
f7c7335bf0 Change test to pass on Travis 2019-02-19 11:23:01 +01:00
Urban Rotnik
f63eaaefe7 Add user_system_notification records when syncing notifications, update email sending 2019-02-19 11:22:58 +01:00
Urban Rotnik
29d77ca81d Add system_notification sending email feature 2019-02-19 11:20:25 +01:00
aignatov-bio
8e905b67b2
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
2019-02-19 11:08:59 +01:00
Alex Kriuchykhin
185e3b4832
Merge pull request #1495 from okriuchykhin/ok_SCI_3039
Create templates project when syncing templates if team doesn't have it [SCI-3039]
2019-02-14 17:40:01 +01:00
Urban Rotnik
5b55860dea Add scheduler 2019-02-13 15:48:15 +01:00
Urban Rotnik
9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin
da30d187a6 Create templates project when syncing templates if team doesn't have it [SCI-3039] 2019-02-13 15:17:33 +01:00
mlorb
71e4cc4dbd
Merge branch 'master' into ml-sci-2940 2019-02-13 14:35:03 +01:00
Mojca Lorber
0adb8b2b61 Fix failing tests 2019-02-13 14:31:26 +01:00