scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
5130 commits 70 branches 179 tags 165 MiB
Commit graph

5130 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oleksii Kriuchykhin 13c4bd25af Optionally disable Tika background mode through env variable [SCI-2967] 2019-02-04 16:47:29 +01:00
Oleksii Kriuchykhin a033e9b207 Fix Lato font loading [SCI-2969] 2019-02-04 15:36:17 +01:00
Miha Mencin 688406cb2f
correct headings 2019-02-04 15:07:40 +01:00
Oleksii Kriuchykhin 79c7bbbfb0 Fix failing tests with local file storage [SCI-2944] 2019-02-04 13:50:38 +01:00
Oleksii Kriuchykhin 19f1585352 Add test for templates service [SCI-2944] 2019-02-01 18:06:36 +01:00
Miha Mencin 3538e74b03
Merge pull request #1472 from biosistemika/mm-sci-2953-system-notifications-data-migration 
System Notifications - Migration of existing data
 2019-02-01 14:02:00 +01:00
Miha Mencin e2b94fa8a7 added last changed at to system notification 2019-02-01 12:44:45 +01:00
Miha Mencin 1ca225bc5d added copy and delete tasks, remove obsolete new_system task 2019-02-01 10:02:47 +01:00
Urban Rotnik 3e4cf7ae3c Merge branch 'ur-SCI-2952-SN-data-model-changes' into features/system-notifications 2019-02-01 09:55:12 +01:00
Miha Mencin e84ab5b550
Merge pull request #1475 from biosistemika/mm-sci-2982-user-variables-bug 
SciNoteSCI-2982 Investigate (plus, fix) the User.variables on my.scinote.net
 2019-02-01 09:46:19 +01:00
mz3944 a315808d58
Merge pull request #1473 from mz3944/mz-SCI-2918 
In html project export there is formula instead of result in table [SCI-2918]
 2019-02-01 04:49:14 +01:00
Urban Rotnik 8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Miha Mencin d2dfe68e46
Changing double quotes to single quotes 2019-01-31 10:31:03 +01:00
Miha Mencin 3ec62758fe SCI-2982, handle the empty json condition 2019-01-31 09:43:41 +01:00
Matej Zrimšek ac78c7d21b Process Handsontable formulas in project HTML files in team export [SCI-2918] 2019-01-31 07:39:17 +01:00
Urban Rotnik 293eef01c1 Merge branch 'ur-SCI-2925-copy-experiment-refactor' 2019-01-31 07:23:06 +01:00
Urban Rotnik 6f7fcb0831 Refactor method clone_experiment_as_template into service object 
[SCI-2925]
 2019-01-31 07:13:40 +01:00
mz3944 2ae56eb13f
Merge pull request #1448 from mz3944/mz-SCI-2929 
Can not switch team [SCI-2929]
 2019-01-31 04:43:39 +01:00
Alex Kriuchykhin 1bd6d2a032
Merge pull request #1464 from okriuchykhin/ok_SCI_2939 
Add templates business logic [SCI-2939]
 2019-01-30 11:21:42 +01:00
Oleksii Kriuchykhin cc57a8d4ef Fix template project name generation [SCI-2939] 2019-01-30 10:56:22 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik 863e3873c2 Comment for depricated NotificationType 2019-01-29 11:40:26 +01:00
Urban Rotnik 3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Luka Murn 1f7bca485a
Merge pull request #1471 from biosistemika/master 
Merge master into features/templates
 2019-01-29 10:14:09 +01:00
Miha Mencin 0767d8308a
Merge pull request #1469 from biosistemika/pull-request-template-file 
Pull request template file
 2019-01-29 09:09:08 +01:00
Miha Mencin 22dcfa6195
changed titles to h3 2019-01-29 09:08:52 +01:00