Commit graph

2006 commits

Author SHA1 Message Date
Anton Ignatov
fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
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
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
aignatov-bio
66326d90e5
Fix shared icon show/hidden (#2014) 2019-08-26 11:24:22 +02:00
Miha Mencin
b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00
Miha Mencin
9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +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
Mojca Lorber
50c78f182c Add a team name to inventory item card 2019-08-23 11:13:58 +02:00
aignatov-bio
0810699770
Update shared inventory permissions [SCI-3802] (#2009)
* Update shared inventory permissions

* Fix tests and simplify condition for placeholder
2019-08-23 10:57:02 +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
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
Luka Murn
2db39c049e Remove projects archive page 2019-08-21 13:10:54 +02:00
aignatov-bio
f94b8165dc
Fix marvinjs edit button and icon (#1985) 2019-08-21 11:15:57 +02:00
aignatov-bio
0b85dcbead
Fix long inventory names (#1999) 2019-08-21 10:39:48 +02:00
aignatov-bio
e2ad383c69
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998)
* Fix ux for task inventory dropdown and big task title

* Fix markup
2019-08-21 10:39:37 +02:00
Anton Ignatov
a2c50cbe38 Add new permission check for share button 2019-08-20 15:08:53 +02:00
Mojca Lorber
530d09df64 add i-shared inventory icon 2019-08-19 15:43:55 +02:00
aignatov-bio
58d9be480f
Remove rename button from dropdown (#1994) 2019-08-19 14:29:38 +02:00
aignatov-bio
a505ef2462
Fix error in inventories for new teams [SCI-3788] (#1992)
* Fix error in inventories for new teams

* Replace with current team
2019-08-19 14:01:48 +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
Urban Rotnik
89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
Urban Rotnik
0ce331227c Update permission and model to share repository over all teams 2019-08-13 14:07:24 +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
aignatov-bio
aad726ac40
Update CSS for share modal (#1978) 2019-08-12 15:02:16 +02:00
Oleksii Kriuchykhin
c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Urban Rotnik
d04b0ccff1 Move '+ new inventory' link above list in sidebar 2019-08-09 14:15:51 +02:00
Urban Rotnik
7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +02:00
Urban Rotnik
23d7d117e9 Remove Repository's team from sharring list 2019-08-09 14:15:50 +02:00
Urban Rotnik
32783576c1 Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
2019-08-09 14:15:50 +02:00
Urban Rotnik
2648521924 Invite modal with form 2019-08-09 14:15:49 +02:00
Urban Rotnik
466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
Mojca Lorber
26bd81621f Add new icons also to the inventories list in navigation 2019-08-09 14:13:02 +02:00
Mojca Lorber
7d4941015f Update global search, so it will be able to search through shared inventories 2019-08-09 14:13:01 +02:00
Mojca Lorber
7e9be932f3 Make scope for repositories accessible by teams and simplify read permission 2019-08-09 14:13:00 +02:00
Mojca Lorber
15432ac851 Make changes to inventory list in navigation based on new mockup 2019-08-09 14:13:00 +02:00
Mojca Lorber
cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00
Urban Rotnik
077369d960 Update permissions for Repositories 2019-08-09 14:12:59 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
b4f632dba8 Remove dowload endpoint from assets controller [SCI-3680] 2019-08-07 15:21:41 +02:00
Oleksii Kriuchykhin
eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Urban Rotnik
50045b9796
Merge pull request #1956 from urbanrotnik/ur-sci-3733-add-button-new
Add additional NewStep button [SCI-3733]
2019-08-06 15:26:51 +02:00
Oleksii Kriuchykhin
423528933e Switch to global JS constants [SCI-3679] 2019-08-06 15:06:19 +02:00
Anton Ignatov
e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
Jure Grabnar
d9f6c249f9 Fix CVE-2015-9284 omniauth security precautions
Close SCI-3588
2019-07-31 16:59:38 +02:00
Jure Grabnar
6546bd1532 Add omniauth-rails_csrf_protection gem
Close SCI-3588
2019-07-31 16:05:06 +02:00
Jure Grabnar
971f52b4b0
RTE image in search does not have preview (#1952)
RTE image in search does not have preview
2019-07-30 07:44:54 +02:00
Anton Ignatov
a4b2825258 Fix tests for active storage 2019-07-26 15:58:51 +02:00
Urban Rotnik
7626d43ee4
Merge pull request #1947 from urbanrotnik/ur-sci-3707-archived-results-not-in-row
Fix for archived results in row [SCI-3707]
2019-07-26 13:03:34 +02:00
Oleksii Kriuchykhin
ccf76b8531 Move repository_datatable to JS file [SCI-3679] 2019-07-26 13:00:25 +02:00
Urban Rotnik
88fbd6c0af Fix for archived results in row 2019-07-26 11:16:53 +02:00
Urban Rotnik
aa36d93bea Add additional NewStep button 2019-07-26 11:01:36 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Jure Grabnar
d3a5651998 Add remaining missing description in global search
Close SCI-3723
2019-07-25 14:27:53 +02:00
Jure Grabnar
11b3b7b4e9 Fix search description for step 2019-07-25 14:15:45 +02:00
Jure Grabnar
5847a8b05c Convert HOT table after it was initialized
Closes SCI-3704
2019-07-23 14:17:22 +02:00
Anton Ignatov
1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
aignatov-bio
a8623002e6
Small UI changes [SCI-3699] (#1935)
* Small ui changes

* Markup fix

* Add class for addons
2019-07-15 13:28:20 +02:00
aignatov-bio
3c32fe0895
Fix formulas in table report (#1934) 2019-07-15 13:27:27 +02:00
Urban Rotnik
5cf100a787 Show 'published_on' instead of 'created_on' on external_protocols list 2019-07-12 16:56:07 +02:00
mlorb
5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
2019-07-12 15:52:40 +02:00
Anton Ignatov
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov
7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
Mojca Lorber
d07e04e511 Fix dooble flash_alerts load 2019-07-12 14:33:41 +02:00
aignatov-bio
4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899)
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
2019-07-12 13:48:14 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
aignatov-bio
26ef970a1e
Add academy button (#1924) 2019-07-12 11:15:34 +02:00
Mojca Lorber
f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
aignatov-bio
ac7970209c
Add helper for inline JS code (#1916) 2019-07-11 09:31:30 +02:00
Oleksii Kriuchykhin
64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
aignatov-bio
7ac410e573
Fix visual bugs across ProtocolIo [SCI-3671] (#1914)
* Fix visual bugs across ProtocolIo
2019-07-10 13:00:32 +02:00
mlorb
23270393b0
Merge branch 'master' into ml-sci-3634 2019-07-09 14:38:00 +02:00
Mojca Lorber
7bb82e2fc2 Fix eternal protocols tab visuals 2019-07-09 14:35:40 +02:00
aignatov-bio
1a75a31647
Remove webinar button [SCI-3664] (#1906)
* Remove webinar button

* Remove constants and i18n
2019-07-09 14:01:09 +02:00
aignatov-bio
fc78d8f401
Fix tooltip position (#1909) 2019-07-09 14:00:53 +02:00
Urban Rotnik
be77746aef Fix description styling of components 2019-07-09 13:41:51 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
aignatov-bio
4fe3119bd2
Fix step description RTE images in report preview (#1888) 2019-07-08 15:23:44 +02:00
aignatov-bio
01a01157d3
Replace Handson table in reports with simple table [SCI-3636] (#1895)
* Replace handsone table in reports with simple table

* Add result tables
2019-07-08 13:19:12 +02:00
Jure Grabnar
ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646
[SCI-3646] Add paging functionality to external protocols
2019-07-08 13:06:19 +02:00
aignatov-bio
2baca019eb
Remove tooltip from step edit button (#1905) 2019-07-08 12:52:03 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Mojca Lorber
989c10872c Fixes visual bugs on protocols.io and home page 2019-07-04 18:22:51 +02:00
Jure Grabnar
dc7fee51fa Add Show more protocols functionality to external protocols
Closes SCI-3646
2019-07-04 15:35:18 +02:00
Jure Grabnar
4c3df5a67d Change tabs to spaces 2019-07-04 09:43:05 +02:00
Oleksii Kriuchykhin
c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration (#1893)
Features/protocolsio integration
2019-07-03 17:32:20 +02:00
Jure Grabnar
721bb9ab77
SCI-3649 All reagent data from step are not imported (#1881)
SCI-3649 All reagent data from step are not imported
2019-07-03 16:54:25 +02:00