scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-19 15:41:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
15600 commits 31 branches 181 tags 166 MiB
Commit graph

877 commits

Author SHA1 Message Date
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018) 
* Add PDF Preview [SCI-5299]
 2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Alex Kriuchykhin
7a4f60f25e
Merge pull request #2989 from mlorb/ml-sci-5240 
[SCI-5240] Implement Create new folder function
 2020-12-04 09:57:05 +01:00
mlorb
9693f84bbd
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968) 
* Implement actions dropdown on project card
* make comments counter to work
 2020-12-04 09:38:34 +01:00
Mojca Lorber
d7e3b57d0d [SCI-5240] Implement Create new folder function 2020-12-01 09:59:08 +01:00
aignatov-bio
c6f4d23a78 Fix protocol preview file background 2020-11-26 15:35:06 +01:00
aignatov-bio
60359b595c Add button disabling 2020-11-26 14:37:12 +01:00
aignatov-bio
b0ebdceb08 Fix typo 2020-11-26 14:04:26 +01:00
aignatov-bio
1979883004 Add delete asset confirmation modal 2020-11-25 12:50:34 +01:00
Mojca Lorber
2a8c98b7ec Implement ESC button to exit full-screen modals 2020-11-24 23:20:53 +01:00
aignatov-bio
2449f2b500 Fix smart annotation for comments 2020-11-21 12:34:36 +01:00
aignatov-bio
77b7b1b231 Add errors handling and i18n 2020-11-21 12:31:49 +01:00
aignatov-bio
60ce51149d Add CRUD to comments 2020-11-20 20:25:28 +01:00
aignatov-bio
da4b8aaf2f Add comments list 2020-11-20 12:29:40 +01:00
aignatov-bio
483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
aignatov-bio
2294d396f9 Add comments sidebar layout 2020-11-18 16:26:01 +01:00
aignatov-bio
12fdea8d89 Add context menu to attahcments 2020-11-04 13:08:40 +01:00
Oleksii Kriuchykhin
8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +01:00
Mojca Lorber
8aed48d1ae Merge branch 'develop' into features/office-file-previews 2020-11-02 13:45:06 +01:00
aignatov-bio
12991e8fd3 Commit add asset preview mode switcher to step 2020-10-29 16:42:05 +01:00
aignatov-bio
f51416d83a Update permission markup 2020-10-29 14:59:14 +01:00
aignatov-bio
131d487e69 Add file preview to list view 2020-10-29 14:30:26 +01:00
aignatov-bio
d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
aignatov-bio
c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Urban Rotnik
bb5c703696
Merge pull request #2878 from urbanrotnik/ur-sci-5040 
Support multiple file upload in TinyMCE fields [SCI-5040]
 2020-10-29 14:14:38 +01:00
Urban Rotnik
54f38c8ded Move validation before request 2020-10-29 08:45:55 +01:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
aignatov-bio
016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
aignatov-bio
0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
Urban Rotnik
fc8704b520 Add fileUtils for sizeCheck, add url to textarea data attribute 2020-09-30 13:20:11 +02:00
Urban Rotnik
dc0072e707 Support multiple file upload in TinyMCE fields 2020-09-29 08:21:31 +02:00
aignatov-bio
780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
aignatov-bio
4f7814cff4 Fix markup 2020-09-24 13:32:43 +02:00
aignatov-bio
ff33cb45e0 Improve smart annotation in TinyMCE fields 2020-09-24 13:29:20 +02:00
aignatov-bio
b6f038ff09
Merge pull request #2863 from aignatov-bio/ai-sci-5037-update-regexp-for-smart-annotation 
Update regexp for smart annotation [SCI-5037]
 2020-09-23 16:39:24 +02:00
aignatov-bio
e4b94b582a Add dynamic render of wopi files in viewport 2020-09-23 12:32:46 +02:00
aignatov-bio
d719c26b6c Add error handling for MarvinJS 2020-09-23 12:26:26 +02:00
aignatov-bio
21dcf1157c Update regexp for smart annotation 2020-09-23 11:13:59 +02:00
aignatov-bio
7fa98de1da
Merge pull request #2859 from aignatov-bio/ai-sci-5036-fix-smart-annotation-cursor-position 
Fix smart annotation cursor position [SCI-5036]
 2020-09-23 10:11:13 +02:00
