Commit graph

478 commits

Author SHA1 Message Date
mlorb
1e3d0e901a
Merge pull request from mlorb/ml-sci-3304
Fix links in activity message for protocols in repository [SCI-3304]
2019-04-15 11:55:08 +02:00
Anton Ignatov
dd8b3caf65 Fix duplicate activtiy issue and fix link to inventory 2019-04-15 11:35:30 +02:00
Mojca Lorber
252fdaf9a8 Fix links in activity message for protocols in repository 2019-04-12 15:14:41 +02:00
Anton Ignatov
811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
Oleksii Kriuchykhin
d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +02:00
Oleksii Kriuchykhin
8c2b2513b0 Fix user popup in global activities [SCI-3285] 2019-04-03 12:53:52 +02:00
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
Urban Rotnik
73dd6678ee Fix for show date value 2019-04-02 10:36:11 +02:00
Urban Rotnik
dc0c629798 Fix to show report name in Activities 2019-04-01 15:58:28 +02:00
Urban Rotnik
0ed96d68de Add step position for steps in Protocol repository. Add default value for blank names also. 2019-04-01 15:58:17 +02:00
Alex Kriuchykhin
b3aa6be23d
Merge pull request from okriuchykhin/ok_SCI_3255
Add global activities to reports [SCI-3255]
2019-04-01 15:07:06 +02:00
Jure Grabnar
e165459ef5
Merge pull request 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
Oleksii Kriuchykhin
98e58ff7eb Add global activities to reports [SCI-3255] 2019-04-01 11:26:51 +02:00
Urban Rotnik
03dcc91cf1 Fix showing result icon when result is deleted 2019-04-01 09:58:13 +02:00
Oleksii Kriuchykhin
5008339d81 Add handling of links for objects from another team [SCI-3229][SCI-3241] 2019-03-28 14:56:34 +01:00
Oleksii Kriuchykhin
d7d45bec70 Fix links for archived objects in global activities [SCI-3229] 2019-03-28 13:43:50 +01:00
Miha Mencin
8e12e0f5b3 [SCI-3236] showing font-awesome icon based on result type 2019-03-26 17:04:31 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +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
d1e38e5bc9 Project 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
Oleksii Kriuchykhin
ded74044de Fix circle icon in image editor [SCI-2855] 2019-03-11 15:10:38 +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
mz3944
f6c8af105d
Merge pull request from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
2019-01-21 09:50:34 +01:00
Matej Zrimšek
838455af0d Fix protocols.io Date handling at import 2019-01-12 19:28:45 +01:00
Alex Kriuchykhin
be514fd62d
Merge pull request from okriuchykhin/ok_SCI_2931
Fix image URLs in export all document [SCI-2931]
2019-01-11 12:03:06 +01:00
Oleksii Kriuchykhin
ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +01:00
Oleksii Kriuchykhin
2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
Matej Zrimšek
b74105abc2 Fix Date and Time display formats 2018-12-23 20:30:09 +01:00
Alex Kriuchykhin
ab0924c8e6
Merge pull request from okriuchykhin/ok_SCI_2864
Use built-in methods for Postgres extensions enabling [SCI-2864]
2018-12-16 19:45:56 +01:00
Oleksii Kriuchykhin
7cd1c12a4f Use built-in methods for Postgres extensions enabling [SCI-2864] 2018-12-10 14:14:49 +01:00
Oleksii Kriuchykhin
60a19734b2 Enable caching for navigation sidebar [SCI-2757] 2018-11-29 11:28:36 +01:00
Alex Kriuchykhin
20e2cbf0ca
Merge pull request from okriuchykhin/ok_SCI_2880
Fix smart annotations rendering issues [SCI-2880]
2018-11-28 09:47:20 +01:00
Oleksii Kriuchykhin
d67abfda2c Additional fixies for smart annotations [SCI-2880] 2018-11-26 15:17:18 +01:00
Jure Grabnar
6ec2c99a28 Hound styling 2018-11-26 13:52:01 +01:00
Jure Grabnar
0086e4dcf3 Catch some of templates error when import protocols.io 2018-11-26 13:43:05 +01:00
Jure Grabnar
c7d108ec16 Update according to Hound
Closes [SCI-2790]
2018-11-23 20:52:07 +01:00
Jure Grabnar
2834edb286 Add command/subprotocol/safety for PIO 2018-11-23 20:13:34 +01:00
Jure Grabnar
c00b08b101 Add sw_package and dataset component for PIO 2018-11-23 19:44:10 +01:00
Jure Grabnar
5ab2556632 Importing of protocols now works 2018-11-23 18:54:37 +01:00
Jure Grabnar
2c8a7f8eca Add last_modified evaluation for PIO import 2018-11-23 17:51:47 +01:00
Jure Grabnar
87d5e5029a Fix publish_date in PIO import 2018-11-23 17:37:26 +01:00
Jure Grabnar
76c2da4bae Add uniq tables 2018-11-23 16:30:29 +01:00
Oleksii Kriuchykhin
537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Luka Murn
84df2c81f9 Merge branch 'features/export-all'
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
81d751974d Fix helpers to use with export all [SCI-2793] 2018-10-22 14:32:10 +02:00
Matej Zrimšek
46da1e6b7d Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641] 2018-10-15 07:13:41 +02:00