Commit graph

1905 commits

Author SHA1 Message Date
Anton Ignatov 7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
Anton Ignatov f832cfbbd4 Added tags 2019-11-18 13:59:54 +01:00
aignatov-bio b1f9e7f1ca Fix global activities jsonb field [SCI-3830] (#2030)
* Fix global activities jsonb field

* Fix tests
2019-11-18 13:59:54 +01:00
aignatov-bio 3eb6f5695b
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
2019-11-18 09:11:10 +01:00
aignatov-bio b9a34fa809 Fix placeholder for authors 2019-11-15 16:23:48 +01:00
aignatov-bio 19f5f9de67 Disable autocomplete for textarea field 2019-11-12 14:44:33 +01:00
aignatov-bio a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Mojca Lorber 16eddc0ad0 Save on click away, inline editing 2019-11-03 14:59:30 +01:00
Alex Kriuchykhin ec66ab8654
Merge pull request #2190 from mlorb/ml-sci-4023
Small improvements in the avatar settings [SCI-4023]
2019-10-30 16:02:24 +01:00
Mojca Lorber 7b86a3932a Additional avatar small fixes 2019-10-30 15:23:14 +01:00
aignatov-bio 717b70f75b
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties
Fix avatars in comments and activities [SCI-3995]
2019-10-29 14:11:39 +01:00
Mojca Lorber a0873cb16d Small improvements in the avatar settings 2019-10-29 13:21:22 +01:00
Alex Kriuchykhin 5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
2019-10-22 12:45:02 +02:00
aignatov-bio 9950a23188 Replace base64 avatars with url 2019-10-22 12:27:13 +02:00
Oleksii Kriuchykhin 53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
aignatov-bio 54627faeb3 Fix tests 2019-10-11 11:46:51 +02:00
aignatov-bio 521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
aignatov-bio 1f43f35073 First modal 2019-10-11 11:46:51 +02:00
mlorb 9e1339fb18
Merge pull request #2124 from aignatov-bio/ai-sci-3961-fix-image-in-archive-experiments
Fix image in archived experiments [SCI-3961]
2019-10-04 14:52:55 +02:00
aignatov-bio 23581059e7 Remove image 2019-10-04 14:50:27 +02:00
aignatov-bio c2c8343c57
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search
Fix MarvinJS representation in global search [SCI-3943]
2019-10-04 09:16:34 +02:00
Urban Rotnik 4b626ab2dd
Merge pull request #2103 from urbanrotnik/ur-sci-3936-permission-issue
Add permission check for button show [SCI-3936]
2019-10-02 09:51:53 +02:00
aignatov-bio 675d5eb088 Fix MarvinJS representation in global search 2019-10-01 14:20:20 +02:00
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Urban Rotnik 5812ebe4d5 Add permission check for button show
SCI-3936
2019-09-30 14:30:03 +02:00
Urban Rotnik dfafd4767c Fix Protocol buttons group
[SCI-3929]
2019-09-30 11:51:37 +02:00
Jure Grabnar b3cafcec7c Add restore draft notification to all models
Close SCI-3751
2019-09-30 11:34:39 +02:00
Jure Grabnar 6e33baa995 Add skeleton restore-draft notification for module description 2019-09-30 11:32:38 +02:00
Alex Kriuchykhin 53caaf647b
Merge pull request #2080 from okriuchykhin/ok_SCI_3891
Move file preview generation to delayed job [SCI-3891]
2019-09-27 10:50:21 +02:00
Anton Ignatov 93363da4e5 Fix preview for result 2019-09-26 16:49:56 +02:00
Anton Ignatov e01c438055 Fix padding for marvinjs modal 2019-09-24 11:02:15 +02:00
Oleksii Kriuchykhin aabeeec95a Move file preview generation to delayed job [SCI-3891] 2019-09-23 21:07:03 +02:00
aignatov-bio d783391290
Merge pull request #2071 from aignatov-bio/ai-sci-3889-fix-error-on-archived-experiment-page
Fix error on archived experiment page [SCI-3889]
2019-09-18 15:35:53 +02:00
Anton Ignatov 5a1efb84c6 Fix error on archived experiment page 2019-09-18 15:23:45 +02:00
aignatov-bio c652bb0d44
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button
Fix missing expand all button [SCI-3878]
2019-09-18 14:59:29 +02:00
Anton Ignatov 0adb016293 Fix missing expand all button 2019-09-18 12:33:48 +02:00
Anton Ignatov 68994a77c8 Fix file preview in inventory 2019-09-18 11:21:33 +02:00
Mojca Lorber 47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio c4e8e8ed07
Revert "Fix formulas in project export (#2047)" (#2049)
This reverts commit 36ae7d05f9.
2019-09-12 10:45:43 +02:00
aignatov-bio 36ae7d05f9
Fix formulas in project export (#2047) 2019-09-12 08:43:59 +02:00
aignatov-bio 07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00
aignatov-bio 40b5b2406b
Fix big inventory names (#2046) 2019-09-11 15:44:38 +02:00
aignatov-bio 27104a495c
Fix styling for unshared warning message (#2044) 2019-09-11 11:50:02 +02:00
mlorb e596afa595
Merge pull request #2041 from mlorb/ml-sci-3847
Fix missing icon on shared inventories in global search [SCI-3847]
2019-09-10 13:51:58 +02:00
aignatov-bio 1f12a63a25
Fix counter on task inventory and failing test (#2043) 2019-09-10 13:51:37 +02:00
Mojca Lorber e8f24b18e2 Fix missing icon on shared inventories in global search 2019-09-10 11:20:18 +02:00
Miha Mencin 33d495956e
Merge pull request #2040 from biosistemika/SCI3818-unshared-inventory-screen
adding missing file
2019-09-09 16:47:47 +02:00
Miha Mencin 01628e1efc adding missing file 2019-09-09 16:46:51 +02:00
Alex Kriuchykhin b8a5b1b542
Merge pull request #2036 from okriuchykhin/ok_SCI_3815
Improve behavior of inventory items export modal [SCI-3815]
2019-09-09 11:08:02 +02:00