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

1555 commits

Author SHA1 Message Date
Urban Rotnik c296760be8
Merge pull request #2125 from urbanrotnik/ur-sci-3962-step-is-not-saved-after-removing-file 
Add team_id when asset is creating [SCI-3962]
 2019-10-04 14:46:18 +02:00
Alex Kriuchykhin 076d61d4d0
Merge pull request #2116 from okriuchykhin/ok_SCI_3908 
Remove Paperclip from the codebase [SCI-3908]
 2019-10-04 14:45:42 +02:00
Urban Rotnik 8f0c3bd2ce Add team_id when asset is creating 2019-10-04 14:24:19 +02:00
Oleksii Kriuchykhin 9d2ac4179e Fix failing tests [SCI-3908] 2019-10-04 13:02:18 +02:00
Urban Rotnik 09e6545f30
Merge pull request #2115 from urbanrotnik/ur-sci-3947-local-storage 
Fix for disk storage [SCI-3947]
 2019-10-03 16:28:09 +02:00
aignatov-bio a31c5ea1f5 Fix marvin JS preview 2019-10-03 11:54:26 +02:00
Urban Rotnik 9c88327a16 Rename ActiveStorage base controller 2019-10-03 11:00:59 +02:00
Urban Rotnik e2a779ccfe Activestorage fix for disk storage 
[SCI-3947]
 2019-10-02 14:01:38 +02:00
Oleksii Kriuchykhin dd7f2fe095 Fix large preview for documents [SCI-3938] 2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin 584f2d07c0 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-01 13:06:01 +02:00
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +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
Oleksii Kriuchykhin aabeeec95a Move file preview generation to delayed job [SCI-3891] 2019-09-23 21:07:03 +02:00
Anton Ignatov 09e3b7c80b Fix repository row import/export 2019-09-23 13:33:02 +02:00
Jure Grabnar 8780e5183b Remove CSRF check in WopiController 2019-09-19 15:55:29 +02:00
Jure Grabnar cc561d8ee5 Change wopi_controller using Paperclip for reading 2019-09-19 15:03:13 +02:00
aignatov-bio 11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +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
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
mlorb cf8c98dfa3
Merge pull request #2042 from biosistemika/hotfix-september 
Hotfix september
 2019-09-10 13:53:28 +02:00
Mojca Lorber e8f24b18e2 Fix missing icon on shared inventories in global search 2019-09-10 11:20:18 +02:00
Oleksii Kriuchykhin 265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin d522b3807a codestyle improvements 2019-09-06 14:59:30 +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
Mojca Lorber a312c0c4b8 fix bug on api endpoint when creating result 2019-09-04 13:41:06 +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 d3ccdbd83e
Create copy permission (#2017) 2019-08-29 13:39:22 +02:00
aignatov-bio 96e132c62e
Hide share button for users with one team (#2005) 2019-08-23 11:29:03 +02:00
aignatov-bio 5515bac773
Add assigned items from shared inventories to report (#2002) 2019-08-23 11:28:09 +02:00
Luka Murn 5d3a0d7eea
Merge pull request #2003 from Ducz0r/lm-remove-legacy-projects-views 
Remove legacy projects archive HTML views
 2019-08-21 17:08:27 +02:00
Luka Murn 701bdbd294 Remove archive controller action 2019-08-21 16:01:12 +02:00
aignatov-bio d70b7e2272
Make share status icon dynamic (#2007) 2019-08-21 15:32:57 +02:00
aignatov-bio 5e3f1d59f5
Fix inventory rows import (#1997) 2019-08-21 15:32:45 +02:00
Oleksii Kriuchykhin 3918c893db Fix new office file creation [SCI-3778] 2019-08-21 13:26:11 +02:00
Luka Murn 084cdcdd6b Remove old archive endpoint, controller logic 2019-08-21 13:17:19 +02:00
Anton Ignatov ed8ef7aa8f Fix permission check; 2019-08-20 16:07:22 +02:00
Luka Murn ebda2c832a
Merge pull request #1995 from biosistemika/release-1.16.8 
Merge release-1.16.8 into master
 2019-08-19 15:08:33 +02:00
aignatov-bio b6661682ad
Fix shared inventory in task dropdown (#1993) 2019-08-19 13:56:02 +02:00
aignatov-bio 2cf7f52f15
Add inline editing for inventories [SCI-3763] (#1991) 
* Add inline editing for inventories

* Remove old locals

* Markup fix
 2019-08-19 13:30:56 +02:00
aignatov-bio d741e52427
Fix global search for inventories (#1988) 2019-08-19 09:23:59 +02:00
Anton Ignatov d1e1da8580 Fix permission check for invite users 2019-08-14 14:47:02 +02:00
Urban Rotnik 89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
Alex Kriuchykhin 960e69eaa8 Fix wopi file download URL [SCI-3757] (#1975) 2019-08-14 09:06:00 +02:00
aignatov-bio 737f9e572c
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) 
* Replace marvinJS logo and fix some merge issues

* Fix tests
 2019-08-13 11:04:19 +02:00
Urban Rotnik dc4751e49a Update scope 'accessible_by_teams' and fix load_vars method in controllers 2019-08-12 10:55:30 +02:00
Oleksii Kriuchykhin 32054c5516 Handle situation for assets without blob in list sorting [SCI-3757] 2019-08-09 15:17:19 +02:00