scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5632 commits 70 branches 179 tags 165 MiB
Commit graph

5632 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 09d1946b19
Merge pull request #1655 from urbanrotnik/ur-overcommit-config-update 
Enable ScssLint
 2019-04-25 14:56:56 +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
aignatov-bio 7ec6faddc7
Merge pull request #1 from urbanrotnik/urbanrotnik-ur-sci-3135-comments-section-changes 
Urbanrotnik ur sci 3135 comments section changes
 2019-04-25 11:25:30 +02:00
Anton Ignatov 0779ed598b Reuse inline editing logic 2019-04-25 11:14:55 +02:00
Oleksii Kriuchykhin 8bec85c7b9 Switch to memory_store for caching in production [SCI-3182] 2019-04-24 19:17:31 +02:00
Oleksii Kriuchykhin 260782e233 Update tests for new rich text enabled fileds [SCI-3264] 2019-04-24 13:45:29 +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
Alex Kriuchykhin 43d8413496
Merge pull request #1696 from okriuchykhin/ok_SCI_3377 
Fix paths for highlightjs-github-theme [SCI-3377]
 2019-04-24 12:51:52 +02:00
Oleksii Kriuchykhin 88123f5ecd Fix paths for highlightjs-github-theme [SCI-3377] 2019-04-24 12:35:01 +02:00
Alex Kriuchykhin d5ad16b501
Merge pull request #1695 from okriuchykhin/ok_SCI_3377 
Fix build of JS packages [SCI-3377]
 2019-04-24 11:34:40 +02:00
Oleksii Kriuchykhin d1e869a4c5 Fix build of JS packages [SCI-3377] 2019-04-24 11:26:03 +02:00
Alex Kriuchykhin 48bdc880f5
Merge pull request #1693 from okriuchykhin/ok_SCI_3266 
Fix task clonning with TinyMCE images [SCI-3266]
 2019-04-23 17:02:52 +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 55bb9d06c4
Merge pull request #1652 from urbanrotnik/ur-sci-3136-changes-to-appearance-of-attachment-section 
Changes to attacmhemnts on step [SCI-3136] [SCI-3167]
 2019-04-23 14:17:59 +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 6ac620feb3
Migration for old tinymce assets [SCI-3176] (#1663) 
* adding rake task

* Addign test for update images

* Adding tests for tiny mce model
 2019-04-19 15:24:54 +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 208b7c9939 Fix hound 2019-04-19 13:56:21 +02:00
Mojca Lorber 36e7cfe5c4 Change failing tests 2019-04-19 13:37:52 +02:00
Mojca Lorber b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Miha Mencin be31cc373d
Update Version 
to 1.16.2
 2019-04-18 10:22:35 +02:00
aignatov-bio 1da0a3c6ef
Merge pull request #1685 from aignatov-bio/ai-disable-zoom 
disable zoom
 2019-04-18 09:15:27 +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
aignatov-bio f6c04c252e
Merge pull request #1684 from aignatov-bio/ai-fix-ie-zoom-out 
Remove minimum zoom size
 2019-04-17 18:58:38 +02:00
Anton Ignatov f6ecea42cf Remove minimum zoom size 2019-04-17 18:51:52 +02:00
Miha Mencin 7e699ce648
Update Version 
to 1.16.1
 2019-04-17 18:17:05 +02:00
Jure Grabnar 1295c0583a Archived results are now separated in exported project 
Closes SCI-3179
 2019-04-17 16:37:21 +02:00