scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 03:35:25 +08:00
Code Issues Projects Releases Packages Wiki Activity
6498 commits 39 branches 184 tags 168 MiB
Commit graph

1894 commits

Author SHA1 Message Date
Mojca Lorber
7b86a3932a Additional avatar small fixes 2019-10-30 15:23:14 +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
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
aignatov-bio
fdce4e6c7c
Remove link to archived project page (#2037) 2019-09-09 10:43:08 +02:00
Oleksii Kriuchykhin
265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin
7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Miha Mencin
2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
mlorb
ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
aignatov-bio
d209b3abcd
Update share modal window [SCI-3812] (#2018) 
* Update share modal window

* Fix markup
 2019-08-29 13:45:27 +02:00
aignatov-bio
d3ccdbd83e
Create copy permission (#2017) 2019-08-29 13:39:22 +02:00
aignatov-bio
4d20cd7d55
Fix copy inventory permission (#2016) 2019-08-26 14:48:38 +02:00
Miha Mencin
0058198bb5
Merge branch 'master' into SCI-3806-shared-status-dropdown 2019-08-26 11:55:25 +02:00
mlorb
ffe06d5070
Merge pull request #2010 from mlorb/ml-sci-3805 
Add a team name to inventory item card [SCI-3805]
 2019-08-26 11:29:12 +02:00