scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
5556 commits 77 branches 180 tags 167 MiB
Commit graph

5556 commits

This branch
This branch
All branches
Author SHA1 Message Date
mlorb
600f20486e
Merge pull request #1493 from mlorb/ml-sci-3033-v2 
Add flag for archived tasks to experiment exporter [SCI-3033]
 2019-02-14 15:05:32 +01:00
Mojca Lorber
343a46584f Rename scope 2019-02-14 14:54:04 +01:00
Mojca Lorber
0e14c126e5 Add scope instead of method for active my_module_group 2019-02-14 10:53:48 +01:00
mlorb
86c325c9e6
Merge pull request #1480 from mlorb/ml-sci-2940 
Update the Demo Project generation [SCI-2940]
 2019-02-14 08:14:29 +01:00
Urban Rotnik
ada0846f38 Merge branch 'ur-SCI-2954-client-synchronization-service' into features/system-notifications 2019-02-13 15:49:55 +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
aignatov-bio
5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) 
* System notification view and notification partial (SCI 2956 and SCI 3001)
 2019-02-13 13:06:14 +01:00
Mojca Lorber
16f99afbc0 Minor fixes 2019-02-13 12:20:14 +01:00
Mojca Lorber
5825c7120d fix falling test 2019-02-13 11:49:01 +01:00
Oleksii Kriuchykhin
f3ad4f7fc9 Fix failing test [SCI-3037] 2019-02-12 13:39:38 +01:00
Mojca Lorber
d706a18e2d Add flag for archived tasks to experiment exporter 2019-02-12 13:29:48 +01:00
mlorb
8bad68c854
Merge pull request #1457 from mlorb/ml-sci-2933 
Change experiment cards look and feel [SCI-2933]
 2019-02-12 11:49:24 +01:00
Mojca Lorber
3b4a894124 fix hound 2019-02-12 11:24:44 +01:00
Oleksii Kriuchykhin
7854b9d281 Merge branch 'features/templates' into ok_SCI_3037 2019-02-12 11:18:31 +01:00
Oleksii Kriuchykhin
445098fe45 Fix protocols in team export service [SCI-3037] 2019-02-12 10:56:15 +01:00
Alex Kriuchykhin
b71c9d96a2
Merge pull request #1476 from okriuchykhin/ok_SCI_2944 
Add test for templates service [SCI-2944]
 2019-02-12 09:39:03 +01:00
mlorb
fdfa1c423c
Merge pull request #1491 from mlorb/ml-2938-v3 
Remove electronic signatures from templates [SCI-2938]
 2019-02-11 17:55:06 +01:00
Mojca Lorber
d8cc482cbf remove electronic signatures from templates 2019-02-11 17:51:48 +01:00
mlorb
61eb79bcfc
Merge pull request #1490 from mlorb/ml-sci-2938-v2 
Add templates after protocol_keyword_team rake task was run [SCI-2938]
 2019-02-11 16:22:29 +01:00
Mojca Lorber
78a29c4141 add templates after protocol_keyword_team rake task was run 2019-02-11 16:15:56 +01:00
mlorb
5d6d59a348
Merge pull request #1489 from mlorb/ml-sci-2938 
Add templates [SCI-2938]
 2019-02-11 14:07:47 +01:00
Mojca Lorber
087832c29d add templates 2019-02-11 14:02:49 +01:00
aignatov-bio
de75ec4600
Merge pull request #1485 from biosistemika/ai-sci-3006-inventory-order-bug 
[SCI-3006] After changing order of inventory columns item can not be edited, deleted, copied
 2019-02-11 13:50:13 +01:00
aignatov-bio
16164477ac
Merge pull request #1487 from biosistemika/ai-sci-3005-user-counter-card-not-updated 
User counter on task card is not updated [SCI-3005]
 2019-02-11 13:49:49 +01:00
Alex Kriuchykhin
b7d7e4bf10
Merge pull request #1488 from okriuchykhin/ok_SCI_3030 
Fix TinyMCE images in protocol import [SCI-3030]
 2019-02-11 13:41:01 +01:00
Oleksii Kriuchykhin
acbbc1a9f8 Add comment [SCI-2944] 2019-02-11 13:40:25 +01:00
Alex Kriuchykhin
11e0ccc24a
Merge pull request #1479 from okriuchykhin/ok_SCI_2967 
Optionally disable Tika background mode through env variable [SCI-2967]
 2019-02-11 12:56:31 +01:00
Jure Grabnar
2ad63e09fd
Merge pull request #1483 from jbargu/jg_sci_2946 
Test experiment import [SCI-2946]
 2019-02-10 15:26:20 +01:00
Oleksii Kriuchykhin
2ff5199be0 Fix TinyMCE images in protocol import [SCI-3030] 2019-02-07 16:58:38 +01:00
Alex Kriuchykhin
dc7fdaa191
Merge pull request #1486 from okriuchykhin/ok_SCI_3023 
Improve error logging in protocol import [SCI-3023]
 2019-02-07 15:58:07 +01:00
Anton Ignatov
c389b7ab06 remove console.log from js 2019-02-07 14:26:15 +01:00
Anton Ignatov
c6ab6da381 Fixed counter bug SCI-3005 2019-02-07 14:23:37 +01:00
Oleksii Kriuchykhin
3376fd012c Improve error loggin in protocol import [SCI-3023] 2019-02-07 14:00:24 +01:00
Anton Ignatov
4145b2565c Fixed bug with order in inventories SCI-3006 2019-02-07 11:34:04 +01:00
Oleksii Kriuchykhin
92b47a3034 Remove unneeded ordering [SCI-2967] 2019-02-07 11:23:40 +01:00
Oleksii Kriuchykhin
fdff69f22e Add comment for Tika start up code [SCI-2967] 2019-02-07 11:06:25 +01:00
mz3944
108d8474f1
Merge pull request #1481 from mz3944/mz-SCI-3003 
Experiment image is not updated after move of an experiment to another project [SCI-3003]
 2019-02-07 04:42:36 +01:00
Jure Grabnar
c5780927a8 Change a test to work with multiple tests run at the same time 2019-02-06 22:07:54 +01:00
Jure Grabnar
6ae82401f3 Add test experiment.json file 2019-02-06 21:06:56 +01:00
Jure Grabnar
0fa403d6b0 Refactor tests fro experiment import 
Closes [SCI-2946]
 2019-02-06 14:27:43 +01:00
Matej Zrimšek
f68adf1e5e Fix workflow image loading for moved experiments [SCI-3003] 2019-02-06 07:51:43 +01:00
Jure Grabnar
55fdd201b2 Add additional checks 2019-02-05 14:27:42 +01:00
Jure Grabnar
0a3146fbe6 Add checking of experiment basics 2019-02-05 14:27:42 +01:00
Jure Grabnar
e180d5e100 Add test skeleton for importing 2019-02-05 14:27:42 +01:00
Mojca Lorber
227aeb284c change mydemo projects data 2019-02-05 11:15:16 +01:00
Alex Kriuchykhin
7eb53d6408
Merge pull request #1478 from okriuchykhin/ok_SCI_2969 
Fix Lato font loading [SCI-2969]
 2019-02-04 17:21:49 +01:00