aignatov-bio
993424d08e
Merge pull request #2226 from aignatov-bio/ai-sci-4086-fix-team-name-after-update
...
Fix name update and path to team [SCI-4086]
2019-11-25 13:55:09 +01:00
aignatov-bio
179dea085f
Fix dropdown event after click browser back action
2019-11-25 11:28:11 +01:00
aignatov-bio
e99fe2dbda
Update css for global activties page
2019-11-25 11:09:37 +01:00
aignatov-bio
fae8b252a6
Fix markup
2019-11-24 21:11:32 +01:00
aignatov-bio
e76b4ca26f
Fix permission check and due date clear
2019-11-24 21:06:34 +01:00
aignatov-bio
7fa753ca81
Fix name update and path to team
2019-11-23 23:20:38 +01:00
aignatov-bio
84a9d764e0
Add arrows controll for dropdown
2019-11-23 21:09:34 +01:00
aignatov-bio
96523ae131
Update CSS for team preferences and enable autosave
2019-11-22 10:46:44 +01:00
aignatov-bio
c712e4e48c
Fix due date moda
2019-11-21 13:05:36 +01:00
aignatov-bio
0b04ca4012
Fix markup
2019-11-21 12:19:47 +01:00
aignatov-bio
f2ed3198d5
Add due date autosave field
2019-11-21 12:14:43 +01:00
aignatov-bio
56ae32323c
Add autosave for protocol keywords and user preferences
2019-11-20 14:57:53 +01:00
Oleksii Kriuchykhin
244c003137
Prettify template JSON files [SCI-3988]
2019-11-18 14:26:38 +01:00
Oleksii Kriuchykhin
b2862b6c9e
Remove Paperclip DB columns and fix experiment templates [SCI-3988]
2019-11-18 14:16:28 +01:00
aignatov-bio
32d99f676c
Fix markup
2019-11-18 13:59:55 +01:00
aignatov-bio
264493a322
Finish removing Select2 library
2019-11-18 13:59:55 +01:00
aignatov-bio
e7ad7ae969
New tags drop down
2019-11-18 13:59:55 +01:00
aignatov-bio
5964a1b1f4
Fix shadows
2019-11-18 13:59:54 +01:00
Anton Ignatov
0ed3d84407
Fix styling
2019-11-18 13:59:54 +01:00
Anton Ignatov
b1c32d9a30
Improve dropdown and side panel
2019-11-18 13:59:54 +01:00
Anton Ignatov
163a17d6d9
Fix tablet view
2019-11-18 13:59:54 +01:00
Anton Ignatov
5b8e1fedf1
Fix markup
2019-11-18 13:59:54 +01:00
Anton Ignatov
7117b767f4
Fix commnets to PR
2019-11-18 13:59:54 +01:00
Anton Ignatov
17e457c686
Finished global activities refactoring
2019-11-18 13:59:54 +01:00
Anton Ignatov
fc70ce24f8
Refactor side filters for global activities
2019-11-18 13:59:54 +01:00
Anton Ignatov
4e517ca6c4
Fix eslint for main file
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
Anton Ignatov
04bd5269ec
Created new dropdown selector
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
a5666cacc5
Fix markup
2019-11-15 16:28:08 +01:00
aignatov-bio
b9a34fa809
Fix placeholder for authors
2019-11-15 16:23:48 +01:00
aignatov-bio
d88d479854
Merge pull request #2175 from aignatov-bio/ai-sci-4007-error-at-click-to-share-button
...
Add check for existing elements for shared repository modal [SCI-4007]
2019-11-15 14:32:46 +01:00
aignatov-bio
a356c290ea
Fix markup
2019-11-12 11:32:43 +01:00
aignatov-bio
4a8eb041cb
Fix markup
2019-11-12 11:31:26 +01:00
aignatov-bio
a9690482d1
Add autosave feature to text fields
2019-11-12 11:26:18 +01:00
Urban Rotnik
1d180f3688
Fix for step description overwriting
...
[SCI-4067]
2019-11-11 10:31:55 +01:00
aignatov-bio
cf2687f7e5
Merge branch 'ml-sci-4004' of https://github.com/mlorb/scinote-web into mlorb-ml-sci-4004
2019-11-07 13:03:02 +01:00
Alex Kriuchykhin
95686a9275
Merge pull request #2197 from okriuchykhin/ok_SCI_4053
...
Fix TinyMCE image URLs in the editor [SCI-4053]
2019-11-05 13:46:48 +01:00
Oleksii Kriuchykhin
67fdda1eeb
Fix TinyMCE image URLs in the editor [SCI-4053]
2019-11-05 13:38:47 +01:00
aignatov-bio
ae0db3a7bc
Update avatars and small CSS fixes
2019-11-05 10:43:02 +01:00
Mojca Lorber
16eddc0ad0
Save on click away, inline editing
2019-11-03 14:59:30 +01:00
Mojca Lorber
a3ded83292
Small css change
2019-10-30 15:42:11 +01:00
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
ba3a5e5460
Merge pull request #2159 from mlorb/ml-sci-3816-v2
...
Fix reloading of datatables header again [SCI-3816]
2019-10-29 10:33:04 +01:00
Urban Rotnik
169a381629
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download
...
Fix for downloading image [SCI-4008]
2019-10-22 15:12:11 +02: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
4d3e318174
Add check for existing elements
2019-10-22 10:46:16 +02:00
Urban Rotnik
ce9f1b1309
Add mceToken check
2019-10-22 08:28:35 +02:00
Oleksii Kriuchykhin
4cba412e31
Fix protocols table select all checkbox [SCI-3999]
2019-10-17 17:05:01 +02:00
Mojca Lorber
b78211e3ca
Fix reloading of datatables header again
2019-10-16 13:02:41 +02:00
aignatov-bio
198697ff23
Fix avatar localization
2019-10-11 12:22:09 +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
aignatov-bio
a930f7affd
Fix async assets results
2019-10-08 19:51:03 +02:00
mlorb
ba8ee86c9f
Merge pull request #2128 from mlorb/ml-sci-3966
...
Fix position of shared inventory icon [SCI-3966]
2019-10-04 15:21:48 +02:00
aignatov-bio
002686ba23
Merge pull request #2127 from aignatov-bio/ai-sci-3965-fix-complete-button-position
...
Fix complete button position [SCI-3965]
2019-10-04 15:19:27 +02:00
Mojca Lorber
564321d327
Fix position of shared inventory icon
2019-10-04 15:18:17 +02:00
aignatov-bio
b460cd4384
Fix complete button position
2019-10-04 15:17:28 +02:00
Urban Rotnik
bd1c5e4454
Fix focus for RTE
2019-10-04 14:55:14 +02:00
aignatov-bio
8176ce3a9d
Merge pull request #2123 from aignatov-bio/ai-sci-fix-merge-for-repository-datatable
...
Fix merge for repository datatable [SCI-3957]
2019-10-04 12:59:22 +02:00
aignatov-bio
fcc1829660
Fix merge for repository datatable
2019-10-04 10:51:13 +02:00
aignatov-bio
a39a95d2a7
Merge pull request #2122 from aignatov-bio/ai-sci-disable-autosave-feature
...
Disable autosave notification feature
2019-10-04 09:17:16 +02:00
aignatov-bio
9e7eff9615
Merge pull request #2120 from aignatov-bio/ai-sci-3946-remove-image-icon-from-preview
...
Remove image icon from preview [SCI-3946]
2019-10-04 09:16:47 +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
aignatov-bio
af69e12d1e
Disable autosave notification feature
2019-10-04 09:13:42 +02:00
aignatov-bio
0cbc699c62
Remove image icon from preview
2019-10-03 15:44:03 +02:00
aignatov-bio
e35617208d
Merge pull request #2118 from aignatov-bio/ai-sci-3841-enable-additional-tools
...
Enable additional tools [SCI-3841]
2019-10-03 11:24:31 +02:00
aignatov-bio
65b1e0c041
Fix reload page
2019-10-03 11:19:12 +02:00
aignatov-bio
9000438025
Enable additional tools
2019-10-03 11:07:19 +02:00
aignatov-bio
301b37cccd
Fix duplicate code in file preview
2019-10-03 10:55:54 +02:00
Oleksii Kriuchykhin
dd7f2fe095
Fix large preview for documents [SCI-3938]
2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin
6a6a43f5ff
Improve file processing indicator [SCI-3938]
2019-10-01 15:20:46 +02:00
aignatov-bio
675d5eb088
Fix MarvinJS representation in global search
2019-10-01 14:20:20 +02:00
aignatov-bio
b8e917455a
Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel
...
Update MarvinJS asset on result text cancel [SCI-3907]
2019-10-01 13:39:01 +02:00
Anton Ignatov
33497d11a3
Merge branch 'activestorage_migration'
2019-10-01 10:36:05 +02:00
Anton Ignatov
859c5931a4
Update MArvinJS asset on result text cancel
2019-09-30 16:09:43 +02:00
Jure Grabnar
9f704559ef
Fix hound formatting issues
2019-09-30 14:42:15 +02:00
Jure Grabnar
096228abbb
Shorten padding format in scss
2019-09-30 14:32:09 +02:00
Jure Grabnar
070c307721
Implement style changes suggested by Anton
2019-09-30 14:27:00 +02:00
Urban Rotnik
9397705033
Fix positions of CoSign and Unlock buttons
2019-09-30 13:39:23 +02:00
Urban Rotnik
b13c429d26
SystemNotifications count position fixed
2019-09-30 13:12:35 +02:00
Urban Rotnik
dfafd4767c
Fix Protocol buttons group
...
[SCI-3929]
2019-09-30 11:51:37 +02:00
Jure Grabnar
8441c5b6ed
Add anchor to result text editing
2019-09-30 11:34:39 +02:00
Jure Grabnar
477e41a96d
Refactor I18n strings for tiny_mce
2019-09-30 11:34:39 +02:00
Jure Grabnar
289853e2e8
Do not remove draft on step cancel (temporary)
...
Close SCI-3751
2019-09-30 11:34:39 +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
0a36372321
Fix placeholder positioning
2019-09-30 11:34:39 +02:00
Jure Grabnar
b286e4adfd
Fix styles for notification bar
2019-09-30 11:34:39 +02:00
Jure Grabnar
4f2182e2f5
Remove restoredraft icon
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
mlorb
594124dad6
Merge pull request #2053 from mlorb/ml-sci-3637
...
Redesign of sorting button for projects/experiments cards [SCI-3637]
2019-09-27 12:44:44 +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
mlorb
2fd9345616
Merge pull request #2068 from mlorb/ml-sci-3816
...
Fix reloading of datatables header [SCI-3816]
2019-09-27 10:29:32 +02:00
Jure Grabnar
0c24210f6a
[SCI-3784] Small RTF improvements ( #2061 )
...
[SCI-3784] Small RTF improvements
2019-09-27 10:27:57 +02:00
mlorb
e3b0e149b6
Merge pull request #2077 from mlorb/ml-sci-3764
...
Expand clickable area of links in secondary navigation [SCI-3764]
2019-09-27 10:15:12 +02:00
mlorb
495d57b607
Merge pull request #2078 from mlorb/ml-sci-3906
...
Fix bug with inventory navigation height [SCI-3906]
2019-09-27 10:14:25 +02:00
mlorb
246634dbc4
Merge pull request #2069 from mlorb/ml-sci-3796
...
Fix inventory item selection when previewing file [SCI-3796]
2019-09-27 10:13:35 +02:00
Anton Ignatov
d048b7fb56
Fix cancel button for marvinJS images
2019-09-26 11:25:34 +02:00
aignatov-bio
ba50b19986
Merge pull request #2082 from aignatov-bio/ai-sci-3907-fix-dirty-event-after-update-marvinjs-image
...
Fix dirty event after update marvinjs image [SCI-3907]
2019-09-25 13:51:36 +02:00
aignatov-bio
429de4f115
Merge pull request #2083 from aignatov-bio/ai-sci-3904-fix-padding-for-marvinjs-promo-modal
...
Fix padding for marvinjs modal [SCI-3904]
2019-09-24 14:26:18 +02:00
aignatov-bio
8a3b6b5cda
Merge pull request #2076 from aignatov-bio/ai-sci3769-fix-repository-row-import-export
...
Fix repository row import/export [SCI-3769]
2019-09-24 12:44:18 +02:00
Jure Grabnar
ae83ef749f
Add tables functionality in tinymce
...
Close SCI-3821
2019-09-24 12:44:00 +02:00
Anton Ignatov
e01c438055
Fix padding for marvinjs modal
2019-09-24 11:02:15 +02:00
Anton Ignatov
6d81727bf1
Fix dirty event after update marvinjs image
2019-09-24 10:37:51 +02:00
Anton Ignatov
c389972e2a
Fix JS error in recent protocol drop down
2019-09-24 09:47:04 +02:00
Oleksii Kriuchykhin
aabeeec95a
Move file preview generation to delayed job [SCI-3891]
2019-09-23 21:07:03 +02:00
Mojca Lorber
a85c80d994
Fix bug with inventory navigation height
2019-09-23 16:12:41 +02:00
Mojca Lorber
9f30e05594
Expand clickable area of links in secondary navigation
2019-09-23 14:34:48 +02:00
Anton Ignatov
09e3b7c80b
Fix repository row import/export
2019-09-23 13:33:02 +02:00
Mojca Lorber
4263edf0cc
Fix inventory item selection when previewing file
2019-09-18 15:08:40 +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
aignatov-bio
ce91759ee2
Merge pull request #2065 from aignatov-bio/ai-sci-3879-fix-step-table-error
...
Fix step table error [SCI-3879]
2019-09-18 14:59:16 +02:00
Mojca Lorber
4d4a275c0d
Fix reloading of datatables header
2019-09-18 14:28:29 +02:00
Anton Ignatov
0adb016293
Fix missing expand all button
2019-09-18 12:33:48 +02:00
Anton Ignatov
146c725e89
Fix step table error
2019-09-18 11:47:33 +02:00
aignatov-bio
d028856fe0
Fix hidden buttons in inventory ( #2063 )
2019-09-18 11:36:30 +02:00
aignatov-bio
11f6517d0a
Fix duplicate marvinjs save ( #2057 )
2019-09-18 11:18:44 +02:00
aignatov-bio
52499fa285
Fix pathe to icon for chemical structure ( #2056 )
2019-09-18 11:18:31 +02:00
Jure Grabnar
40aa1a37a2
Change colors of active buttons TinyMCE
...
Close SCI-3784
2019-09-17 15:45:27 +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
40b5b2406b
Fix big inventory names ( #2046 )
2019-09-11 15:44:38 +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
16ae00782a
Fix new step button on empty task [SCI-3826] ( #2026 )
...
* Fix new step button on empty task
* Fix markup
2019-09-09 10:43:38 +02:00
Oleksii Kriuchykhin
265047caf3
Improve behaviour of inventory items export modal [SCI-3815]
2019-09-09 10:38:47 +02:00
Miha Mencin
12d6804263
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen
...
SCI-3818-unshared-inventory-screen
2019-09-09 09:30:34 +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
aignatov-bio
15dc25cee9
Fix handson table initialization [SCI-3749] ( #2021 )
...
* Fix handson table initialization
* Fix markup
2019-09-05 08:35:28 +02:00
aignatov-bio
b8e68e02a1
Fix error, when cancel tag editing ( #2025 )
2019-09-05 08:34:33 +02:00
aignatov-bio
481be7b92e
Fix padding to share modal ( #2024 )
2019-09-03 12:06:16 +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
aignatov-bio
d209b3abcd
Update share modal window [SCI-3812] ( #2018 )
...
* Update share modal window
* Fix markup
2019-08-29 13:45:27 +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
aignatov-bio
b3e3c443f0
Fix big gap in title of navbar ( #2015 )
2019-08-26 11:20:03 +02:00
Miha Mencin
9e9e698778
SCI-3806 Add an icon indicating shared status to dropdown
2019-08-26 09:14:37 +02:00
Mojca Lorber
50c78f182c
Add a team name to inventory item card
2019-08-23 11:13:58 +02:00
aignatov-bio
d70b7e2272
Make share status icon dynamic ( #2007 )
2019-08-21 15:32:57 +02:00
aignatov-bio
f94b8165dc
Fix marvinjs edit button and icon ( #1985 )
2019-08-21 11:15:57 +02:00
aignatov-bio
e682a3e5d9
Fix steps description and table saving ( #1984 )
2019-08-21 11:05:49 +02:00
aignatov-bio
4730e7bfee
Change notification counter position ( #2000 )
2019-08-21 10:39:56 +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
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
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
d4aedbb35f
Small ux changes for inventories ( #1989 )
2019-08-19 09:24:10 +02:00
Miha Mencin
5adb745743
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons
...
Fix assign/unassign buttons [SCI-3785]
2019-08-19 08:51:14 +02:00
Anton Ignatov
ec57e0aa91
Fix assign/unassign buttons
2019-08-16 10:05:01 +02:00
Urban Rotnik
89f289660b
Add share_with_all feature to service, add new activities
2019-08-14 11:03:15 +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
Urban Rotnik
61af9e21ad
Fix datatable filter position
2019-08-09 14:22:24 +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
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
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
aignatov-bio
6e5f078dea
Add activities for marvinJS [SCI-3630] ( #1950 )
...
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
2019-08-09 09:47:07 +02:00
aignatov-bio
b57e79a557
Fix tables ( #1963 )
2019-08-09 09:41:32 +02:00
Oleksii Kriuchykhin
a5d47e75c5
Remove duplicated protocols.js.erb file [SCI-3678]
2019-08-08 14:33:07 +02:00
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
d942788581
Implement read permissions checks for ActiveStorage controllers [SCI-3680]
2019-08-07 15:21:41 +02:00
aignatov-bio
aa5061a1af
Add custom context menu to TinyMCE images [SCI-3582] ( #1944 )
...
* Add custom context menu to TinyMCE images
* Fix permission check for unsaved objects
* Fix markup
2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin
f3849e2ece
Fix TinyMCE plugings config [SCI-3679]
2019-08-06 15:46:55 +02:00
Oleksii Kriuchykhin
eaf9d59819
Merge branch 'activestorage_migration' into ok_SCI_3679
2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin
423528933e
Switch to global JS constants [SCI-3679]
2019-08-06 15:06:19 +02:00
Jure Grabnar
d9ce3e5e8e
[SCI-3674] Remove width on comments ( #1954 )
...
[SCI-3674] Remove width on comments
2019-08-05 13:14:03 +02:00
Jure Grabnar
b12403b769
Add comment name fix as Urban suggested
2019-07-31 09:23:22 +02:00
Jure Grabnar
dbebde3370
Merge pull request #1953 from jbargu/jg_sci_3673
...
Revalidate internal dimension when dragging
2019-07-30 07:44:36 +02:00
Oleksii Kriuchykhin
ccf76b8531
Move repository_datatable to JS file [SCI-3679]
2019-07-26 13:00:25 +02:00
Urban Rotnik
4699ba718a
Fix showing errors
2019-07-26 11:32:51 +02:00
Oleksii Kriuchykhin
5e65b07bdc
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
2019-07-25 18:00:24 +02:00
Jure Grabnar
39fbd18316
Remove width on commments
...
Closes SCI-3674
2019-07-25 16:46:27 +02:00
Jure Grabnar
a579328614
Revalidate internal dimension when dragging
...
Close SCI-3673
2019-07-25 16:37:15 +02:00
Jure Grabnar
f44404a1f8
Merge pull request #1946 from jbargu/jg_sci_3704
...
Fix Handsontable error when generation report
2019-07-25 11:28:46 +02:00
Jure Grabnar
06657dbdf6
Add spinner when editing image annotation ( #1948 )
...
Add spinner when editing image annotation
2019-07-25 11:28:13 +02:00
Urban Rotnik
1b9db2f61e
Fix for file annotating on Safari
2019-07-24 14:16:29 +02:00
Jure Grabnar
cdad167be2
Add spinner when editing image annotation
...
Close SCI-3710
2019-07-23 15:02:33 +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
3b7f715e0b
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-22 13:09:17 +02:00
aignatov-bio
4fe0227d8c
Add metadata for .eln assets ( #1942 )
2019-07-19 10:53:33 +02:00
Anton Ignatov
ad7130d3b2
Simplify TinyMCE assets for MarvinJS
2019-07-19 09:27:03 +02:00
Anton Ignatov
d79fec3345
Move TinyMCE logic to correspond controller
2019-07-16 15:51:44 +02:00
Anton Ignatov
03a45d7dd8
Fix markup
2019-07-16 13:42:39 +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
Jure Grabnar
eb615ea8dd
[SCI-3670] Show protocols at external protocols tab ( #1933 )
...
[SCI-3670] Show protocols at external protocols tab
2019-07-15 11:24:01 +02:00
aignatov-bio
894e201e1b
Fix big file issue in step attachments [SCI-3682] ( #1919 )
...
* Fix big file issue in step atachments
* Fix markup
2019-07-15 11:00:01 +02:00
Jure Grabnar
d210b0b152
Trigger loading of latest publications when page is loaded
...
Closes SCI-3670
2019-07-15 08:52:17 +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
ba1d6d45ca
Fix merging issues
2019-07-12 15:47:15 +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
Anton Ignatov
57a273d5d0
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-12 11:34:41 +02:00
aignatov-bio
c6152ccddb
Fix big table issue in ProtocolIo preview ( #1927 )
2019-07-12 11:17:51 +02:00
aignatov-bio
d8d04b89cd
Fix autosave issue in mozzila ( #1925 )
2019-07-12 11:15:45 +02:00
aignatov-bio
26ef970a1e
Add academy button ( #1924 )
2019-07-12 11:15:34 +02:00
aignatov-bio
70589126c3
Fix autosave for steps ( #1926 )
2019-07-12 10:16:49 +02:00
Urban Rotnik
d5fbe5ecd7
Fix for safari on external protocols tab
2019-07-11 11:53:49 +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
Jure Grabnar
5eb197127f
Fix relative links in protocolsio iframe
...
Closes SCI-3660
2019-07-10 19:20:40 +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
fc78d8f401
Fix tooltip position ( #1909 )
2019-07-09 14:00:53 +02:00
Oleksii Kriuchykhin
a1941a21dc
Futher refactoring of old Paperclip methods [SCI-3539]
2019-07-09 10:28:15 +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
bdd1ca2a65
Merge pull request #1908 from jbargu/jg_sci_3587
...
[SCI-3587] Endless spinner at file preview
2019-07-08 13:06:39 +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
81aef81634
Fix scrol jump when select activtiies in global activities ( #1907 )
2019-07-08 12:55:35 +02:00
aignatov-bio
6d423ed986
Make Navbar icons bigger [SCI-3663] ( #1900 )
...
* Make Navbar icons bigger
2019-07-08 12:53:43 +02:00
aignatov-bio
99b1075c28
Fix protcol naming when load multiple protocols ( #1904 )
2019-07-08 12:51:47 +02:00
Jure Grabnar
0ee0b1c834
Fix file preview not showing in modal when processing is done
...
Close SCI-3587
2019-07-08 12:45:22 +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
0eb09407bc
Always scroll to top when searching for new string
2019-07-04 15:38:15 +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
20134c9f8a
Features/protocolsio integration ( #1893 )
...
Features/protocolsio integration
2019-07-03 17:32:20 +02:00
Miha Mencin
669592f62c
Merge pull request #1886 from biosistemika/SCI-3640-fix-safari-search-bar
...
SCI-3640 Search line on Safari external protocols page needs update
2019-07-03 14:18:02 +02:00
Miha Mencin
1b31f7f30a
SCI-3640 set max width of search bar to 50%
2019-07-03 13:16:07 +02:00
Miha Mencin
37cc526ac9
fix CR comments
2019-07-03 10:22:59 +02:00
aignatov-bio
d2849c88fd
Remove draft after save step ( #1878 )
2019-07-03 09:18:52 +02:00
Miha Mencin
74b4e0d774
SCI-3644 hide the import button and show it only on hover & when appropriate user
2019-07-02 18:24:07 +02:00
aignatov-bio
378e91b426
Fix links on search page ( #1867 )
2019-07-02 11:21:00 +02:00
aignatov-bio
68ebf13bca
Fix tags modal issue ( #1856 )
2019-07-02 11:20:49 +02:00
Oleksii Kriuchykhin
4ea6b56582
Fix Step and Result file previews [SCI-3539]
2019-07-01 23:30:20 +02:00
Alex Kriuchykhin
7e4852d5aa
Merge pull request #1871 from okriuchykhin/ok_SCI_3511_v2
...
Fix TinyMCE editor initialization for step editing [SCI-3511]
2019-07-01 16:08:36 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled ( #1872 )
2019-07-01 11:51:13 +02:00
aignatov-bio
2793777463
Features/docx report ( #1873 )
...
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
2019-07-01 10:14:16 +02:00
Oleksii Kriuchykhin
2f39b7f22b
Fix TinyMCE editor initialization for step editing [SCI-3511]
2019-06-28 12:06:04 +02:00
Jure Grabnar
ebbb36cc6d
Remove border from the import button
2019-06-28 11:32:47 +02:00
Anton Ignatov
6be227b2d3
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
2019-06-28 10:47:38 +02:00
Jure Grabnar
5430fb311d
Hound fixes
2019-06-28 10:41:20 +02:00
Jure Grabnar
1a9fca87d2
Fix non-existent protocol-card in preview banner
2019-06-28 08:49:12 +02:00
Jure Grabnar
149f45f4fc
Hound fixes
2019-06-28 02:31:25 +02:00
Jure Grabnar
7fb696cf48
Fix unclickable import modal
2019-06-28 02:00:05 +02:00
Jure Grabnar
03b81400a9
Add timeout to search
2019-06-28 01:50:52 +02:00
Jure Grabnar
1ccabf62b3
Add preview banner in external protocols
2019-06-28 01:38:33 +02:00
Jure Grabnar
81695665c7
Add hover effect on the card
2019-06-28 00:47:08 +02:00
Jure Grabnar
d3afcbed50
Style card view on external protocols
...
Closes SCI-3535
2019-06-28 00:43:05 +02:00
Jure Grabnar
7fb650a125
Change click -> onchange event for sort_by buttons
2019-06-27 22:56:38 +02:00
Jure Grabnar
0a77cedaf8
Fix sorting of external protocols and start showing results
2019-06-27 22:48:56 +02:00
Jure Grabnar
8338892fc6
Update external protocols form to include sort_by
2019-06-27 21:26:28 +02:00
Urban Rotnik
9cb4454537
New implementation for attachments creation
2019-06-27 17:02:06 +02:00
Urban Rotnik
1fd0ca6795
Add steps preview
2019-06-27 16:46:02 +02:00
Urban Rotnik
2761079479
Add modal for import
2019-06-27 16:46:02 +02:00
Jure Grabnar
7d71608166
Add spinner to external preview
2019-06-26 19:43:35 +02:00
aignatov-bio
83bc9eb22f
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
...
Adding new activities for image editing [SCI-3369]
2019-06-24 10:31:39 +02:00
aignatov-bio
57e0478b81
Merge pull request #1855 from aignatov-bio/ai-sci-3583-fix-table-header-in-report
...
Fix handsontable [SCI-3583]
2019-06-24 09:39:35 +02:00
aignatov-bio
81c76fb112
Merge pull request #1854 from aignatov-bio/ai-sci-3586-comment-counter-not-updated
...
Fix comments counter for zero comments [SCI-3586]
2019-06-24 09:39:22 +02:00
Anton Ignatov
ab73987245
improve connector perfomance
2019-06-23 00:48:50 +02:00
Anton Ignatov
31c6802a06
Add support for marvinjs on service
2019-06-23 00:09:49 +02:00
Anton Ignatov
8240c8baad
Initial refactoring for remote api support
2019-06-22 01:51:59 +02:00
Anton Ignatov
7e5c39d3e4
Merge branch 'master' into features/marvinjs-integration
2019-06-21 14:51:45 +02:00
Anton Ignatov
76e09a2a3d
Clear TinyMce autosave after manual save
2019-06-21 14:21:03 +02:00
Anton Ignatov
dfece85ea1
Fix handsone table
2019-06-21 11:16:44 +02:00
Anton Ignatov
57ef9573f2
Fix comments counter for zero comments
2019-06-21 10:43:41 +02:00
Alex Kriuchykhin
db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
...
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-20 11:31:15 +02:00
Anton Ignatov
df344f4d03
Merge branch 'master' into ai-sci-3369-activity-for-edited-image-annotation
2019-06-20 09:43:53 +02:00
Jure Grabnar
b2b752fcf8
Fix hound complaints
2019-06-19 23:37:04 +02:00
Jure Grabnar
fcd42a4178
Fix border radius around active sort button
2019-06-19 22:59:30 +02:00
Jure Grabnar
b3c3b68dc2
Add external preview to External Protocols tab
...
Closes SCI-3563
2019-06-19 22:54:20 +02:00
Anton Ignatov
a843a016a0
Fix markup and naming
2019-06-19 15:19:47 +02:00
aignatov-bio
83b9efd7dd
Fix right floating images in RTE editor ( #1842 )
2019-06-19 14:06:33 +02:00
aignatov-bio
609c408c77
Fix error on new step saving command ( #1845 )
2019-06-19 14:06:25 +02:00
aignatov-bio
5734d0cdd7
Fix TinyMCE field selector for steps ( #1844 )
2019-06-19 14:06:16 +02:00
aignatov-bio
81d10c8ce4
Remove recent protocol button on new step ( #1841 )
2019-06-19 12:49:22 +02:00
Jure Grabnar
7adef9cc9e
Change sort buttons positions
...
Closes SCI-3534
2019-06-17 12:24:13 +02:00
Jure Grabnar
218cf84775
Hound fixes
2019-06-17 12:24:12 +02:00
Jure Grabnar
d103f8ffec
Finish external protocols screen
...
Closes SCI-3534
2019-06-17 12:24:12 +02:00
aignatov-bio
fb3b7918af
Fix handson table issue ( #1827 )
2019-06-14 16:21:27 +02:00
aignatov-bio
2dfbdacfa3
Change restore button background ( #1829 )
2019-06-14 16:21:01 +02:00
aignatov-bio
da8d748c49
Fix small comments bugs ( #1832 )
2019-06-14 16:20:47 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments ( #1838 )
2019-06-14 16:20:13 +02:00
Anton Ignatov
f480c0eb8d
Adding new activtiies for image editing
2019-06-14 16:15:30 +02:00
aignatov-bio
52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] ( #1800 )
...
* Add recent protocols dropdown to task page
2019-06-13 15:47:29 +02:00
Alex Kriuchykhin
bc94771828
Merge pull request #1791 from okriuchykhin/ok_SCI_3461
...
Refactor the async thumbnail reloading (spinner) [SCI-3461]
2019-06-12 15:35:15 +02:00
Alex Kriuchykhin
4f851b0995
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller
...
Fix nil issue in tags_my_module controller [SCI-3525]
2019-06-12 13:11:40 +02:00
Oleksii Kriuchykhin
a855eade4c
Merge branch 'master' into ok_SCI_3461
2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin
4d579db2e2
Refactor assets polling to use setTimeout [SCI-3461]
2019-06-11 13:14:07 +02:00
mlorb
fa28e772f0
Merge pull request #1807 from mlorb/ml-sci-3508
...
Fix some css on step panel heading [SCI-3508]
2019-06-11 11:12:12 +02:00
Oleksii Kriuchykhin
6e1a7a3392
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-11 10:08:33 +02:00
Mojca Lorber
ca1b91a409
css fix again
2019-06-10 11:23:40 +02:00
aignatov-bio
d553fee2b3
Prevent negative scroll for sidebar ( #1819 )
2019-06-05 12:41:27 +02:00
Urban Rotnik
3d3c6d5350
Toolbar position fix for Safari
2019-06-04 15:55:44 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] ( #1808 )
...
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
2019-06-04 14:40:21 +02:00
Anton Ignatov
d0439f478d
Fix markup
2019-06-03 09:52:04 +02:00
Anton Ignatov
559bb2d793
Prevent selecting empty tag
2019-06-03 09:50:55 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] ( #1801 )
...
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00
Anton Ignatov
16d00340cd
Fix merge errors
2019-05-31 10:35:04 +02:00
Anton Ignatov
c9a29b12ba
Merge branch 'master' into features/marvinjs-integration
2019-05-31 10:27:14 +02:00
aignatov-bio
3681df7b9f
Fix scroll issue in repository column editor ( #1813 )
2019-05-31 09:48:45 +02:00
Alex Kriuchykhin
c49dbe5c44
Merge pull request #1810 from okriuchykhin/ok_SCI_3511
...
Fix RTE editor initialization for new step in protocol [SCI-3511]
2019-05-30 12:54:36 +02:00
Oleksii Kriuchykhin
d061aec5cd
Fix RTE editor initialization for new step in protocol [SCI-3511]
2019-05-29 18:33:20 +02:00
Mojca Lorber
ca4d8e71bb
fix some css on step panel heading
2019-05-29 13:56:55 +02:00
Oleksii Kriuchykhin
2c9ced0c75
Fix step numbering update on reposition [SCI-3507]
2019-05-29 12:20:35 +02:00
aignatov-bio
0b3b6d593b
Small style fixes [SCI-3498] ( #1799 )
...
* Adding error, if TinyMCE asset not in text, when we copy anything
* Small style fixes
2019-05-27 16:27:27 +02:00
aignatov-bio
fb30e6b6e5
Add check for refreshProtocolStatusBar function exist ( #1794 )
2019-05-22 10:31:29 +02:00
aignatov-bio
da33a053cf
Fix avatar image position on global activities ( #1792 )
2019-05-22 10:21:18 +02:00
Oleksii Kriuchykhin
84a2ad4487
Refactor the async thumbnail reloading (spinner) [SCI-3461]
2019-05-21 17:29:33 +02:00
aignatov-bio
2cee46a10d
Fix experiment name length ( #1789 )
2019-05-21 15:54:01 +02:00
aignatov-bio
d97e803d01
Adding placeholder to TinyMCE editor ( #1788 )
2019-05-21 15:53:47 +02:00
aignatov-bio
59e824ef9e
Fix nil handling in different places [SCI-2840] ( #1777 )
...
* Fix nil handling in different places
2019-05-21 15:53:34 +02:00
mlorb
be0393e642
Merge pull request #1785 from biosistemika/lm-ml-sci-3193
...
Update protocol status bar upon protocol changing [SCI-3193]
2019-05-21 15:28:58 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] ( #1787 )
...
* Refactor avatar appearance across Scinote
2019-05-21 15:19:44 +02:00
aignatov-bio
5081546c78
Fix padding for protocol description ( #1782 )
2019-05-21 10:21:30 +02:00
Mojca Lorber
b479a6a145
Cover all use cases for updating protocol status bar
2019-05-20 16:09:43 +02:00
aignatov-bio
d959769b65
Fix experiment and step title ( #1779 )
2019-05-20 11:20:08 +02:00
aignatov-bio
20b626d791
Fix warning message issue in step description [SCI-3479] ( #1778 )
...
* Fix warning message issue
2019-05-20 11:19:53 +02:00
Luka Murn
c26489acdc
Update protocol status bar upon changing of protocol description
2019-05-17 10:22:16 +02:00
Anton Ignatov
259b75a6ba
Merge branch 'master' into features/marvinjs-integration
2019-05-16 09:28:48 +02:00
aignatov-bio
24e30867da
Add smart annotation to comments [SCI-3458] ( #1768 )
...
* Add smart annotation to comments
2019-05-15 14:59:15 +02:00
aignatov-bio
825e34e661
Fix inside click action in inline editing [SCI-3440] ( #1765 )
...
* Fix inside click action
2019-05-14 16:25:46 +02:00
aignatov-bio
d28d466dc9
Fix multiple confirm windows [SCI-3452] ( #1763 )
...
* Fix multiple confirm windows
2019-05-14 16:25:34 +02:00
aignatov-bio
4a753f8519
Fix user smart annotation fpr tinyMCE ( #1759 )
2019-05-14 15:02:12 +02:00
aignatov-bio
fe2a3c4ee6
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] ( #1754 )
...
* Add message when turbolinks change page with dirty tinuMCE
2019-05-14 09:49:00 +02:00
aignatov-bio
f970eea525
Some gui fixes ( #1757 )
2019-05-14 09:43:02 +02:00
Oleksii Kriuchykhin
4b1c4bd140
Fix handling of proccessing step attachments [SCI-3381]
2019-05-13 17:12:06 +02:00
aignatov-bio
039b2f3754
Fix zoom on Y axis [SCI-3374] ( #1750 )
...
* Add zoom to image annotation
2019-05-13 11:01:39 +02:00
Miha Mencin
5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426
...
Changes to create new office file button [SCI-3426]
2019-05-13 10:55:58 +02:00
aignatov-bio
d3aa6371cd
Fix report saving [SCI-3443] ( #1753 )
...
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
2019-05-13 10:55:08 +02:00
Alex Kriuchykhin
837e5d1fea
Merge pull request #1744 from okriuchykhin/ok_SCI_3439
...
Change implementation of TinyMCE floating toolbar [SCI-3439]
2019-05-13 10:46:23 +02:00
aignatov-bio
71b3228310
Update protocol preview style [SCI-3416] ( #1729 )
...
* Update protocol appearance
2019-05-13 10:45:12 +02:00
Oleksii Kriuchykhin
b60bd79e2b
Change implementation of TinyMCE floating toolbar [SCI-3439]
2019-05-13 10:26:15 +02:00
aignatov-bio
3633274c8f
Fix import for eln ( #1741 )
2019-05-13 10:22:30 +02:00
aignatov-bio
364f903b3c
Fix protocol preview name ( #1749 )
2019-05-13 10:17:47 +02:00
aignatov-bio
2010b3ad8f
Fix step comments bugs ( #1751 )
2019-05-13 09:49:53 +02:00
Anton Ignatov
65eff67926
Fix merge
2019-05-11 20:54:52 +02:00
Anton Ignatov
e5b4adcc25
Merge branch 'master-with-note-section' into features/marvinjs-integration
2019-05-11 20:51:01 +02:00
aignatov-bio
634b58bd6a
Various UX improvements for note section [SCI-3444] ( #1742 )
...
* Various UX improvments for note section
2019-05-11 16:04:28 +02:00
Luka Murn
bbfad0efe5
Refresh current page after new OfficeOnline file is created
2019-05-10 18:30:48 +02:00
Luka Murn
584cf4b93b
Change Office icon on the create New Office buttons
2019-05-10 17:51:29 +02:00
mlorb
110c4ec460
Merge pull request #1743 from mlorb/ml-sci-3386
...
Fix tiny mce visuals, saving and cursor position [SCI-3386]
2019-05-10 17:45:12 +02:00
aignatov-bio
f684ddd365
Change dropdown highlight color and fix task tag position [SCI-3410] ( #1735 )
...
* Change dropdown highlight color and fix task tag position
2019-05-10 16:37:59 +02:00
Mojca Lorber
86255b9037
Remove automatic saving on task and protocol description
2019-05-10 15:30:29 +02:00
Mojca Lorber
d761a5cecb
Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description
2019-05-10 11:27:47 +02:00
Mojca Lorber
8e6413b031
Fix tiny mce visuals, saving and cursor position
2019-05-10 10:52:14 +02:00
Anton Ignatov
995408e7fc
Fix protocol update error, rollback bootstrap gems and fix step name
2019-05-08 17:18:19 +02:00
Anton Ignatov
b5271bdd2c
Add remote api support
2019-05-08 15:00:36 +02:00
Anton Ignatov
dcf94e78e1
Merge branch 'master-with-note-section' into feature/marvinjs-integration
2019-05-08 14:03:41 +02:00
aignatov-bio
d08bdd771e
Fix task tag cut off ( #1734 )
2019-05-08 10:21:59 +02:00
Miha Mencin
0a7696200a
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading
...
Clear step edit textarea status before going to edit mode [SCI-3413]
2019-05-07 16:36:04 +02:00
Miha Mencin
b31645adbe
Merge pull request #1731 from aignatov-bio/ai-sci-3418-fix-window-scroll-after-exit-from-tinymce
...
Fix floating tool bar and scroll issue after leaving editor [SCI-3418]
2019-05-07 16:35:49 +02:00
Miha Mencin
60fd1a02c6
Merge pull request #1730 from aignatov-bio/ai-sci-3410-add-task-tag-on-enter
...
Add task tag on enter button [SCI-3410]
2019-05-07 16:35:34 +02:00
Miha Mencin
4b76151e40
Merge pull request #1727 from mlorb/ml-sci-3384
...
Fix bug when saving empty step description [SCI-3384]
2019-05-07 16:35:12 +02:00
Miha Mencin
7c088c8432
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line
...
Fix due date position [SCI-3411]
2019-05-07 16:34:23 +02:00
Anton Ignatov
ea545801aa
Clear edit textarea status before going to editmode
2019-05-07 15:54:32 +02:00
Anton Ignatov
826ed63f17
Fix floating tool bar and scroll issue after leaving editor
2019-05-07 15:21:15 +02:00
Anton Ignatov
168424a035
Add tag on enter button
2019-05-07 14:47:44 +02:00
aignatov-bio
7d54f2ab01
Fix issue with TInyMCE upload plugin ( #1723 )
2019-05-07 10:24:02 +02:00
Mojca Lorber
46e8f80965
Fix bug when saving empty step description
2019-05-06 17:14:19 +02:00
Anton Ignatov
2a294c408f
Fix due date alignment and chage header structure from bootstrap to flexbox
2019-05-06 16:20:00 +02:00
aignatov-bio
4c1a64ce4f
Fix tags line up ( #1722 )
2019-05-06 14:19:32 +02:00
Alex Kriuchykhin
3f0401bf9a
Merge pull request #1709 from okriuchykhin/ok_SCI_3398
...
Fix TinyMCE for results [SCI-3398]
2019-05-06 10:47:11 +02:00
mlorb
df16b54be0
Merge pull request #1719 from mlorb/ml-sci-3399
...
Visual fixes for edit/add step on protocol [SCI-3399]
2019-05-06 10:33:28 +02:00
aignatov-bio
cc8a152278
Fix step attachments sorting ( #1718 )
2019-05-06 09:56:26 +02:00
Anton Ignatov
565a4959b4
small fixes and improvments
2019-05-03 15:24:28 +02:00
Anton Ignatov
88e67a16c2
Merge branch 'master-with-note-section' into feature/marvinjs-integration
2019-05-02 16:16:03 +02:00
Anton Ignatov
fef691d30f
Add error handling and secutiry checks
2019-05-02 16:12:25 +02:00
Anton Ignatov
f73dd38780
Add image editor to tinymce drawings
2019-04-30 18:32:59 +02:00
Anton Ignatov
4d0d5aa014
Adding team sketches selector
2019-04-30 17:32:55 +02:00
Mojca Lorber
7be151bd2d
Visual fixes for edit/add step on protocol
2019-04-30 14:57:50 +02:00
aignatov-bio
60296419e8
Update project card due date dropdown ( #1716 )
2019-04-30 13:30:09 +02:00
aignatov-bio
26dc1a0a4a
Note section css issues [SCI-3378] ( #1715 )
...
* Fix step name width bug
2019-04-30 10:23:44 +02:00
aignatov-bio
7d197a6f02
Remove gray step headers ( #1713 )
2019-04-29 14:06:55 +02:00
Anton Ignatov
f80d881847
Fix markup
2019-04-28 19:11:41 +02:00
Anton Ignatov
2847ec7609
Add env variable and check for MarvinJS available
2019-04-28 17:08:18 +02:00
Anton Ignatov
260810fff8
Add editing mode for tinymce images
2019-04-28 16:16:31 +02:00
Anton Ignatov
193edfbc35
Add marvin js support to TinyMCE
2019-04-27 22:54:59 +02:00
Anton Ignatov
54731856f0
Finish step chemical attachments
2019-04-27 19:08:40 +02:00
Anton Ignatov
cf4ff41ec6
Add delete feature
2019-04-27 13:51:35 +02:00
Anton Ignatov
46f0e0c0c2
Add marvin js assets to assets sort and name field
2019-04-27 12:46:45 +02:00
Anton Ignatov
fe620c4a63
Add marvin model and controller
2019-04-26 22:59:38 +02:00
Anton Ignatov
baa9b94a63
Add new graph button to step
2019-04-26 20:33:20 +02:00
Anton Ignatov
40c1c9aef7
Add marvin js modal
2019-04-26 18:24:21 +02:00
Oleksii Kriuchykhin
077ad52d4b
Fix TinyMCE for results [SCI-3398]
2019-04-26 17:37:01 +02:00
Urban Rotnik
3b063348ce
Hide remove icon and show only on attachment hover
2019-04-26 15:51:35 +02:00
Urban Rotnik
88050b9b93
Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable
...
Fix for inline editing on Firefox [SCI-3383]
2019-04-26 15:46:37 +02:00
aignatov-bio
dc7fddc60a
Improve task tags ( #1708 )
2019-04-26 15:38:33 +02:00
aignatov-bio
9fbfa9215e
Add zoom to image annotation [SCI-3374] ( #1694 )
...
* Add zoom to image annotation
2019-04-26 15:21:01 +02:00
aignatov-bio
57b80280dc
Update attachemnts css ( #1700 )
2019-04-26 15:20:39 +02:00
Urban Rotnik
8413ed5ab0
Fix for inline editing on Firefox
2019-04-26 14:22:18 +02:00
aignatov-bio
1a860037f7
Update reports for new RTE [SCI-3263] ( #1691 )
...
* Update reports for new RTE
2019-04-25 16:16:43 +02:00
Urban Rotnik
0cf688be39
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes
...
Comments section changes [SCI-3135]
2019-04-25 14:18:05 +02:00
Anton Ignatov
0779ed598b
Reuse inline editing logic
2019-04-25 11:14:55 +02:00
aignatov-bio
84993ea3ef
Update protocol repository for new description format [SCI-3371] ( #1689 )
...
* Update protocol repository for new description format
* move image clone method to concerns
2019-04-24 13:34:56 +02:00
Urban Rotnik
f894bca694
Add saving event when user clicks out of textarea
2019-04-23 15:02:59 +02:00
Urban Rotnik
774521df7a
Changes to comments section in Task Steps
2019-04-23 15:02:58 +02:00
Urban Rotnik
11a7a975af
Merge branch 'features/scinote-improvements' into master-with-note-section
2019-04-23 14:50:03 +02:00
Urban Rotnik
7a2bfc12ce
Remove form_asset partial
2019-04-23 13:50:48 +02:00
Urban Rotnik
ea0368aa11
Attachments update for edit page
2019-04-23 13:50:47 +02:00
Anton Ignatov
7d60eb5572
Fix migration issues
2019-04-23 11:11:22 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
aignatov-bio
92d8e42a92
Add floating toolbar for tinymce ( #1688 )
2019-04-19 15:12:06 +02:00
aignatov-bio
ba1e3dc3c6
Add smooth loading for inline task and protoocl description editing ( #1682 )
2019-04-19 14:47:05 +02:00
aignatov-bio
6b45dcd475
Update eln export for new tinyMCE image format ( #1680 )
2019-04-19 14:44:40 +02:00
Anton Ignatov
f1d801117d
disable zoom
2019-04-18 09:11:27 +02:00
Anton Ignatov
f6ecea42cf
Remove minimum zoom size
2019-04-17 18:51:52 +02:00
Urban Rotnik
3f037ef517
Fix navigationJS team switch when have only 1 team
2019-04-17 09:58:18 +02:00
Anton Ignatov
dd8b3caf65
Fix duplicate activtiy issue and fix link to inventory
2019-04-15 11:35:30 +02:00
aignatov-bio
063f02dc56
Add ability to select filters with keyboard [SCI-3200] ( #1649 )
...
* Add ability to select fitlers with keyboard
2019-04-15 10:30:08 +02:00
aignatov-bio
8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] ( #1654 )
...
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
2019-04-15 09:49:44 +02:00
Alex Kriuchykhin
3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2
...
Switch to kaminari pagination in global activities [SCI-3292]
2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin
231106e131
Switch to kaminari pagination in global activities [SCI-3292]
2019-04-12 15:37:45 +02:00
Mojca Lorber
bf2e9e8194
Rename button load more system notification to fix the bug
2019-04-12 11:58:47 +02:00
mlorb
3c0b1984d0
Merge pull request #1658 from mlorb/ml-sci-3297
...
Fix activity card visuals [SCI-3297]
2019-04-12 09:20:11 +02:00
aignatov-bio
ffb0db06b9
Add scroll to team selector ( #1659 )
2019-04-12 09:17:14 +02:00
aignatov-bio
2b92a987e6
Fix user counter bug on project card ( #1662 )
2019-04-12 09:17:03 +02:00
mlorb
520738025a
Merge branch 'master' into ml-sci-3297
2019-04-12 08:32:07 +02:00
Alex Kriuchykhin
7f20b7fa20
Merge pull request #1661 from okriuchykhin/ok_SCI_3292
...
Improve global activities pagination and fetching [SCI-3292]
2019-04-11 16:23:37 +02:00
Jure Grabnar
8420974779
Move scrollTop to reloadActivities
...
Closes SCI-3302
2019-04-10 18:45:12 +02:00
Jure Grabnar
3c47521f0e
Reset scrollbar after selecting date filter
...
Closes SCI-3302
2019-04-10 15:46:30 +02:00
Oleksii Kriuchykhin
d378e33038
Improve global activities pagination and fetching [SCI-3292]
2019-04-10 15:45:17 +02:00
aignatov-bio
f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload
...
Improve the image file upload into RTE input fields [SCI-3131]
2019-04-10 14:04:06 +02:00
Mojca Lorber
c8ddae4d1e
Fix activity card visuals
2019-04-10 12:37:13 +02:00
aignatov-bio
7ef7e2397f
Change activity filter order and reduce custom date label size [SCI-3301] ( #1651 )
...
* Change activity filter order and reduce custom date label size
* Fix hound
2019-04-09 14:18:22 +02:00
Urban Rotnik
ee3dc571e1
Update attachments view, add ordering on FE
2019-04-09 14:17:40 +02:00
Urban Rotnik
a3932cc67f
New asset box style update
2019-04-09 14:17:40 +02:00
aignatov-bio
e2e299b424
Add dynamic generating filters for global activities [SCI-3228] ( #1644 )
...
* Add dynamic generating filters
* Add url methods
2019-04-09 09:08:27 +02:00
aignatov-bio
a086f88541
Disable save button while image loading ( #1646 )
2019-04-09 09:07:58 +02:00
Urban Rotnik
26cf8271a1
Change step header, remove vertical line
2019-04-05 10:57:38 +02:00
Jure Grabnar
d9a9045658
Hound formatting
2019-04-04 17:05:25 +02:00
Jure Grabnar
d60cc2cd1c
Refactor create_wopi_file
2019-04-04 17:05:25 +02:00
Jure Grabnar
56bb62c5b0
Addtional formatting fixes
2019-04-04 17:05:25 +02:00
Jure Grabnar
20446fb39d
Hound formatting fixes
2019-04-04 17:05:25 +02:00
Jure Grabnar
cbf109f884
Fix create WOPI file button
...
Closes SCI-3137
2019-04-04 17:05:25 +02:00
Jure Grabnar
fddff9c627
Perform styling on the WOPI modal
2019-04-04 17:05:25 +02:00
Jure Grabnar
b12916b828
Add main functionality
2019-04-04 17:05:25 +02:00
Jure Grabnar
613843d095
Temp commit
2019-04-04 16:58:55 +02:00
Oleksii Kriuchykhin
e7151e6e6b
Disable inventory import activity logging [SCI-3290]
2019-04-03 22:42:33 +02:00
Oleksii Kriuchykhin
9e91e9e59d
Improve large image saving after editing [SCI-3289]
2019-04-03 16:31:56 +02:00
Alex Kriuchykhin
bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281
...
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-03 11:39:59 +02:00
aignatov-bio
e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] ( #1631 )
...
* Fix bug with update protocol from repository and modal disable button
2019-04-03 09:18:18 +02:00
Oleksii Kriuchykhin
c47d243b1f
Disable WOPI edit button in read only mode [SCI-3281]
2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin
ffa7c5ecb2
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-02 16:38:53 +02:00
aignatov-bio
3a2f78d7a8
Fix freeze top pane tags bug ( #1627 )
2019-04-02 16:05:48 +02:00
Alex Kriuchykhin
93350d1ac8
Merge pull request #1626 from okriuchykhin/ok_SCI_3174
...
Fix comment menu position on canvas [SCI-3174]
2019-04-02 15:10:14 +02:00
Anton Ignatov
c9f9523210
Remove src when save description and rename token tag
2019-04-02 13:41:32 +02:00
Oleksii Kriuchykhin
91a87cbf3a
Fix comment menu position on canvas [SCI-3174]
2019-04-02 12:54:21 +02:00
aignatov-bio
e93b0c3109
Adding preload filters for global activities [SCI-3254] ( #1619 )
...
* Adding preload filter for global activities
* Adding link to task activities
2019-04-02 11:14:36 +02:00
aignatov-bio
daaa6a367b
Adding custom scrollbar to global activities [SCI-3206] ( #1623 )
...
* Adding custom scrollbar to global activities
2019-04-02 09:56:50 +02:00
Jure Grabnar
d9c10c6c7b
Remove reapplying callback actions on project index page
...
Closes SCI-3242.
2019-04-01 15:02:47 +02:00
Jure Grabnar
fe3e92468f
Merge pull request #1611 from jbargu/jg_sci_3226_3243
...
Too much empty space between date buttons [SCI-3243] [SCI-3226]
2019-03-29 12:30:53 +01:00
aignatov-bio
b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] ( #1605 )
...
* Adding children selector to global activities subjects
* Fix naming, add seperate check for project id
2019-03-29 09:26:27 +01:00
aignatov-bio
ba4b35d004
Fix date hot buttons ( #1606 )
2019-03-29 09:07:46 +01:00
aignatov-bio
ce7bbd6b07
Adding deselect button to objects filter and some localizations fix ( #1608 )
2019-03-29 09:04:58 +01:00
Jure Grabnar
226cf21787
No top margin for select custom dates button
2019-03-29 08:42:15 +01:00
Jure Grabnar
e9133bbea9
Remove empty space between date buttons
...
Closes SCI-3243
2019-03-29 08:29:16 +01:00
Jure Grabnar
e8a4fd5360
Fix date label
...
Closes SCI-3226
2019-03-29 08:18:15 +01:00
aignatov-bio
08263ab64e
adding filters for task activities [SCI-3076] ( #1553 )
...
* update task activity screen
2019-03-28 10:55:48 +01:00
Urban Rotnik
685b7138b7
Merge pull request #1597 from urbanrotnik/ur-SCI-3224-add-message-for-empty-activity-list
...
Add message for empty activity list [SCI-3224]
2019-03-28 09:16:29 +01:00
Urban Rotnik
d0a8652969
Add message for empty activity list
2019-03-28 09:14:01 +01:00
aignatov-bio
5c9d2cbc60
Merge pull request #1601 from aignatov-bio/ai-sci-3175-help-window-does-not-close-bug
...
Fix tooltip freeze bug [SCi-3175]
2019-03-28 09:12:37 +01:00
Jure Grabnar
aa186f675a
Fix clear filter not clearing date label
...
Closes SCI-3226
2019-03-27 18:47:34 +01:00
Jure Grabnar
9881ff38ee
Add color to HOT buttons
2019-03-27 15:34:01 +01:00
Anton Ignatov
03123c34f8
adding date placeholder
2019-03-27 14:39:29 +01:00
Anton Ignatov
46ee2557d4
Fix tooltip stuck bug
2019-03-27 13:53:32 +01:00
Anton Ignatov
1d244508f5
Adding placeholders to filters
2019-03-27 11:19:58 +01:00
aignatov-bio
c2e1e85913
Adding localization for activity name and activity group ( #1598 )
2019-03-27 10:33:33 +01:00
Miha Mencin
1b19e67c07
Revert "Step header changes, removed vertical line"
...
This reverts commit b0f0ded87d
.
2019-03-27 10:21:40 +01:00
aignatov-bio
a3c1796497
Adding arrow to drop down [SCI-3212] ( #1594 )
...
* Adding arrow to dropdown
2019-03-26 16:49:12 +01:00
aignatov-bio
6012513c13
Reduce font size of filters title [SCI-3208] ( #1592 )
...
* reduce font size of filters titles;
* fix new title
2019-03-26 16:47:36 +01:00
Oleksii Kriuchykhin
2ff43a3320
Change filtering logic when no filters are selected [SCI-3223]
2019-03-26 16:04:03 +01:00
Alex Kriuchykhin
935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
...
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
2019-03-26 16:02:44 +01:00
aignatov-bio
54fd3a748b
Adding activity groups [SCI-3203] ( #1588 )
...
* Adding activty groups
2019-03-26 15:29:21 +01:00
Urban Rotnik
738d6f0f8c
Merge pull request #1590 from urbanrotnik/ur-SCI-3209-circles-to-checkboxes
...
Add fontawesome checkmark before dropdown item [SCI-3209]
2019-03-26 13:49:19 +01:00
Urban Rotnik
68d87efaa0
Merge pull request #1582 from urbanrotnik/ur-SCI-3134-changes-to-step-design
...
Step header changes, removed vertical line [SCI-3134]
2019-03-26 12:38:04 +01:00
Urban Rotnik
96fa620c4c
Add fontawesome checkmark before dropdown item
...
SCI-3209
2019-03-26 12:35:17 +01:00
aignatov-bio
cee3796f35
Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left
...
Move dropdown container to left [SCI-3203]
2019-03-26 09:37:12 +01:00
Oleksii Kriuchykhin
e3a3ec4491
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]
2019-03-25 17:38:13 +01:00
Urban Rotnik
b0f0ded87d
Step header changes, removed vertical line
...
SCI-3134
2019-03-25 17:25:13 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities
2019-03-25 14:35:24 +01:00
Anton Ignatov
2d5df1b3b7
Moving dropdown container to left
2019-03-25 13:56:32 +01:00
aignatov-bio
fd6e622b95
Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates
...
Remove white spaces for date in global activities [SCI-3205]
2019-03-25 12:58:35 +01:00
Anton Ignatov
c584a0d606
Remove white spaces for date in global activites
2019-03-25 11:06:00 +01:00
Anton Ignatov
c8c211f245
Remove whitespace to breadcrumbs
2019-03-25 09:39:17 +01:00
Jure Grabnar
171b2eeedc
Remove the title of protocol steps when empty
...
Closes SCI-3072
2019-03-25 09:36:56 +01:00
aignatov-bio
9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype
...
Feature/Image annotation
2019-03-22 16:31:00 +01:00
Anton Ignatov
fc7400bec9
fix markup
2019-03-22 13:42:12 +01:00
Anton Ignatov
65521533b4
change js.erb to js
2019-03-22 13:35:11 +01:00
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01:00
aignatov-bio
723024202e
Image editor improvements [SCI - 3158, 3160, 3156, 3154] ( #1563 )
...
* Improvments SCI - 3158, 3160, 3156, 3154
2019-03-22 09:27:50 +01:00
Anton Ignatov
bc58f0aecd
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
2019-03-21 11:48:51 +01:00
aignatov-bio
e8827b0d74
Update tags in task info [SCI-3093] ( #1575 )
...
* Adding inline tags selection
2019-03-21 10:13:07 +01:00
Anton Ignatov
55c93922ea
markup fixes
2019-03-20 14:46:54 +01:00
Anton Ignatov
07c2819163
refactoring tinymce image uploading
2019-03-20 14:46:54 +01:00
aignatov-bio
5d9e4f30d4
Duplicates name protocol bug and rake task to rename duplicates [SCI-3047] ( #1541 )
...
* Fix double protocols bug and rake task to rename duplicates
2019-03-20 12:41:14 +01:00
Oleksii Kriuchykhin
0c2b7959b6
Fix smart annotations in RTE [SCI-3111]
2019-03-20 11:41:36 +01:00
Oleksii Kriuchykhin
b46f3566ef
Fix rendering of HTML in RTE fields [SCI-3111]
2019-03-19 23:32:24 +01:00
Oleksii Kriuchykhin
eb3d1ea6fe
Update RTE for step description [SCI-3111]
2019-03-19 17:42:49 +01:00
aignatov-bio
6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] ( #1568 )
...
*Add permission check for assets editing
* Add check for image format
2019-03-19 13:52:57 +01:00
Anton Ignatov
f606210652
Rubocop fix
2019-03-19 13:52:03 +01:00
Anton Ignatov
87280f083a
[SCI-3166] Finalize global activities front end
2019-03-19 13:50:55 +01:00
Alex Kriuchykhin
7db53fad7c
Merge pull request #1566 from okriuchykhin/ok_SCI_3062
...
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
2019-03-19 13:28:05 +01:00
aignatov-bio
a0a3c4b97f
Fix file format bug ( #1569 )
2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin
5bc41c1f06
Fix task tags field after merging latest master to feature branch
2019-03-15 14:21:34 +01:00
Oleksii Kriuchykhin
ba41afe449
Re-orginize TinyMCE init callback [SCI-3062][SCI-3071]
2019-03-15 11:07:57 +01:00
Oleksii Kriuchykhin
2cc170c3d4
Close RTE on save [SCI-3062][SCI-3071]
2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
a822227383
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
645930b8d7
Merge branch 'master' into features/note-section
2019-03-14 16:25:51 +01:00
Oleksii Kriuchykhin
af94f79f0d
Submit image as FormData [SCI-2879]
2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
ded74044de
Fix circle icon in image editor [SCI-2855]
2019-03-11 15:10:38 +01:00
Oleksii Kriuchykhin
feb75f62e1
Add workaround for image caching in fabric js [SCI-2855]
2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin
80e525fd97
Improve image editor behaviour [SCI-2855]
2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin
89e968c410
Add tui.image-editor [SCI-2815]
2019-03-11 15:08:15 +01:00
Oleksii Kriuchykhin
e3bacd6b9a
Fix global activities page after refactoring [SCI-2994][SCI-3024]
2019-03-08 13:09:27 +01:00
Oleksii Kriuchykhin
0b87e8e1e4
Merge branch 'features/global-activities' into ok_SCI_3024_v3
2019-03-08 10:29:51 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] ( #1521 )
...
* Adding side pane filtering and top pane
2019-03-06 10:34:04 +01:00
aignatov-bio
125d2a3b9b
New inline tags editing in task [SCI 3093] ( #1529 )
...
* Adding inline tags selection
2019-03-06 09:18:45 +01:00
aignatov-bio
b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] ( #1524 )
...
* Adding inline editing to experiment title, project title and task title
2019-03-06 09:17:34 +01:00
Anton Ignatov
33682bb561
Bold text for read messages
2019-03-04 13:48:25 +01:00
Oleksii Kriuchykhin
c3705ccb25
Improve group collapse JS code [SCI-2994][SCI-3024]
2019-03-04 13:44:43 +01:00
Anton Ignatov
1ae4a60f79
Fix recaptha error
2019-03-01 12:58:31 +01:00
Miha Mencin
d03ef2cd2a
Merge branch 'master' into features/templates
2019-02-28 09:41:20 +01:00
Miha Mencin
a372ebf07d
Revert "Task info section improvements [SCI - 3058]"
2019-02-27 21:00:11 +01:00
Oleksii Kriuchykhin
0930277c4e
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
2019-02-27 16:02:53 +01:00
Anton Ignatov
a4cabb203b
Task info section improvements
2019-02-25 16:55:09 +01:00
Miha Mencin
76c3db0b11
added layout, added css, added select2 lib, WIP
2019-02-25 16:50:38 +01:00
Jure Grabnar
b4199b28e4
Remove turbolinks:load from the project show page
...
Also rename Demo project experiment back to PCR.
Closes SCI-3081.
2019-02-22 19:46:42 +01:00
Anton Ignatov
6971d1a55d
Adding new Select2 library with customization
2019-02-22 16:40:33 +01:00
aignatov-bio
aa8a2b040a
Merge pull request #1518 from biosistemika/features/system-notifications
...
Notification changes on settings page [SCI 3084] (#1517 )
2019-02-22 14:01:38 +01:00
aignatov-bio
606708987f
Notification changes on settings page [SCI 3084] ( #1517 )
...
* Fix css and update text settings
2019-02-22 13:20:51 +01:00
Miha Mencin
bcd0b433b6
Merge pull request #1514 from biosistemika/features/system-notifications
...
Features/system notifications
2019-02-21 16:38:58 +01:00
aignatov-bio
5f78d83f9c
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] ( #1513 )
...
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
2019-02-21 16:15:13 +01:00
Urban Rotnik
b50320a4bc
Add margin for system notification modal
2019-02-21 15:15:33 +01:00
Oleksii Kriuchykhin
db18f88807
Update templates to final version [SCI-3053]
2019-02-21 15:06:34 +01:00
aignatov-bio
5fdba554d2
Merge pull request #1510 from biosistemika/features/system-notifications
...
Features/system notifications
2019-02-20 17:22:57 +01:00
aignatov-bio
35268252c8
After reading What’s new notification and reloading the page, gift status is unseen again [SCI 3051] ( #1504 )
...
* Change relative path to absolute to mark_as_read and make clickable whole system notification with hover effecr
2019-02-20 13:15:16 +01:00
Jure Grabnar
27ed8e781e
Merge pull request #1501 from jbargu/jg_sci_2985_recaptcha_invite_not_working
...
Recaptcha input field now addressed with jQuery
2019-02-20 08:44:23 +01:00
Alex Kriuchykhin
0a54eb8ebe
Merge pull request #1503 from biosistemika/features/templates
...
Merge features/templates to master
2019-02-19 15:07:42 +01:00
Urban Rotnik
7b6c6c414d
Merge branch 'master' into features/templates
2019-02-19 14:46:15 +01:00
Mojca Lorber
ebfacdd62c
change experiments title color
2019-02-19 14:24:23 +01:00
aignatov-bio
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications
...
Features/system notifications
2019-02-19 13:51:18 +01:00
Jure Grabnar
ebdf9adab0
Recaptcha input field now addressed with jQuery
...
Fix SCI-2985
2019-02-19 13:05:33 +01:00
aignatov-bio
8e905b67b2
System notification navbar menu drop down [SCI 2955] ( #1498 )
...
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
2019-02-19 11:08:59 +01:00
aignatov-bio
c598541e09
System notification modal window [SCI-2957 and SCI-2958] ( #1484 )
...
* Added new system notification modal
* Adding loading system notification on sign in
2019-02-15 13:07:29 +01:00
mlorb
71e4cc4dbd
Merge branch 'master' into ml-sci-2940
2019-02-13 14:35:03 +01:00
aignatov-bio
5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] ( #1482 )
...
* System notification view and notification partial (SCI 2956 and SCI 3001)
2019-02-13 13:06:14 +01:00
mlorb
8bad68c854
Merge pull request #1457 from mlorb/ml-sci-2933
...
Change experiment cards look and feel [SCI-2933]
2019-02-12 11:49:24 +01:00
Mojca Lorber
3b4a894124
fix hound
2019-02-12 11:24:44 +01:00
Mojca Lorber
d8cc482cbf
remove electronic signatures from templates
2019-02-11 17:51:48 +01:00
Mojca Lorber
78a29c4141
add templates after protocol_keyword_team rake task was run
2019-02-11 16:15:56 +01:00
Mojca Lorber
087832c29d
add templates
2019-02-11 14:02:49 +01:00
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
Oleksii Kriuchykhin
2ff5199be0
Fix TinyMCE images in protocol import [SCI-3030]
2019-02-07 16:58:38 +01:00
Anton Ignatov
4145b2565c
Fixed bug with order in inventories SCI-3006
2019-02-07 11:34:04 +01:00
Mojca Lorber
227aeb284c
change mydemo projects data
2019-02-05 11:15:16 +01:00
Oleksii Kriuchykhin
a033e9b207
Fix Lato font loading [SCI-2969]
2019-02-04 15:36:17 +01:00
Oleksii Kriuchykhin
cc92de3726
Merge latest features/templates [SCI-2939]
2019-01-30 10:43:54 +01:00
Mojca Lorber
089ec64398
fix experiment card look on Matejs request
2019-01-28 16:59:40 +01:00
Miha Mencin
b67cee2e65
Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug
...
SCI-2928 moving team modal js file to application.js.erb in order to …
2019-01-25 11:54:14 +01:00
Urban Rotnik
16e9a56874
Add recaptcha to invitation modal
...
SCI-2935
2019-01-25 11:27:01 +01:00
Oleksii Kriuchykhin
bd2efa55ac
Add templates business logic [SCI-2939]
2019-01-25 10:55:08 +01:00
mlorb
a297ef2094
Merge pull request #1443 from mlorb/ml-sci-2914
...
Allow org. administrators to invite them onto all projects [SCI-2914]
2019-01-24 16:24:57 +01:00
Miha Mencin
126a031498
SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded
2019-01-23 15:30:23 +01:00
mz3944
f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903
...
Fix (unite) Date and Time display formats [SCI-2903]
2019-01-21 09:50:34 +01:00
mlorb
d2108ac3ea
fix hound
2019-01-18 16:16:00 +01:00
mlorb
7fdef4d3ec
Change experiment cards look and feel
2019-01-18 15:57:44 +01:00
Miha Mencin
0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
...
Fix task tags update on canvas cards [SCI-2875]
2019-01-16 12:44:50 +01:00
Oleksii Kriuchykhin
3a4b992f4e
Code style fixies []SCI-2875]
2019-01-14 16:31:23 +01:00
Oleksii Kriuchykhin
89240659a7
Fix task tags update on canvas cards [SCI-2875]
2019-01-11 17:20:39 +01:00
Alex Kriuchykhin
b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
...
Add counters to task inventories dropdown [SCI-2776]
2019-01-11 16:27:22 +01:00
Alex Kriuchykhin
be514fd62d
Merge pull request #1445 from okriuchykhin/ok_SCI_2931
...
Fix image URLs in export all document [SCI-2931]
2019-01-11 12:03:06 +01:00
Oleksii Kriuchykhin
132f46b136
Improve error handling in task inventories dropdown [SCI-2776]
2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin
ec28db6f4f
Fix image URLs in export all document [SCI-2931]
2019-01-10 14:19:40 +01:00
Alex Kriuchykhin
8ea37c541b
Merge pull request #1436 from okriuchykhin/ok_SCI_2904
...
Disable edit button for unsupported WOPI formats [SCI-2904]
2019-01-10 11:04:26 +01:00
mlorb
06b1e5cf20
Allow org. administrators to invite them onto all projects
2019-01-08 16:30:52 +01:00
Jure Grabnar
fe46f9c9fe
Reinit tooltips after cancel/save step
...
Closes SCI-2891.
2019-01-08 15:36:44 +01:00
Matej Zrimšek
8070b7f8b5
Fix Date and Time display formats on JS side
2019-01-08 08:07:24 +01:00
Oleksii Kriuchykhin
534866467b
Add counters to task inventories dropdown [SCI-2776]
2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin
2769add4d9
Disable edit button for unsupported WOPI formats [SCI-2904]
2018-12-31 18:10:12 +01:00
Oleksii Kriuchykhin
3610960ee3
Fix ajax calls duplication [SCI-2916]
2018-12-17 20:59:22 +01:00
mlorb
5ebcd1dfe1
Merge pull request #1423 from mlorb/ml-sci-2911
...
Fix export projects getting fired multiple times [SCI-2911]
2018-12-17 11:26:40 +01:00
Oleksii Kriuchykhin
97bde075b2
Change color of the selected element in the side navigation [SCI-2909]
2018-12-13 16:50:22 +01:00
mlorb
55cab34eb4
fix export projects getting fired miltiple times
2018-12-13 16:46:08 +01:00
Luka Murn
022d0d9512
Merge pull request #1419 from Ducz0r/lm-sci-2902-fix
...
Change export all to use HTML instead of PDF [SCI-2902]
2018-12-13 15:19:37 +01:00
mlorb
cfd5156c09
Merge pull request #1416 from mlorb/ml-sci-2871
...
Fix behavior when user has no teams [SCI-2871]
2018-12-12 11:27:28 +01:00
mlorb
8170e1b367
Merge pull request #1414 from mlorb/ml-sci-2899
...
Fix invited member is added multiple times to team [SCI-2899]
2018-12-12 11:26:41 +01:00
Luka Murn
65adc7a556
Fix 2 minor visual bugs in reports
2018-12-12 11:15:32 +01:00
mlorb
4040b31143
Fix behavior when user has no teams
2018-12-10 15:42:05 +01:00
Alex Kriuchykhin
37db41e18e
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
...
Refresh sidebar when project is archived/restored [SCI-2881]
2018-12-10 14:11:34 +01:00
Alex Kriuchykhin
51ba74cbab
Merge pull request #1403 from okriuchykhin/ok_SCI_2757
...
Enable caching for navigation sidebar [SCI-2757]
2018-12-10 14:11:05 +01:00
mlorb
7c3bad1e86
Merge pull request #1410 from mlorb/ml-sci-2789
...
Fix missing protocols link tooltip [SCI-2789]
2018-12-10 09:15:31 +01:00
mlorb
2246166107
fix protocol link tooltip again
2018-12-07 12:00:42 +01:00
mlorb
d37f3a3c09
fix invited member is added multiple times to team
2018-12-07 11:36:26 +01:00
mlorb
3031fb7a4b
Merge pull request #1398 from mlorb/ml-sci-2786
...
Fix projects table css [SCI-2786]
2018-12-06 09:15:51 +01:00
mlorb
c7f5c17e7e
change css again
2018-12-04 11:21:54 +01:00
mlorb
7d1817350a
fix missing protocols link tooltip
2018-12-04 10:45:16 +01:00
Oleksii Kriuchykhin
2c96f08b98
Refresh sidebar when project is archived/restored [SCI-2881]
2018-11-29 14:20:20 +01:00
Oleksii Kriuchykhin
60a19734b2
Enable caching for navigation sidebar [SCI-2757]
2018-11-29 11:28:36 +01:00
Luka Murn
8b1449b5a2
Add bottom margin to OAuth authorize page, for better mobile xp
2018-11-28 21:46:33 +01:00
mlorb
15ddd0ab91
fix projects table css
2018-11-27 12:37:10 +01:00
Oleksii Kriuchykhin
79544e789d
Fix support menu for Safari [SCI-2885]
2018-11-26 18:47:21 +01:00
Oleksii Kriuchykhin
2e00f1546a
Fix handsontable initialization [SCI-2882]
2018-11-26 14:11:46 +01:00
Alex Kriuchykhin
95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859
...
Refactor & restyle the API authorization screen [SCI-2859]
2018-11-22 13:06:13 +01:00
mlorb
de803e70a8
Merge pull request #1385 from mlorb/ml-sci-2866
...
Fix in app help window does not close in some cases [SCI-2866]
2018-11-22 10:48:52 +01:00
Alex Kriuchykhin
f811afc7e2
Merge pull request #1387 from okriuchykhin/ok_SCI_2877
...
Fix comments form for new results [SCI-2877]
2018-11-22 10:28:09 +01:00
Oleksii Kriuchykhin
6cd033767c
Fix comments form for new results [SCI-2877]
2018-11-21 23:48:43 +01:00
Oleksii Kriuchykhin
df938a8ba5
Fix task tags modal [SCI-2875]
2018-11-21 22:24:12 +01:00
Alex Kriuchykhin
afe5db5cf3
Merge pull request #1382 from okriuchykhin/ok_SCI_2872
...
Change text color on project cards tabs [SCI-2872]
2018-11-21 10:59:03 +01:00
mlorb
39b01bc8ed
fix in app help window does not close in some cases
2018-11-21 10:19:41 +01:00
mz3944
a9eb2fc249
Merge pull request #1377 from mz3944/mz-SCI-2863
...
Fix DataTable display for protocol modal [SCI-2863]
2018-11-20 21:21:29 +01:00
Oleksii Kriuchykhin
59fb971394
Change text color on project cards tabs [SCI-2872]
2018-11-20 17:31:27 +01:00
Oleksii Kriuchykhin
d98f11abdc
Refactor & restyle the API authorization screen [SCI-2859]
2018-11-20 17:02:45 +01:00
Alex Kriuchykhin
a6bc02a2cb
Merge pull request #1369 from okriuchykhin/ok_SCI_2830
...
Refactor result and step comments [SCI-2830]
2018-11-20 00:13:15 +01:00
Oleksii Kriuchykhin
b7ccfccfe0
Imrove tags update behaviour on canvas [SCI-2830]
2018-11-19 11:48:53 +01:00
Matej Zrimšek
716e74ceb4
Fix DataTable display for protocol modal [SCI-2863]
2018-11-19 07:21:29 +01:00
mlorb
4b540958bd
change close/cancel button and refactor export_project_modal endpoint
2018-11-16 13:37:32 +01:00
mlorb
6453ab6fb1
update the Export all confirmation modal and export interaction
2018-11-15 15:53:58 +01:00
Oleksii Kriuchykhin
fb309a12b9
Refactor result and step comments initialization [SCI-2830]
2018-11-13 16:57:42 +01:00
Luka Murn
84df2c81f9
Merge branch 'features/export-all'
...
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
98d1ea8542
Improve Export All button behaviour [SCI-2839]
2018-11-12 15:51:03 +01:00
mlorb
4d156080ac
fix empty projects page bug and projects tree bug
2018-11-07 13:45:46 +01:00
mlorb
63e039e235
fix bug with new project button not working
2018-11-06 11:38:31 +01:00
mz3944
d733f4e357
Merge pull request #1346 from mz3944/mz-SCI-2787
...
In project list table table is not updated when archiving/restoring project [SCI-2787]
2018-10-28 14:36:17 +01:00
Oleksii Kriuchykhin
6e6bb73d2f
Remove double initialization of comments on steps [SCI-2756]
2018-10-26 09:29:42 +02:00
Matej Zrimšek
6447750ff7
Fix showing projects in table view when all are archived [SCI-2787]
2018-10-25 22:31:00 +02:00
Luka Murn
42793d25b7
Add bottom padding to sign in/up/forgot password pages
...
Closes SCI-2764.
2018-10-24 13:57:58 +02:00
Matej Zrimšek
c89488e105
Fix displaying projects when all are archived [SCI-2787]
2018-10-24 03:34:13 +02:00
mlorb
e5fca1b1cd
change the rich text max limit on frontend to 50000
2018-10-18 14:22:15 +02:00
Oleksii Kriuchykhin
02f536cd08
Merge latest features/export-all [SCI-2733]
2018-10-16 17:20:19 +02:00
Jure Grabnar
447cad083d
Fix formatting according to HoundBot
2018-10-16 11:01:58 +02:00
Jure Grabnar
d50f56e319
Disable/enable export proejct button
...
Fix filesystem saving
2018-10-16 11:01:58 +02:00
Jure Grabnar
6b47165ac1
Fix formatting according to Houndbot
2018-10-16 11:00:38 +02:00
Jure Grabnar
2558b7a313
Fix formatting according to HoundBot
2018-10-16 11:00:38 +02:00
Jure Grabnar
26df1e5a98
Add export project modal
...
Closes [SCI-2645]
2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin
f221d71bbc
Fix datatables state restore [SCI-2733]
2018-10-12 15:15:43 +02:00
Matej Zrimšek
1575da6edb
Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641]
2018-10-12 07:40:22 +02:00
Matej Zrimšek
c0dc4f6951
Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
0ebce8e283
Add relative links (not working) to files and tables into the PDF [SCI-2641]
2018-10-12 07:40:21 +02:00
Oleksii Kriuchykhin
af02f29fb5
Implement user state saving for projects overview [SCI-2733]
2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin
ba58eec2e2
Merge latest features/export-all [SCI-2731]
2018-10-03 11:04:44 +02:00
Oleksii Kriuchykhin
53874c4680
Fix Hound config and CSS code styling [SCI-2730]
2018-10-03 10:39:22 +02:00
Oleksii Kriuchykhin
7d995189bd
Fixies after code review [SCI-2730]
2018-10-02 14:24:44 +02:00
Luka Murn
d71be76657
Fix minor styling & text on settings - preferences page
2018-10-02 13:59:19 +02:00
Luka Murn
9632d1cd01
Set tooltips initialization to comply with turbolinks
...
Also add custom styling options as another data attribute.
2018-10-02 13:49:19 +02:00
Luka Murn
c12f77d1d1
Fix styling (ESLint) on tooltip_helper.js
2018-10-02 11:25:51 +02:00
Oleksii Kriuchykhin
492a5de19e
Add Projects view - list/table view [SCI-2731]
2018-10-01 15:39:42 +02:00
Zanz2
ada98e9eaf
Merge pull request #1289 from Zanz2/step_save_table_too_long_bug_sci2719
...
Fixed bug with table name of step not being length validated [SCI-2719]
2018-09-28 14:37:08 +02:00
Zanz2
16f9728a05
fixed to not use gon gem
2018-09-28 14:26:05 +02:00
Zanz2
c6936bc71e
fixed the implementation according to PR review, now validates all table names, when multiple are present, and uses gon gem
2018-09-28 13:13:25 +02:00
Oleksii Kriuchykhin
2508394924
Refactor Projects view - cards view [SCI-2730]
2018-09-27 10:43:44 +02:00
Oleksii Kriuchykhin
80e73bfb97
Implement Projects view - navigation bar (tabs) [SCI-2729]
2018-09-24 16:25:04 +02:00
Luka Murn
63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662
...
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
2018-09-24 16:23:53 +02:00
Luka Murn
2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663
...
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
2018-09-24 16:23:28 +02:00
Zanz2
87d2b0db14
fixed accordign to pr review
2018-09-24 15:57:31 +02:00
Zanz2
b536aa6f3e
Merge pull request #1287 from Zanz2/zz_dropdown_blue_sci2672
...
Fixed blue block in dropdown, now its a full line [SCI-2672]
2018-09-23 11:27:00 +02:00
Zanz2
5b955da74c
makes tooltip behaviour more reliable and less erratic
2018-09-16 21:34:36 +02:00
Zanz2
07757e382a
fixed hound
2018-09-14 13:43:31 +02:00
Zanz2
22a565a684
Made fixes according to review
2018-09-14 13:07:09 +02:00
Luka Murn
f9d771d01a
Add minor comment
2018-09-13 14:50:00 +02:00
Luka Murn
0ddc3e0968
Merge pull request #1303 from biosistemika/release-1.14.4
...
Merge release-1.14.4 into master
2018-09-13 14:47:17 +02:00
Zanz2
a9c0201fcc
Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629
...
Fixed disabled export button after new inventory item save [SCI-2629]
2018-09-13 11:35:07 +02:00
Luka Murn
99c156de94
Fix (hopefully) the TinyMCE files from being cached
...
Closes SCI-2717.
2018-09-12 15:28:21 +02:00
Zanz2
a0c6a0c407
changed name of data attribute
2018-09-07 15:33:38 +02:00
Luka Murn
586a442abc
Refactor the settings page, rename setting to tooltips_enabled
2018-09-05 16:36:32 +02:00
Zanz2
1bed2c2a3c
Partially fixed according to pull request review, added comments to code review
2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663
...
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
2018-08-31 11:42:26 +02:00
Zanz2
7d093fa11d
Fixed the issue, tested for all 3 reported scenarios
2018-08-31 11:18:18 +02:00
Zanz2
67f4555584
Fixed the issue, tested all 3 scenarios
2018-08-31 11:04:20 +02:00
Zanz2
db610f146f
fixed hound
2018-08-29 11:41:07 +02:00
Zanz2
c84ff3d9fe
Small oversight fix
2018-08-29 11:37:07 +02:00
Zanz2
ed5a5e7390
Fixed blue block in dropdown, now its a full line
2018-08-29 11:33:20 +02:00
Luka Murn
b71c5d14c6
Fix bootstrap-select to work with turbolinks 5.x
...
This was causing invite users modal, among other things, to not
function correctly after visiting another redirect within SciNote
using Turbolinks 5.x.
Closes SCI-2707.
2018-08-24 17:11:59 +02:00
Alex Kriuchykhin
151d1cf44d
Merge pull request #1270 from okriuchykhin/ok_SCI_2651
...
Refactor invite users modal initialization [SCI-2651]
2018-08-23 14:34:42 +02:00
Luka Murn
92eab25a07
Merge pull request #1261 from mlorb/ml-sci-2634
...
fix editing of inventory items of hidden columns [SCI-2634]
2018-08-21 16:59:37 +02:00
Luka Murn
92a4a54ae7
Slighty change the parameter parsing of removed file cells
2018-08-21 16:46:47 +02:00
Zanz2
6e4730619f
Fixed the bug, disabled class in dropdown menu when there was no need
2018-08-21 14:29:34 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
2018-08-21 11:27:01 +02:00
Zanz2
36cca3d6aa
Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax
2018-08-21 11:11:25 +02:00
Zanz2
9a482eab2e
Checkbox now gets styled properly and defaults to true
2018-08-21 09:02:54 +02:00
Zanz2
91f112dc38
Saving minor changes, deleted comments, stuck at drag n drop
2018-08-20 13:45:43 +02:00
Oleksii Kriuchykhin
6795b08a91
Refactor invite users modal initialization [SCI-2651]
2018-08-20 13:13:34 +02:00
Zanz2
1159a32ce2
Implemented all except 2 tooltips, debbugging why they dont work now
2018-08-20 13:03:30 +02:00
Zanz2
8c492e1491
started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute
2018-08-17 16:03:49 +02:00
Zanz2
e1cadfc75e
saving work, removed testing buttons
2018-08-17 11:52:10 +02:00
Zanz2
637c7dfb19
modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic
2018-08-17 11:33:44 +02:00
Zanz2
a09834db6a
testing, made new popover designs
2018-08-16 16:10:19 +02:00
Zanz2
d2373980d4
Testing out new popover
2018-08-16 15:07:59 +02:00
Zanz2
9fd02e71c9
initial popover/tooltip config
2018-08-16 13:04:42 +02:00
Zanz2
dfcaa40f1a
Merge branch 'master' into zz_refactor_icons_sci_2445_v2
2018-08-14 13:33:43 +02:00
Zanz2
45a4c1c598
changed the icons as per last comment in jira issue
2018-08-14 13:26:48 +02:00
Zanz2
27e0d27862
Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621
...
Fixes duplicate checkbox entries in activity log [SCI-1621]
2018-08-09 11:50:34 +02:00
mlorb
a6dd577b4e
fix time zone selector
2018-08-08 11:43:18 +02:00
mlorb
f52ccfd606
fix editing of inventory items of hidden columns
2018-08-07 11:47:26 +02:00
Oleksii Kriuchykhin
8f5d30ad1f
Fix load protocol modal [SCI-2253]
2018-08-02 14:35:19 +02:00
Oleksii Kriuchykhin
38c36ab798
Fix modals handling with Turbolinks [SCI-2253]
2018-08-02 11:25:14 +02:00
Oleksii Kriuchykhin
5c999300b5
Fix avatar upload validators [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
812a3dcf7d
Fix user profile edit form [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
b2bd1cb849
Upgrade to Turbolinks 5 [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e
Change icons throughout the rest of application [SCI-2445]
2018-07-27 15:27:08 +02:00
Zanz2
c6ef14290a
Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again
2018-07-17 11:41:42 +02:00
Luka Murn
f23cc36803
Merge pull request #1224 from ZmagoD/zd_SCI_2429
...
fixes setting sidebar teams link[fixes SCI-2429]
2018-07-13 14:55:24 +02:00
Luka Murn
752fb8dcd8
Merge pull request #1238 from ZmagoD/zd_SCI_2511
...
fixes smart annotation serch queries/dropdown item picker [fixes SCI-…
2018-07-13 14:54:42 +02:00
Luka Murn
13aab686b1
Merge pull request #1242 from ZmagoD/zd_SCI_2492
...
adds the ability to scroll to the active element in the navigation si…
2018-07-13 14:54:30 +02:00
zmagod
1491c61d51
trim long file names [fixes SCI-2593]
2018-07-09 17:00:47 +02:00
zmagod
62d4796741
adds the ability to scroll to the active element in the navigation sidebar on page load [fixes SCI-2492]
2018-07-09 15:40:52 +02:00
Zmago Devetak
a6a395e394
Merge pull request #1240 from ZmagoD/zd_SCI_2593
...
fixes css for new repository item field field [fixes SCI-2593]
2018-07-09 13:15:15 +02:00
zmagod
10d20a6555
fixes datatable header on add new item action
2018-07-09 13:12:48 +02:00
zmagod
6585eaa338
fixes hound
2018-07-09 12:55:25 +02:00
zmagod
14254fbde3
fixes per @mlorb 's request
2018-07-09 12:54:02 +02:00
zmagod
dd00de928c
fixes css for new repository item field field [fixes SCI-2593]
2018-07-09 10:33:19 +02:00
Oleksii Kriuchykhin
3aceb12f03
Fix delete button in inventories [SCI-2594]
2018-07-08 21:59:02 +02:00
zmagod
e654725d9e
fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511]
2018-07-06 14:26:20 +02:00
Zmago Devetak
db90736c62
Merge pull request #1237 from ZmagoD/zd_SCI_2512
...
fixes list item height on columns management page [fixes SCI-2512]
2018-07-06 10:47:29 +02:00
zmagod
f1833b9bc1
fixes list item height on columns management page [fixes SCI-2512]
2018-07-06 09:28:03 +02:00
zmagod
a55d0b9c85
fixes file name label in repository file field [fixes SCI-2592]
2018-07-05 16:59:59 +02:00
Oleksii Kriuchykhin
a169639b3c
Fix uploaded file max size validation in JS [SCI-2590]
2018-07-05 15:23:26 +02:00
zmagod
fdedfec7d3
fixes bug with bootstrap-select
2018-07-04 17:38:16 +02:00
Zmago Devetak
eb61f728b4
Merge pull request #1227 from ZmagoD/zd_SCI_2546
...
Refactor inline row editing in repository
2018-07-04 15:28:08 +02:00
zmagod
5b9b86a2d4
fixes per @Ducz0r 's request
2018-07-04 15:23:41 +02:00
zmagod
c9dd8b356a
fixes locale, fixes custom file upload style
2018-07-04 13:43:45 +02:00
zmagod
43903080ce
code style fixes
2018-07-04 12:42:28 +02:00
zmagod
3eef4f87bf
fixes hound alerts
2018-07-03 16:18:44 +02:00
zmagod
8b86891177
fixes file destroy button [fixes SCI-2546]
2018-07-03 15:25:37 +02:00
zmagod
28bac14667
first working version of the edit form object
2018-07-03 12:57:39 +02:00
zmagod
c93e00b8c2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_2546
2018-07-03 09:13:54 +02:00
ZmagoD
1e66d25578
refactor list item dropdown
2018-07-02 17:05:52 +02:00
ZmagoD
23de3abd61
Fixes repository items edit action, adds additional event listener for file upload
2018-06-29 16:59:26 +02:00
nbernot
7aacc2b4a2
extract repository_item html form creation in to a separate 'class'
2018-06-29 14:28:06 +02:00
zmagod
0dbd2dc877
fixes typo
2018-06-29 10:29:39 +02:00
zmagod
eb75f6c03d
fixes bug with checkAvailableColumns function [fixes SCI-2578]
2018-06-29 10:28:46 +02:00
okriuchykhin
10554fecb4
Merge pull request #1223 from ZmagoD/zd_SCI_2566
...
fixes tagsinput text-area on long input [fixes SCI-2566]
2018-06-28 10:50:12 +02:00
Zmago Devetak
7fd3eec195
Merge pull request #1219 from ZmagoD/zd_SCI_2415
...
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-26 18:43:16 +02:00
zmagod
1a15ac7acf
fixes setting sidebar teams link[fixes SCI-2429]
2018-06-26 13:09:56 +02:00
zmagod
4b81c2c4db
fixes tagsinput text-area on long input [fixes SCI-2566]
2018-06-26 09:52:07 +02:00
zmagod
db1944cc90
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-19 14:15:14 +02:00
mlorb
0792ce46af
fix firefox bug with browse buttons position
2018-06-19 13:39:03 +02:00
zmagod
5f1489a100
fix columns check [fixes SCI-2408]
2018-06-18 13:36:56 +02:00
zmagod
2f141e9217
disable buttons on new/edit repository_item action [fixes SCI-2410]
2018-06-15 11:37:01 +02:00
Zmago Devetak
29fe58de80
Merge pull request #1208 from ZmagoD/zd_SCI_2408
...
adds an additional check if some other user has added/removed reposit…
2018-06-13 11:30:43 +02:00
Zmago Devetak
2eb6613c6a
Merge pull request #1206 from ZmagoD/zd_SCI_2442
...
make manage columns page more responsive [fixes SCI-2442]
2018-06-13 11:14:35 +02:00
Zmago Devetak
d457a66996
Merge pull request #1205 from ZmagoD/zd_SCI_2427
...
enables tooltip on long column names [fixes SCI-2427]
2018-06-13 11:14:29 +02:00
Zmago Devetak
a8981d7039
Merge pull request #1201 from ZmagoD/zd_SCI_2421
...
fixes bug with tinymce/at.js [fixes SCI-2421]
2018-06-13 11:14:17 +02:00
Zmago Devetak
673410251d
Merge pull request #1197 from ZmagoD/zd_SCI_2384
...
fixes repository table on sidebar toggle [fixes SCI-2384]
2018-06-13 09:57:27 +02:00
Zmago Devetak
50c1a712d8
Merge pull request #1204 from ZmagoD/zd_SCI_2434
...
fixes bug with repository items dropdown [fixes SCI-2434]
2018-06-13 08:42:13 +02:00
Zmago Devetak
6cab1746cd
Merge pull request #1202 from ZmagoD/zd_SCI_2392
...
prevents asset preview modal to close on click [fixes SCI-2392]
2018-06-13 08:41:41 +02:00
Zmago Devetak
e06ab02f68
Merge pull request #1192 from ZmagoD/zd_SCI_2435
...
removes visibility toggle from Name column [fixes SCI-2435]
2018-06-13 08:41:25 +02:00
Luka Murn
9a4fdd166e
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
...
Conflicts:
app/views/projects/index.html.erb
2018-06-12 17:44:42 +02:00
zmagod
f8ac083d39
adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]
2018-06-12 15:28:03 +02:00
zmagod
1cff4a5060
make manage columns page more responsive [fixes SCI-2442]
2018-06-12 10:22:48 +02:00
zmagod
a8971b4e20
enables tooltip on long column names [fixes SCI-2427]
2018-06-11 15:22:56 +02:00
Zmago Devetak
a174e186bb
removes unneeded code
2018-06-11 15:00:13 +02:00
zmagod
256e502982
fixes bug with repository items dropdown [fixes SCI-2434]
2018-06-11 14:57:27 +02:00
mlorb
1e1330847f
remove unused code
2018-06-11 14:49:03 +02:00
mlorb
40f3365596
fix bug with truncating string
2018-06-11 14:47:25 +02:00
zmagod
32a09f9780
prevents asset preview modal to close on click [fixes SCI-2392]
2018-06-11 13:03:11 +02:00
zmagod
374a16abad
fixes bug with tinymce/at.js [fixes SCI-2421]
2018-06-11 10:18:35 +02:00
Zmago Devetak
6ba5c587f7
Merge pull request #1189 from ZmagoD/zd_SCI_2211
...
add data-hook, refactor add user to project modal to support addons
2018-06-08 15:23:26 +02:00
Luka Murn
bfaedab4b4
Fix buttons style on tags modal
...
Closes SCI-2397.
2018-06-08 13:43:23 +02:00
zmagod
b7ecf09963
fixes repository table on sidebar toggle [fixes SCI-2384]
2018-06-08 10:58:28 +02:00
Luka Murn
dbceac7aa4
Style inventories secondary navigation section
2018-06-08 08:31:22 +02:00
Luka Murn
4cdfe67115
Fix protocol management filter display (css)
2018-06-07 15:57:59 +02:00
Luka Murn
b324a2dab3
Restyle activities page
2018-06-07 09:29:47 +02:00
zmagod
a51ea399f4
removes unneeded empty lines
2018-06-05 16:39:22 +02:00
zmagod
66cac0b676
removes visibility toggle from Name column [fixes SCI-2435]
2018-06-05 16:36:36 +02:00
zmagod
997748561b
adds missing js changes
2018-06-01 16:14:50 +02:00
Luka Murn
4ba07fb082
Merge pull request #1186 from Ducz0r/lm-sci-2477-fix
...
Move sign-in flow layout to core [SCI-2477]
2018-06-01 15:08:44 +02:00
mlorb
0a8bfdb860
Reposition the arrow for opening/closing of Navigation
2018-06-01 13:18:49 +02:00
Luka Murn
20ffa57583
Move sign-in flow layout to core
...
Closes SCI-2477.
2018-06-01 09:11:48 +02:00
Zmago Devetak
28abdf285e
Merge pull request #1183 from ZmagoD/zd_SCI_2451_v2
...
fixes sidebar [fixes SCI-2451]
2018-05-30 18:21:03 +02:00
mlorb
c17a947969
Merge pull request #1182 from mlorb/ml-sci-2459
...
Fix position of navigation bar is not saved [SCI-2459]
2018-05-30 18:10:01 +02:00
mlorb
35badd8bb8
move variable declaration
2018-05-30 17:58:18 +02:00
zmagod
e06ae9b543
fixes sidebar [fixes SCI-2451]
2018-05-30 16:53:08 +02:00
mlorb
100ddf127d
fix position of navigation bar is not saved
2018-05-30 16:46:27 +02:00
mlorb
858b95d851
fix align bullet with a file name
2018-05-30 13:58:16 +02:00
zmagod
b74598a748
fixes bug with empty submit of repository row [fixes SCI-2420]
2018-05-29 14:47:40 +02:00
okriuchykhin
2e79af3412
Merge pull request #1174 from okriuchykhin/ok_SCI_2458
...
Fix left menu word breaking [SCI-2458]
2018-05-28 13:06:26 +02:00
Luka Murn
80323eaf67
Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle
...
Conflicts:
app/assets/javascripts/sidebar_toggle.js.erb
2018-05-28 12:39:24 +02:00
Luka Murn
e611e76fae
Fix Hound errors
2018-05-28 11:53:49 +02:00
Zmago Devetak
9513efa3f3
Merge pull request #1173 from ZmagoD/zd_SCI_2451
...
fixes sidebar animation [fixes SCI-2451]
2018-05-28 11:18:07 +02:00
Oleksii Kriuchykhin
f0362a0c02
Fix left menu word breaking [SCI-2458]
2018-05-28 10:42:07 +02:00
zmagod
485993f2f6
fixes sidebar animation [fixes SCI-2451]
2018-05-28 10:28:35 +02:00
Luka Murn
b3ae1d8fa6
Remove some dead code, make sidebar toggle animated
2018-05-27 16:24:47 +02:00
Luka Murn
b86edf20a5
Remove auto-toggling of navigation sidebar depending on width
2018-05-27 15:44:15 +02:00
Luka Murn
8b527d8a5b
Restyle left side menu bar so it also works with lower heights
2018-05-27 15:24:49 +02:00
Luka Murn
6e6b6803e6
Remove session-stored toggle state of navigation bar
2018-05-27 15:24:11 +02:00
zmagod
6512970b9c
adds flash_message div in manage repository column page
2018-05-25 14:36:15 +02:00
Luka Murn
fe3ddb7c65
Update code so it works
2018-05-25 08:50:27 +02:00
Luka Murn
c9f3de9f27
Improve toggle
2018-05-24 13:39:04 +02:00
mlorb
3368e3b963
Merge branch 'ux-release-1' into ml-sci-2271
2018-05-23 14:06:54 +02:00
mlorb
2bb2f8d193
Merge pull request #1161 from mlorb/ml-sci-2350
...
move the open/close arrow to the bottom of left menu [SCI-2350]
2018-05-23 14:01:12 +02:00
mlorb
00657a78a5
Merge pull request #1162 from mlorb/ml-sci-2440-v2
...
fix toggle button on inventory page [SCI-2440]
2018-05-23 14:01:02 +02:00
okriuchykhin
f61f069c95
Merge pull request #1157 from okriuchykhin/ok_SCI_2432
...
Init selectpicker for move workflow to another experiment modal [SCI-2432]
2018-05-23 12:58:58 +02:00
mlorb
5e689f6b4d
fix toggle button on inventory page
2018-05-23 11:20:42 +02:00
mlorb
79f1a1c0ad
fix padding and change label colors
2018-05-23 11:13:28 +02:00
mlorb
c4ecfc4d38
Change icons throughout sciNote - navigation, project, task cards
2018-05-22 16:55:58 +02:00
Luka Murn
31a1641b42
Merge pull request #1155 from Ducz0r/lm-sci-2436-fix
...
Update new repository row code so file columns work again [SCI-2436]
2018-05-22 09:27:32 +02:00
mlorb
e3fc0237c1
Merge pull request #1153 from mlorb/ml-sci-2440
...
Final button colour changes [SCI-2440]
2018-05-21 16:29:04 +02:00
Oleksii Kriuchykhin
39b74d6f8a
Init selectpicker for move workflow to another experiment modal [SCI-2432]
2018-05-21 16:12:39 +02:00
Luka Murn
6135081a71
Update new repository row code so file columns work again
...
Also fix backend code a bit (so update & create of repository rows
are more similar in their behavior), and fix line in JS:
_initSelectPicker() was called a reduntant amount of times when
editing repository row.
Closes SCI-2436.
2018-05-21 14:46:30 +02:00
okriuchykhin
6dbb5bc583
Merge pull request #1152 from okriuchykhin/ok_SCI_2403
...
Change remove file button appearence [SCI-2403]
2018-05-18 17:34:56 +02:00
mlorb
0fccc71fc3
fix load protocol wording and UI-style
2018-05-18 16:57:18 +02:00
mlorb
81392362ac
Final button colour changes
2018-05-18 16:24:24 +02:00
Oleksii Kriuchykhin
b79b0b79cf
Change remove file button appearence [SCI-2403]
2018-05-18 14:51:45 +02:00
mlorb
876717e355
add pointer cursor to arrow
2018-05-18 13:34:52 +02:00
mlorb
64cbddb9a0
UI/UX restyle - update colours for navigation
2018-05-18 10:41:32 +02:00
Zmago Devetak
c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331
...
adds deface hook in support dropdown [fixes SCI-2331]
2018-05-18 09:31:02 +02:00
zmagod
8a99d35a8d
removes datatables.noSearchHidden plugin
2018-05-18 09:24:36 +02:00
zmagod
cf4c33bf92
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 15:22:43 +02:00
mlorb
7bda68b9f4
Merge pull request #1146 from mlorb/ml-sci-2336-v3
...
Add locales [SCI-2336]
2018-05-17 13:29:47 +02:00
zmagod
b125863baf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71
fixes typos, fixes pdf rendering
2018-05-17 11:21:34 +02:00
mlorb
933a98c1f6
fix smart anotation color
2018-05-17 11:01:15 +02:00
Zmago Devetak
f73bd18989
Merge pull request #1145 from ZmagoD/zd_SCI_2407
...
fixes column name in columns visibility dropdown tooltip [fixes SCI-2…
2018-05-16 20:34:40 +02:00
okriuchykhin
e9d6b26ec6
Merge pull request #1141 from okriuchykhin/ok_SCI_2403
...
Add clear file selector button to repository edit [SCI-2403]
2018-05-16 14:55:53 +02:00
zmagod
b1b259fdbe
fixes column name in columns visibility dropdown tooltip [fixes SCI-2407]
2018-05-16 14:37:58 +02:00
mlorb
06ce285ae2
add locales
2018-05-16 14:32:15 +02:00
Zmago Devetak
9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321
...
fixes images preview in repository/library [fixes SCI-2321]
2018-05-16 12:05:33 +02:00
zmagod
98baa77846
fixes cursor icon
2018-05-16 12:02:46 +02:00
mlorb
f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2
...
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
2018-05-16 11:30:54 +02:00
Oleksii Kriuchykhin
c8094f196c
Add margin to clear button and fix case with new file in the cell [SCI-2403]
2018-05-16 11:25:43 +02:00
zmagod
7e3dbcd92f
hound
2018-05-16 10:43:25 +02:00
zmagod
712a3c7ff6
fixes css, changes spinner in preview modal
2018-05-16 10:40:49 +02:00
Oleksii Kriuchykhin
be5d481cdc
Add clear file selector button to repository edit [SCI-2403]
2018-05-16 10:32:50 +02:00
okriuchykhin
62f0c21a79
Merge pull request #1140 from okriuchykhin/ok_SCI_2391
...
Re-init file preview modal after inventory row editing [SCI-2391]
2018-05-16 10:18:13 +02:00
okriuchykhin
ffddf3fd94
Merge pull request #1135 from okriuchykhin/ok_SCI_2394
...
Fix editing of inventory rows with existing files [SCI-2394]
2018-05-16 10:16:26 +02:00
zmagod
4573655ec8
adds save PDF report to inventory feature [fixes SCI-2371]
2018-05-16 09:31:19 +02:00
Zmago Devetak
b771149477
Merge pull request #1133 from ZmagoD/zd_SCI_2337
...
fixes error message for invalid file type [fixes SCI-2337]
2018-05-16 08:26:11 +02:00
mlorb
cea7f5a3f7
some extra style unification
2018-05-15 17:10:31 +02:00
mlorb
5f462165b5
change font and alerts colors
2018-05-15 14:16:34 +02:00
Oleksii Kriuchykhin
95b8821cc9
Re-init file preview modal after inventory row editing [SCI-2391]
2018-05-15 12:57:36 +02:00
mlorb
dfe65ccaed
UI/UX restyle - fixes throughout application - part 2
2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin
a92abc5995
Fix editing of inventory rows with existing files [SCI-2394]
2018-05-14 14:26:01 +02:00
mlorb
f01cfc2968
fix hound
2018-05-14 12:08:45 +02:00
mlorb
ed27a7a62a
some extra restyling/unifying off app
2018-05-11 18:02:17 +02:00
mlorb
b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1
2018-05-10 13:59:57 +02:00
zmagod
3db7cc437b
fixes error message for invalid file type [fixes SCI-2337]
2018-05-10 13:52:01 +02:00
Luka Murn
8650edbbb9
Merge pull request #1129 from Ducz0r/lm-fix-repositories-index
...
Fix merge conflict introduced in when merging master->ux-release-1
2018-05-10 11:19:38 +02:00
okriuchykhin
ed8237484b
Merge pull request #1131 from okriuchykhin/ok_SCI_2379
...
Re-init file preview modal after column visability change [SCI-2379]
2018-05-10 10:45:56 +02:00
zmagod
e5c3fb6af2
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321
2018-05-10 10:38:56 +02:00
Zmago Devetak
0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261
...
propagate assigned repository items in workflow [fixes SCI-2261]
2018-05-10 09:57:49 +02:00
zmagod
38869ec037
adds title on disabled download file link
2018-05-10 09:47:10 +02:00
Oleksii Kriuchykhin
fa1fea634c
Re-init file preview modal after column visability change [SCI-2379]
2018-05-09 17:41:52 +02:00
mlorb
13f9ec30b8
fix hound
2018-05-09 13:56:32 +02:00
mlorb
7df40e56c7
UI/UX restyle - fixes throughout application part one
2018-05-08 16:33:42 +02:00
Luka Murn
f8295b60c9
Fix merge conflict introduced in when merging master->ux-release-1
...
Bug was introduced in merge commit
cb6fe50832
and resulted in import
into inventories not working.
2018-05-08 09:41:40 +02:00
Zmago Devetak
ee307886df
Merge pull request #1124 from ZmagoD/zd_SCI_2347
...
fix the missing icons on task card [fixes SCI-2347]
2018-05-04 09:34:49 +02:00