Commit graph

1703 commits

Author SHA1 Message Date
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
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
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
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
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
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