Oleksii Kriuchykhin
|
5470bb9b9b
|
Fix file result only name update [SCI-4321]
|
2020-02-07 15:21:50 +01:00 |
|
Mojca Lorber
|
e9e7b85e0b
|
Add empty option in dropdown selector
|
2020-02-07 14:57:07 +01:00 |
|
Alex Kriuchykhin
|
913f599b9f
|
Merge pull request #2389 from okriuchykhin/ok_SCI_4301
Add unsaved data notification when navigating away from the inventory [SCI-4301]
|
2020-02-07 13:58:20 +01:00 |
|
Oleksii Kriuchykhin
|
21bf59b943
|
Add unsaved data notification when navigating away from the inventory [SCI-4301]
|
2020-02-06 16:46:16 +01:00 |
|
Mojca Lorber
|
e70bc67146
|
Implement missing style guide changes
|
2020-01-31 14:11:37 +01:00 |
|
aignatov-bio
|
9a9088a0da
|
Merge pull request #2354 from aignatov-bio/ai-sci-4279-fix-duplicate-tags-on-task
Fix duplicate tags and small css issues [SCI-4279]
|
2020-01-30 13:42:22 +01:00 |
|
mlorb
|
a2afa11fef
|
Merge pull request #2378 from mlorb/ml-sci-4311
Fix scroll position on protocol and result page [SCI-4311]
|
2020-01-30 13:39:16 +01:00 |
|
Mojca Lorber
|
9388883479
|
Fix scroll position on protocol and result page
|
2020-01-29 14:28:52 +01:00 |
|
aignatov-bio
|
470f39ce04
|
Fix scrollbar
|
2020-01-29 11:14:25 +01:00 |
|
aignatov-bio
|
24b296fd86
|
Fix duplicate tags and small css issues
|
2020-01-23 13:38:02 +01:00 |
|
aignatov-bio
|
cd471bfb25
|
Update delimiter dropdown for manage column modal
|
2020-01-20 14:26:17 +01:00 |
|
aignatov-bio
|
597c88cacc
|
Fix smart annotation position
|
2020-01-17 13:55:43 +01:00 |
|
aignatov-bio
|
d32201ad58
|
Fix smart annotation position
|
2020-01-16 16:28:51 +01:00 |
|
Urban Rotnik
|
218316bea2
|
Update error handling for name and text
|
2020-01-16 13:30:05 +01:00 |
|
aignatov-bio
|
1ff0351a74
|
Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories
|
2020-01-16 11:36:00 +01:00 |
|
aignatov-bio
|
96e1d4a7d0
|
Add new error handling
|
2020-01-16 10:51:37 +01:00 |
|
aignatov-bio
|
a10e7de9a6
|
Fix smart annotation window position
|
2020-01-15 17:19:56 +01:00 |
|
aignatov-bio
|
b37d8f1275
|
Update layout for repository
|
2020-01-13 14:46:43 +01:00 |
|
Alex Kriuchykhin
|
d2e12e0683
|
Merge pull request #2265 from okriuchykhin/ok_SCI_4146
Restrict files to only images in RTE fields [SCI-4146]
|
2020-01-10 10:34:00 +01:00 |
|
aignatov-bio
|
9fdea4657c
|
Update validation for repository text field
|
2020-01-09 13:32:03 +01:00 |
|
aignatov-bio
|
54c78cf4d1
|
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles
Update colors and buttons
|
2020-01-08 12:30:51 +01:00 |
|
Oleksii Kriuchykhin
|
d9b9243da7
|
Merge branch 'develop' into features/new-column-types
|
2020-01-07 16:03:33 +01:00 |
|
aignatov-bio
|
f717ce66cb
|
Fix tests
|
2020-01-06 12:31:56 +01:00 |
|
aignatov-bio
|
464d03558a
|
Fix markup, replace buttons and add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|
Urban Rotnik
|
fa6b1fa0db
|
JS fixes
|
2019-12-20 15:19:30 +01:00 |
|
Oleksii Kriuchykhin
|
403a3e0140
|
Restrict files to only images in RTE fields [SCI-4146]
|
2019-12-16 16:05:40 +01:00 |
|
aignatov-bio
|
7664f4be78
|
Add checklist and list edit mode
|
2019-12-11 14:49:14 +01:00 |
|
aignatov-bio
|
7fc9c0d1e4
|
Adding frontend for checklist edit mode
|
2019-12-10 15:58:59 +01:00 |
|
aignatov-bio
|
2a38928b7a
|
Merge pull request #2251 from aignatov-bio/ai-sci-4068-custom-select-on-manage-columns-forms
Update drop-down for columns type selection [SCI-4068]
|
2019-12-09 14:09:21 +01:00 |
|
aignatov-bio
|
d8676596f1
|
Add checklists column type
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
c4a87bed52
|
Fix autosave for marvinJS in tinyMCE
|
2019-12-09 11:23:01 +01:00 |
|
aignatov-bio
|
eb708e4226
|
Update dropdown for column type selection
|
2019-12-06 16:14:16 +01:00 |
|
aignatov-bio
|
d643a08a9c
|
Merge pull request #2243 from aignatov-bio/ai-sci-4137-fix-activity-page-it-task
Fix task activity page [SCI-4137]
|
2019-12-03 09:09:36 +01:00 |
|
aignatov-bio
|
010a44650c
|
Fix task activity page
|
2019-12-02 16:04:50 +01:00 |
|
aignatov-bio
|
2d4104b0f2
|
Fix smart annotation for autosave
|
2019-12-02 15:53:42 +01:00 |
|
aignatov-bio
|
84e47f5b4c
|
Fix autosave in steps and result
|
2019-11-29 16:10:14 +01:00 |
|
Urban Rotnik
|
9bf948c3a8
|
Add statuses validation on FE
|
2019-11-29 10:19:11 +01:00 |
|
Urban Rotnik
|
b2b6296cb5
|
Improve update items action, JS and views
|
2019-11-29 10:19:10 +01:00 |
|
Mojca Lorber
|
305104f639
|
Refactor text inventory type
|
2019-11-29 10:17:53 +01:00 |
|
aignatov-bio
|
bcd9c6aee3
|
Merge pull request #2238 from aignatov-bio/ai-sci-4101-improve-time-zone-date-format-interaction
Improve time zone and date format interaction at preference page [SCI-4101]
|
2019-11-28 14:54:30 +01:00 |
|
aignatov-bio
|
06a11a4a49
|
Improve time zone and date format interaction at preference page
|
2019-11-27 15:14:40 +01:00 |
|
aignatov-bio
|
a87fc24251
|
UI activtiies fixes
|
2019-11-27 14:04:59 +01:00 |
|
aignatov-bio
|
ad137b47df
|
Merge pull request #2230 from aignatov-bio/ai-sci-4097-fix-dropdown-event-after-back-action
Fix dropdown event after click browser back action [SCI-4097]
|
2019-11-25 13:58:04 +01:00 |
|
aignatov-bio
|
179dea085f
|
Fix dropdown event after click browser back action
|
2019-11-25 11:28:11 +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
|
0b04ca4012
|
Fix markup
|
2019-11-21 12:19:47 +01:00 |
|
aignatov-bio
|
56ae32323c
|
Add autosave for protocol keywords and user preferences
|
2019-11-20 14:57:53 +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 |
|
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
|
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
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +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 |
|
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 |
|
Urban Rotnik
|
bd1c5e4454
|
Fix focus for RTE
|
2019-10-04 14:55:14 +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
|
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
|
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
|
070c307721
|
Implement style changes suggested by Anton
|
2019-09-30 14:27:00 +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
|
b3cafcec7c
|
Add restore draft notification to all models
Close SCI-3751
|
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 |
|
Alex Kriuchykhin
|
53caaf647b
|
Merge pull request #2080 from okriuchykhin/ok_SCI_3891
Move file preview generation to delayed job [SCI-3891]
|
2019-09-27 10:50:21 +02:00 |
|
Anton Ignatov
|
d048b7fb56
|
Fix cancel button for marvinJS images
|
2019-09-26 11:25:34 +02:00 |
|
Jure Grabnar
|
ae83ef749f
|
Add tables functionality in tinymce
Close SCI-3821
|
2019-09-24 12:44:00 +02:00 |
|
Anton Ignatov
|
6d81727bf1
|
Fix dirty event after update marvinjs image
|
2019-09-24 10:37:51 +02:00 |
|
Oleksii Kriuchykhin
|
aabeeec95a
|
Move file preview generation to delayed job [SCI-3891]
|
2019-09-23 21:07:03 +02:00 |
|
aignatov-bio
|
11f6517d0a
|
Fix duplicate marvinjs save (#2057)
|
2019-09-18 11:18:44 +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
|
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 |
|
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 |
|