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 |
|
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 |
|