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

5764 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Ignatov 31c6802a06 Add support for marvinjs on service 2019-06-23 00:09:49 +02:00
Anton Ignatov 8240c8baad Initial refactoring for remote api support 2019-06-22 01:51:59 +02:00
Anton Ignatov 7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Alex Kriuchykhin db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436 
Implement saving of attachments ordering on steps [SCI-3436]
 2019-06-20 11:31:15 +02:00
aignatov-bio a00ec02983
Add tests for edit WOPI activities [SCI-3238] (#1822) 
* Add tests for edit wopi activities
 2019-06-20 09:31:29 +02:00
Oleksii Kriuchykhin f2b617ac12 Fix code formatting [SCI-3436] 2019-06-19 14:23:12 +02:00
Oleksii Kriuchykhin ae1a63037b Raise an exception if required methods for ViewableModel are not implemented [SCI-3436] 2019-06-19 14:17:17 +02:00
Anton Ignatov dae5a661c9 Merge branch 'master' of https://github.com/biosistemika/scinote-web 2019-06-19 14:11:51 +02:00
aignatov-bio 83b9efd7dd Fix right floating images in RTE editor (#1842) 2019-06-19 14:06:33 +02:00
aignatov-bio 609c408c77 Fix error on new step saving command (#1845) 2019-06-19 14:06:25 +02:00
aignatov-bio 5734d0cdd7 Fix TinyMCE field selector for steps (#1844) 2019-06-19 14:06:16 +02:00
aignatov-bio 4ddcbe5d75 Fix user permission for recent protocols (#1843) 2019-06-19 14:06:02 +02:00
aignatov-bio 9653f16196
Convert image to base64 in PDF reports [SCI-3557] (#1835) 
* Convert image to base64 in PDF reports

* Fix typo error
 2019-06-19 13:57:04 +02:00
aignatov-bio 81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
aignatov-bio fb3b7918af
Fix handson table issue (#1827) 2019-06-14 16:21:27 +02:00
aignatov-bio 2dfbdacfa3
Change restore button background (#1829) 2019-06-14 16:21:01 +02:00
aignatov-bio da8d748c49
Fix small comments bugs (#1832) 2019-06-14 16:20:47 +02:00
aignatov-bio 68937dd192
Fix RTE import for protocol repository (#1833) 2019-06-14 16:20:27 +02:00
aignatov-bio 7a3eedf461
Adding missing avatars to comments (#1838) 2019-06-14 16:20:13 +02:00
aignatov-bio 52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800) 
* Add recent protocols dropdown to task page
 2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin 097639e71e Fix view state validation [SCI-3436] 2019-06-13 14:28:46 +02:00
Jure Grabnar 0f359e98d8
Rename default libreoffice to soffice binary (#1834) 
Rename default libreoffice to soffice binary
 2019-06-13 11:49:52 +02:00
Jure Grabnar 5cb517e021 Rename default libreoffice to soffice binary 2019-06-13 11:32:11 +02:00
Alex Kriuchykhin 599274eb13
Merge pull request #1830 from okriuchykhin/ok_SCI_3528 
Make repositories more extendable [SCI-3528]
 2019-06-13 09:45:18 +02:00
Alex Kriuchykhin bc94771828
Merge pull request #1791 from okriuchykhin/ok_SCI_3461 
Refactor the async thumbnail reloading (spinner) [SCI-3461]
 2019-06-12 15:35:15 +02:00
Alex Kriuchykhin 4f851b0995
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller 
Fix nil issue in tags_my_module controller [SCI-3525]
 2019-06-12 13:11:40 +02:00
Oleksii Kriuchykhin a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin 4d579db2e2 Refactor assets polling to use setTimeout [SCI-3461] 2019-06-11 13:14:07 +02:00
mlorb fa28e772f0
Merge pull request #1807 from mlorb/ml-sci-3508 
Fix some css on step panel heading [SCI-3508]
 2019-06-11 11:12:12 +02:00
Oleksii Kriuchykhin 6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
Jure Grabnar bbfe2b9c89
Merge pull request #1798 from biosistemika/jg_sci_3145_thumbnail_preview 
File preview on new attachments layout [SCI-3145]
 2019-06-10 17:59:12 +02:00
Jure Grabnar 56949db9da Move extract_image_quality to before_post_process 2019-06-10 17:48:00 +02:00
Jure Grabnar c2d615ab48 Remove image quality preprocessor 2019-06-10 15:10:07 +02:00
Urban Rotnik 4d83955a61
Merge pull request #1737 from urbanrotnik/ur-sci-3183-add-missing-factories 
Add Missing Factories [SCI-3183]
 2019-06-10 12:56:56 +02:00
Urban Rotnik bbe0062bfd Small fixes for factories 2019-06-10 12:24:05 +02:00
Urban Rotnik 1bae169ab0 Delete duplicaed user_project factory 2019-06-10 12:24:05 +02:00
Urban Rotnik 965b7eb58b Add missing factories 2019-06-10 12:24:04 +02:00
Urban Rotnik 17f987e7c8 Add rubocop-perfromance after Rubocop has been updated 2019-06-10 12:24:04 +02:00
Urban Rotnik f19eeba8dc Add factory valid check for User's associations 2019-06-10 12:24:04 +02:00
Urban Rotnik ba340f7bee Add valid factory check for Table, Tag, Team 2019-06-10 12:24:03 +02:00
Urban Rotnik 9348886fb1 Minior changes in SystemNotifications tests 2019-06-10 12:24:03 +02:00
Urban Rotnik 15cbd8864c Add valid factory check to Steps models 2019-06-10 12:24:03 +02:00
Urban Rotnik 1e60102a7d Add valid factory check for Sample(s) models 2019-06-10 12:24:02 +02:00
Urban Rotnik c66aa29227 Add valid factory check for Result(s) models 2019-06-10 12:24:02 +02:00
Urban Rotnik 3adf2bb736 Add factories and validation tests for repositories and related models 
Repositories, cells, columns, values (date, text, asset, list), rows, items
 2019-06-10 12:24:02 +02:00
Urban Rotnik a7558d83be Add valid factory check for Project, MyModules, notification, protocol 2019-06-10 12:24:01 +02:00
Urban Rotnik 3348b81b14 Checklist, checklist_item, activity, experiment spec and factories updated 2019-06-10 12:24:01 +02:00
Urban Rotnik 6321c0f5c0 Assets spec and factories updated 2019-06-10 12:24:01 +02:00
Mojca Lorber ca1b91a409 css fix again 2019-06-10 11:23:40 +02:00
Jure Grabnar a5b88a4b50 Update Dockerfile with lsb_release 2019-06-09 09:43:56 +02:00