396 commits

Author	SHA1	Message	Date
Urban Rotnik	a15596a126	Add ImportProtocolService	2019-06-17 12:24:10 +02:00
Urban Rotnik	aadf2eecb4	Basic data normalizer for ProtocolIO	2019-06-17 12:24:08 +02:00
Jure Grabnar	c1cee07a63	Extract API client constants to constants.rb	2019-06-17 12:24:08 +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
Jure Grabnar	27edafaafb	Fix unlinked file in processing image quality	2019-06-09 09:20:43 +02:00
Oleksii Kriuchykhin	e543a849d4	Add document file preview generation with LibreOffice [SCI-3145]	2019-06-05 14:52:30 +02:00
Oleksii Kriuchykhin	01a5a17bb4	Update Handsontable to 6.2.2 [SCI-3526]	2019-06-04 14:31:37 +02:00
Luka Murn	3a2bf2ce8a	Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup ... Add a startup check for WOPI_ENABLED == true variables	2019-05-22 16:56:55 +02:00
Luka Murn	5c88e9ab7e	Fix 'if..' logic to work properly when WOPI_ENABLED is undefined	2019-05-22 16:36:23 +02:00
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
Luka Murn	4136aa0575	Add a startup check for WOPI_ENABLED == true variables	2019-05-18 10:22:53 +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
aignatov-bio	0b194eb3b1	Revert "Fix report saving (#1748)" (#1752) ... This reverts commit 3db6129808.	2019-05-13 09:09:36 +02:00
aignatov-bio	3db6129808	Fix report saving (#1748)	2019-05-13 08:58:47 +02:00
Luka Murn	890df8803e	Add file name validation to create new Office file modal window	2019-05-10 18:19:32 +02:00
Anton Ignatov	7c55fcf0cf	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
aignatov-bio	687b53feb1	Add new tag activtiies [SCI-3341] (#1712) ... * Add new tag activtiies	2019-04-30 10:23:09 +02:00
aignatov-bio	dc7fddc60a	Improve task tags (#1708)	2019-04-26 15:38:33 +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	11a7a975af	Merge branch 'features/scinote-improvements' into master-with-note-section	2019-04-23 14:50:03 +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	6b45dcd475	Update eln export for new tinyMCE image format (#1680)	2019-04-19 14:44:40 +02:00
Mojca Lorber	b00cf07684	Add activity for importing inventory items	2019-04-18 15:18:10 +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
Mojca Lorber	501c46bc92	Remove activities that belong to addons	2019-04-05 16:25:22 +02:00
Jure Grabnar	613843d095	Temp commit	2019-04-04 16:58:55 +02:00
Jure Grabnar	7136294386	Remove archive_task from the list of activity_types ... Closes SCI-3288	2019-04-03 19:13:00 +02:00
Oleksii Kriuchykhin	9e91e9e59d	Improve large image saving after editing [SCI-3289]	2019-04-03 16:31:56 +02:00
Jure Grabnar	22d193114e	Add asset to activity message item type ... Closes SCI-3283	2019-04-02 16:10:20 +02:00
aignatov-bio	e6102c72c7	Adding missed activities [SCI-3253] (#1614) ... * Adding missed activties * Adding test for activities	2019-04-02 11:50:37 +02:00
Urban Rotnik	b91f08fe99	Add activity for copying Inventory and Invetory item	2019-04-01 15:40:00 +02:00
Mojca Lorber	3c69225d6b	Change activities for task protocols	2019-03-29 15:09:20 +01:00
aignatov-bio	5c8f976ad1	Adding missed project comment activities [SCI-3250] (#1612) ... * Adding missed project comment activities * Fix markup	2019-03-29 11:45:31 +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
Mojca Lorber	f06358b2ae	Implement missing tests for global activities (task and protocol activities)	2019-03-27 11:24:44 +01:00
aignatov-bio	54fd3a748b	Adding activity groups [SCI-3203] (#1588) ... * Adding activty groups	2019-03-26 15:29:21 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +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	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Mojca Lorber	4f9814b884	Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021	2019-03-20 11:03:00 +01:00
Mojca Lorber	cd7a87348f	Protocol activities refactoring, without tests	2019-03-19 16:12:07 +01:00
Mojca Lorber	1418abc8d7	Reports activities refactoring	2019-03-19 15:33:57 +01:00
Urban Rotnik	fe35c805b7	Add model breadcrumbs, update activities_helper	2019-03-19 14:01:06 +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
Luka Murn	fc4b271803	Fix stack trace trimming on WOPI middleware	2019-03-14 08:34:04 +01:00
Urban Rotnik	32422c00eb	RepositoryRows actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	1a3c97b978	Add new enum values for Activity type_of	2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin	af94f79f0d	Submit image as FormData [SCI-2879]	2019-03-11 15:13:08 +01:00