mlorb
547af538b3
Merge pull request #2856 from mlorb/ml-sci-5009 
Update empty states for smart annotation results and dismiss button [SCI-5009]
 2020-09-22 15:31:22 +02:00
Mojca Lorber
8b3fce9656 Move it again 2020-09-22 11:38:32 +02:00
Mojca Lorber
0ad93d1288 Move close modal function to global event 2020-09-22 11:30:05 +02:00
aignatov-bio
fd7773a3dc Fix smart annotation cursor position 2020-09-22 10:15:01 +02:00
Mojca Lorber
d9a78d20d7 Update empty states for smart annotation results and dismiss button 2020-09-18 08:50:01 +02:00
aignatov-bio
644f30fb10 Fix syntax for uglifier 2020-09-17 15:35:12 +02:00
aignatov-bio
e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio
8dbc69aa31 Remove console.log 2020-09-17 14:48:26 +02:00
aignatov-bio
f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
aignatov-bio
b4102f3cfd Add try/cath for JSON.parse 2020-09-17 11:43:08 +02:00
aignatov-bio
9cb26a1cb9 Fix markup 2020-09-17 11:43:08 +02:00
aignatov-bio
3691d21215 Fix multiple smart annotation selected 2020-09-17 11:43:08 +02:00
aignatov-bio
86667feb6b Add remembered state for smart annotation 2020-09-17 11:43:07 +02:00
Mojca Lorber
9cd8e3b7ac Change default status values, add project and experiment to saved state and fix parsing error handeling 2020-09-16 09:48:06 +02:00
aignatov-bio
67d3a1ad12 Fix markup 2020-09-15 12:06:20 +02:00
aignatov-bio
6dc4422d82 Fix markup 2020-09-15 11:56:44 +02:00
Mojca Lorber
13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +02:00
aignatov-bio
008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio
7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
Urban Rotnik
0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state 
Add error message for locked task, update some permission checks[SCI-4982]
 2020-09-09 14:04:08 +02:00
aignatov-bio
661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio
f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
Urban Rotnik
d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Mojca Lorber
9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
aignatov-bio
c07ebe90fa Add migration for task states 2020-08-27 11:34:59 +02:00
aignatov-bio
21e4dcd96a Add wopi preview for office files 2020-08-25 13:22:36 +02:00
aignatov-bio
5360db76be Fix dropdrown selector 2020-08-12 14:00:10 +02:00
Urban Rotnik
073979534c
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 16:43:05 +02:00
Urban Rotnik
e221d960e7 Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" 
This reverts commit 8b6d57058c, reversing
changes made to 957ac92669.
 2020-08-04 15:07:22 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik
cce76f6f0f
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults 
Add ordering for result page [SCI-4895]
 2020-08-04 11:17:43 +02:00
Urban Rotnik
ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items 
Add export for assigned items [SCI-4748]
 2020-08-03 11:30:31 +02:00
aignatov-bio
536367362c Add statuses to dashboard filters 2020-07-31 10:59:10 +02:00
aignatov-bio
15b5f9bb68 Add ordering for result page 2020-07-28 15:39:29 +02:00
aignatov-bio
1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
aignatov-bio
e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber
9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00
aignatov-bio
6245e19069
Merge pull request #2718 from biosistemika/master 
Merge master to develop
 2020-07-09 12:56:31 +02:00
aignatov-bio
630bef1adf Add special characters to smart annotation 2020-06-29 14:47:35 +02:00
Miha Mencin
6db1401759
Merge pull request #2670 from aignatov-bio/ai-sci-4745-fix-manage-column-dropdown-position 
Fix dropdown position for full-screen modals [SCI-4745]
 2020-06-29 09:43:13 +02:00
