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