Commit graph

4424 commits

Author SHA1 Message Date
aignatov-bio
3bb268459f
Merge pull request #1739 from aignatov-bio/ai-sci-3425-add-smart-annotation-to-protocol-description
Fix smart annotation in protocols in repository [SCI-3425]
2019-05-09 15:36:42 +02:00
Alex Kriuchykhin
2a7f70929a
Merge pull request #1717 from okriuchykhin/ok_SCI_3368
Improve clean up of Export All files [SCI-3368]
2019-05-09 13:37:56 +02:00
Anton Ignatov
2e6bab4638 Fix smart anottation to protocols in repository 2019-05-09 09:40:40 +02:00
Oleksii Kriuchykhin
40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +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
bee87f51ba Fix tests 2019-05-08 15:22:06 +02:00
Anton Ignatov
5a5101410c Fix markup 2019-05-08 14:35:28 +02:00
Anton Ignatov
b2063d3018 Fix markup 2019-05-08 14:30:33 +02:00
Anton Ignatov
f201c5440b Add check for old tinymce for report and reassign process 2019-05-08 14:29:25 +02:00
Anton Ignatov
5d959f648e Convert old tinymce assets to new on fly 2019-05-08 14:23:26 +02:00
aignatov-bio
d08bdd771e
Fix task tag cut off (#1734) 2019-05-08 10:21:59 +02:00
Urban Rotnik
62bc0520e9 Update method last_sync_timestamp from Last to First user 2019-05-08 08:38:11 +02:00
Urban Rotnik
2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Urban Rotnik
357c6e6b98 Change ordering by created_at instead by last_time_changed_at 2019-05-08 08:37:34 +02:00
Alex Kriuchykhin
66a563e032
Merge pull request #1733 from okriuchykhin/ok_SCI_3351
Fix deletion of unconfirmed users [SCI-3351]
2019-05-07 16:43:05 +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
e660b64261
Merge pull request #1728 from aignatov-bio/ai-sci-3262-update-export-import-scripts
Update team exporter for new tinyMCE images [SCI-3262]
2019-05-07 16:35:23 +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
Miha Mencin
7760e9611f
Merge pull request #1726 from aignatov-bio/ai-sci-3409-fix-icon-for-uncomplete-task
Fix button icon for uncomplete task [SCI-3409]
2019-05-07 16:34:00 +02:00
Oleksii Kriuchykhin
8461949bed Fix deletion of inconfirmed users [SCI-3351] 2019-05-07 16:02:45 +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
Anton Ignatov
d36160386f Merge branch 'master' into master-with-note-section 2019-05-07 13:26:55 +02:00
Anton Ignatov
7f296b35fa Update team exporter for new tinymce images 2019-05-07 13:22:55 +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
0e1e7c3d82 Fix button icon for uncomplete task 2019-05-06 16:35:46 +02:00
Anton Ignatov
2d4f4ec8f8 Merge branch 'master-with-note-section' into ai-sci-3411-due-date-in-one-line 2019-05-06 16:22:34 +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
Jure Grabnar
c866d96ea7
Merge pull request #1720 from jbargu/jg_sci_3375
One project is duplicated in project list [SCI-3375]
2019-05-06 11:43:24 +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
Oleksii Kriuchykhin
4522e6bf06 Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401] 2019-04-30 17:04:48 +02:00
Jure Grabnar
de6509cc97 Add distinct to #visible_to in project.rb
Closes SCI-3375
2019-04-30 16:40:12 +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
Anton Ignatov
7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
mlorb
9f0983de77
Merge pull request #1706 from mlorb/ml-sci-3350
Change ownership of inventory items, when a user leaves a team [SCI-3350]
2019-04-30 10:39:14 +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
687b53feb1
Add new tag activtiies [SCI-3341] (#1712)
* Add new tag activtiies
2019-04-30 10:23:09 +02:00
Jure Grabnar
b37349624a
Merge pull request #1714 from biosistemika/jg_sci_3380
Add editnew action for editing new office files [SCI-3380]
2019-04-30 09:57:07 +02:00
Jure Grabnar
ed003aca13 Add editnew action for editing new office files
Closes SCI-3380
2019-04-30 08:19:52 +02:00
Oleksii Kriuchykhin
1b792e2b7e Improve clean up of Export All files [SCI-3368] 2019-04-30 00:43:34 +02:00
aignatov-bio
7d197a6f02
Remove gray step headers (#1713) 2019-04-29 14:06:55 +02:00
Mojca Lorber
5fd4c47388 Move change owner functionality to RepositoryRow 2019-04-29 14:02:02 +02:00
Miha Mencin
a16b2cdf03
Merge pull request #1704 from urbanrotnik/ur-sci-3388-icon-for-deleting-is-visible
Hide icon for deleting [SCI-3388]
2019-04-29 10:15:18 +02:00
Oleksii Kriuchykhin
077ad52d4b Fix TinyMCE for results [SCI-3398] 2019-04-26 17:37:01 +02:00
Miha Mencin
970a9b42ed
Update hilightjs github theme path 2019-04-26 17:29:14 +02:00
Urban Rotnik
dba1ccfc34
Merge pull request #1705 from urbanrotnik/ur-sci-3387-office-files-icons
Show icons for office files [SCI-3387]
2019-04-26 15:53:53 +02:00
Urban Rotnik
3b063348ce Hide remove icon and show only on attachment hover 2019-04-26 15:51:35 +02:00
Urban Rotnik
090df87f48
Merge pull request #1703 from urbanrotnik/ur-sci-3382-duplicated-complete-button
Remove duplicated button [SCI-3382]
2019-04-26 15:46:57 +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
Alex Kriuchykhin
c735607930
Merge pull request #1701 from okriuchykhin/ok_SCI_3391
Fix sorting by user name with search parameter in inventories [SCI-3391]
2019-04-26 15:39:48 +02:00
Alex Kriuchykhin
5d85ac0a95
Merge pull request #1702 from okriuchykhin/ok_SCI_3390
Fix loading more activities on task page [SCI-3390]
2019-04-26 15:39:31 +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
mlorb
12564bd070
Merge pull request #1686 from mlorb/ml-sci-3324
Add activity for importing inventory items [SCI-3324]
2019-04-26 15:20:40 +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
Mojca Lorber
9e04eb8ea1 Fixes upon Urbans request 2019-04-26 11:34:53 +02:00
Mojca Lorber
eac90109f7 Change ownership of inventory items, when a user leaves a team 2019-04-26 10:47:08 +02:00
Urban Rotnik
c41413234c Use MS office icons for MS files 2019-04-26 09:29:39 +02:00
Urban Rotnik
c94d3ce950 Remove duplicated button 2019-04-26 07:57:46 +02:00
Alex Kriuchykhin
6bb19ed0be
Merge pull request #1697 from okriuchykhin/ok_SCI_3264
Update limits for new rich text enabled fileds [SCI-3264]
2019-04-25 23:54:05 +02:00
Oleksii Kriuchykhin
66631ba26c Fix loading more activities on task page [SCI-3390] 2019-04-25 23:50:00 +02:00
Oleksii Kriuchykhin
3c1774d330 Fix sorting by user name with search parameter in inventories [SCI-3391] 2019-04-25 16:29:41 +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
Anton Ignatov
e52b985e7b xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes 2019-04-24 13:40:41 +02:00
Oleksii Kriuchykhin
a3f5974dbd Update limits for new rich text enabled fileds [SCI-3264] 2019-04-24 13:37:22 +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
Oleksii Kriuchykhin
88123f5ecd Fix paths for highlightjs-github-theme [SCI-3377] 2019-04-24 12:35:01 +02:00
Oleksii Kriuchykhin
7c91b4a255 Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266 2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin
c7a707f9db Fix task clonning with TinyMCE images [SCI-3266] 2019-04-23 15:16:40 +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
b1dabaca15 New helper for file thumbnails 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
Jure Grabnar
1da1558849
Merge pull request #1683 from jbargu/jg_3179
Archived results are now separated in exported project
2019-04-19 18:26:22 +02:00
aignatov-bio
6968060078
Fix user order bug (#1687) 2019-04-19 15:24:13 +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
aignatov-bio
a75c4c2f91
Update Result API for new tiny mce image format (#1674) 2019-04-19 14:44:16 +02:00
Mojca Lorber
b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Anton Ignatov
f1d801117d disable zoom 2019-04-18 09:11:27 +02:00
Alex Kriuchykhin
8fa6bbc0ab
Merge pull request #1679 from okriuchykhin/ok_SCI_3177
Improve experiment preview image generation [SCI-3177]
2019-04-17 20:35:29 +02:00
Anton Ignatov
f6ecea42cf Remove minimum zoom size 2019-04-17 18:51:52 +02:00
Jure Grabnar
1295c0583a Archived results are now separated in exported project
Closes SCI-3179
2019-04-17 16:37:21 +02:00
Alex Kriuchykhin
b4cf665c21
Merge pull request #1673 from okriuchykhin/ok_SCI_3294
Fix team export/import for new activities [SCI-3294]
2019-04-17 12:49:45 +02:00
Oleksii Kriuchykhin
f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Urban Rotnik
3f037ef517 Fix navigationJS team switch when have only 1 team 2019-04-17 09:58:18 +02:00
Urban Rotnik
782d1dfc2d
Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2
Exports left after export [SCI-3345]
2019-04-16 14:44:48 +02:00
Urban Rotnik
4f8faba84e Exports left after export fix 2019-04-16 14:21:47 +02:00
Urban Rotnik
0ba0dccd57
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix
Fix for exports_left, fix for some edge cases [SCI-3345]
2019-04-16 10:32:31 +02:00
Urban Rotnik
22af36dd2d Fix for exports_left, fix for some edge cases 2019-04-16 09:59:02 +02:00
Oleksii Kriuchykhin
2320941b5d Fix team export/import for new activities [SCI-3294] 2019-04-15 15:13:10 +02:00
mlorb
1e3d0e901a
Merge pull request #1667 from mlorb/ml-sci-3304
Fix links in activity message for protocols in repository [SCI-3304]
2019-04-15 11:55:08 +02:00
aignatov-bio
4fec72bc46
Merge pull request #1671 from aignatov-bio/ai-sci-3319-duplicate-activity-wronglink
Fix duplicate activity issue and fix link to inventory [SCI-3319]
2019-04-15 11:51:09 +02:00
Urban Rotnik
7eeba0e57e
Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix
Dynamic filtering default fix [SCI-3343]
2019-04-15 11:40:16 +02:00
Anton Ignatov
dd8b3caf65 Fix duplicate activtiy issue and fix link to inventory 2019-04-15 11:35:30 +02:00
Urban Rotnik
83f2a5c961 Dynamic filtering default fix 2019-04-15 11:20:43 +02:00
Alex Kriuchykhin
a61d637e6d
Merge pull request #1669 from okriuchykhin/ok_SCI_3340
Fix crash when no activities present [SCI-3340]
2019-04-15 11:13:25 +02:00
Oleksii Kriuchykhin
a43e42fdb3 Fix crash when no activities present [SCI-3340] 2019-04-15 10:51:59 +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
252fdaf9a8 Fix links in activity message for protocols in repository 2019-04-12 15:14:41 +02:00
mlorb
538b48cb06
Merge pull request #1666 from mlorb/ml-sci-3331
Rename button load more system notification to fix the bug [SCI-3331]
2019-04-12 13:24:16 +02:00
Jure Grabnar
be90881849
Merge pull request #1665 from jbargu/jg_sci_2949_3318
Disable editing of office file in view mode when module is locked [SCI-2949, 3318]
2019-04-12 13:00:18 +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
8ba0555922
Add check for tasks complete in project notifications (#1657) 2019-04-12 09:17:34 +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
Jure Grabnar
1e5721ce95 Disable editing of office file in view mode when module is locked
Closes SCI-2949
2019-04-11 17:21: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
eb6de67cb7
Merge pull request #1660 from jbargu/jg_sci_3302
Date activity filter filters out activity after reaching bottom of the page [SCI-3302]
2019-04-11 10:46:53 +02:00
aignatov-bio
9377628f5e
Release team space after update image [SCI-3299] (#1656)
* Release team space after update image
2019-04-11 09:20:05 +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
aignatov-bio
cfbb2a83a6
Merge pull request #1650 from aignatov-bio/ai-sci-3295-update-api-endpoints-new-activities
Update API endpoints for new activities [SCI-3295]
2019-04-10 13:46:30 +02:00
Mojca Lorber
c8ddae4d1e Fix activity card visuals 2019-04-10 12:37:13 +02:00
Urban Rotnik
caccf8d9f0 Reset counter for export in last 24 hours
Fix for check if user has avaiable exports, bit refactored increas_counter method.
2019-04-10 10:56:33 +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
Anton Ignatov
811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
Urban Rotnik
26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Jure Grabnar
bc9eff2ef5 Add asset validation on wopi creation
Missing file
2019-04-04 17:05:25 +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