aignatov-bio
6a41290d9d Add tables to TinyMce and small table improvments 2020-06-24 15:51:59 +02:00
aignatov-bio
4f8a612106 add new line 2020-06-24 15:25:34 +02:00
aignatov-bio
a3ea0927c9 Revert helper JS to es5 2020-06-24 15:12:13 +02:00
aignatov-bio
80970b6448 Remove hashes from datatable helper 2020-06-24 14:39:33 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik
193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
aignatov-bio
6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
aignatov-bio
7f9af06f78 Fix dropdown position for full screen modals 2020-06-18 13:29:28 +02:00
aignatov-bio
2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
aignatov-bio
15de84ff2f Not include marvinJS library, if marvinJS disabled 2020-06-08 09:59:26 +02:00
Urban Rotnik
9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
Urban Rotnik
4fc37e12a0 Fix dropdown render for columns manage modal 2020-06-01 18:41:58 +02:00
aignatov-bio
f7a215c953 Fix escape issue in dropdowns 2020-05-28 10:55:36 +02:00
aignatov-bio
9973151278
Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field 
Fix new comment field [SCI-4662]
 2020-05-25 09:09:33 +02:00
aignatov-bio
8161bbb31c Fix new comment field 2020-05-22 16:51:11 +02:00
aignatov-bio
3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Oleksii Kriuchykhin
bc1ee1bd8d Fix error message for file upload limit on steps [SCI-4645] 2020-05-18 16:16:39 +02:00
aignatov-bio
820514789d Update tinymce gem version 2020-05-17 17:36:26 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
af4ac7c53b Add const to dropdown library 2020-05-14 16:29:50 +02:00
aignatov-bio
309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +02:00
aignatov-bio
cbaaa7413c Fix smart annotation position for horizontal scroll 2020-05-13 12:45:22 +02:00
aignatov-bio
d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
 2020-05-08 12:39:28 +02:00
aignatov-bio
dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Urban Rotnik
276351bbed Remove Tooltips JS code 2020-04-28 12:51:59 +02:00
aignatov-bio
b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio
37304df878 Fix markup 2020-03-19 15:48:45 +01:00
aignatov-bio
b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
aignatov-bio
1d02ba5ebf Open unsaved TinyMce editor 2020-03-18 16:03:36 +01:00
Alex Kriuchykhin
2a2e479cd3
Merge pull request #2470 from okriuchykhin/ok_SCI_4408 
Enable time fraction for task due date [SCI-4408]
 2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin
a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
aignatov-bio
b9a0fb47de Add total size validation check to result files 2020-03-12 11:50:31 +01:00
aignatov-bio
d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout 
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
 2020-03-12 11:26:23 +01:00
Miha Mencin
26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard 
Features/dashboard
 2020-03-10 18:06:23 +01:00
Miha Mencin
9836a8b5a2
Merge pull request #2434 from aignatov-bio/ai-sci-4352-inventory-item-is-not-saved-in-case-of-empty-dropdown 
Prevent create empty dropdown in inventories [SCI-4352]
 2020-03-10 12:35:00 +01:00
Alex Kriuchykhin
769ba76afa
Merge pull request #2445 from okriuchykhin/ok_SCI_4379 
Improve file upload checks [SCI-4382]
 2020-03-10 09:47:23 +01:00
Miha Mencin
62b934f012 Merge branch 'develop' into features/dashboard 2020-03-09 09:56:32 +01:00
aignatov-bio
e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
aignatov-bio
7d7cdce91a Add file size limitation to tinyMCE 2020-03-03 15:55:17 +01:00
Oleksii Kriuchykhin
11a5536af5 Improve file upload checks [SCI-4382] 2020-03-03 15:26:40 +01:00
Mojca Lorber
52493fd834 Add pagination for current tasks on dashboard 2020-03-03 12:07:21 +01:00
Oleksii Kriuchykhin
03f08c4c06 Merge branch 'hotfix/1.18.4' into develop 2020-03-02 11:56:45 +01:00
Oleksii Kriuchykhin
73623da02c Merge branch 'develop' into features/dashboard 2020-02-28 16:46:56 +01:00
Alex Kriuchykhin
b83cbf33a7
Merge pull request #2408 from aignatov-bio/ai-sci-4345-file-results-bug 
Fix files handling in results [SCI-4345]
 2020-02-28 16:40:05 +01:00
aignatov-bio
c4be9bca2f Fix files handling in results 2020-02-28 14:55:13 +01:00
Oleksii Kriuchykhin
b4a8a7ba72 Switch to serial multiple file uploads for better compatibility [SCI-4404] 2020-02-27 16:58:00 +01:00
aignatov-bio
b2580c1704 Prevent create empty dropdown in inventories 2020-02-27 13:10:00 +01:00
aignatov-bio
f11b051715 Merge branch 'develop' into features/dashboard 2020-02-19 10:29:50 +01:00
aignatov-bio
47a86f2cf9 Hide tooltip if parent object disabled or hidden 2020-02-18 15:40:05 +01:00
aignatov-bio
ff45b17b53 Fix localization and small markup fixes 2020-02-17 15:32:43 +01:00
aignatov-bio
a438f6b4f0 Finished filters 2020-02-17 10:47:10 +01:00
mlorb
618aa698d5
Merge pull request #2407 from mlorb/ml-sci-4329 
Fix adding too small/big number to input... [SCI-4329]
 2020-02-14 10:40:20 +01:00
aignatov-bio
5200096f69
Merge pull request #2400 from aignatov-bio/ai-sci-4312-improve-search-for-dropdown 
Improve search input field in the flyouts [SCI-4312]
 2020-02-12 14:16:06 +01:00
Mojca Lorber
0f67ce78c0 Fix adding too small/big number to input for decimals for number repo column type 2020-02-12 12:14:58 +01:00
Oleksii Kriuchykhin
5be4ffb139 Fix multiple file result creation [SCI-4346] 2020-02-11 20:08:36 +01:00
aignatov-bio
26783e64da Fix protocols table CSS 2020-02-11 15:58:17 +01:00
aignatov-bio
eaf751bad6 Improve search input field in the flyouts 2020-02-11 15:01:52 +01:00
mlorb
c1aa269afc Merge pull request #2392 from mlorb/ml-sci-4313 
Add empty option in dropdown selector [SCI-4313]
 2020-02-10 10:32:03 +01:00
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
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
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +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
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
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
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
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
d8d04b89cd
Fix autosave issue in mozzila (#1925) 2019-07-12 11:15:45 +02:00
aignatov-bio
70589126c3
Fix autosave for steps (#1926) 2019-07-12 10:16:49 +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
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
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +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
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
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
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
57ef9573f2 Fix comments counter for zero comments 2019-06-21 10:43:41 +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
Anton Ignatov
a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +02:00
aignatov-bio
da8d748c49
Fix small comments bugs (#1832) 2019-06-14 16:20:47 +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
Oleksii Kriuchykhin
a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +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
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
fb30e6b6e5
Add check for refreshProtocolStatusBar function exist (#1794) 2019-05-22 10:31:29 +02:00
Oleksii Kriuchykhin
84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +02:00
aignatov-bio
d97e803d01
Adding placeholder to TinyMCE editor (#1788) 2019-05-21 15:53:47 +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
Mojca Lorber
b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +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
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
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
Oleksii Kriuchykhin
b60bd79e2b Change implementation of TinyMCE floating toolbar [SCI-3439] 2019-05-13 10:26:15 +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
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
dcf94e78e1 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-08 14:03:41 +02:00
Anton Ignatov
826ed63f17 Fix floating tool bar and scroll issue after leaving editor 2019-05-07 15:21:15 +02:00
aignatov-bio
7d54f2ab01
Fix issue with TInyMCE upload plugin (#1723) 2019-05-07 10:24:02 +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
Anton Ignatov
565a4959b4 small fixes and improvments 2019-05-03 15:24:28 +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
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
aignatov-bio
9fbfa9215e
Add zoom to image annotation [SCI-3374] (#1694) 
* Add zoom to image annotation
 2019-04-26 15:21:01 +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
ea0368aa11 Attachments update for edit page 2019-04-23 13:50:47 +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
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
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
aignatov-bio
a086f88541
Disable save button while image loading (#1646) 2019-04-09 09:07:58 +02:00
Oleksii Kriuchykhin
9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +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
Anton Ignatov
c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +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
Anton Ignatov
46ee2557d4 Fix tooltip stuck bug 2019-03-27 13:53:32 +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
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
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
aignatov-bio
a0a3c4b97f
Fix file format bug (#1569) 2019-03-19 11:06:36 +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
af94f79f0d Submit image as FormData [SCI-2879] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
feb75f62e1 Add workaround for image caching in fabric js [SCI-2855] 2019-03-11 15:10:32 +01:00