203 commits

Author	SHA1	Message	Date
Miha Mencin	ab9b7a7429	Merge pull request #1902 from biosistemika/release-1.16.6 ... Merge 'release-1.16.6' into 'master'	2019-07-08 12:49:40 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
aignatov-bio	88dc2dcdd0	Hot fix for TinyMCE asset permission check (#1896) ... * Hot fix for TimyMCE asset permission check	2019-07-04 15:59:11 +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
Oleksii Kriuchykhin	6e1a7a3392	Implement saving of attachments ordering on steps [SCI-3436]	2019-06-11 10:08:33 +02:00
aignatov-bio	0b3b6d593b	Small style fixes [SCI-3498] (#1799) ... * Adding error, if TinyMCE asset not in text, when we copy anything * Small style fixes	2019-05-27 16:27:27 +02:00
aignatov-bio	0f86ebf173	Adding error, if TinyMCE asset not in text, when we copy anything [SCI-3495] (#1797) ... * Adding error, if TinyMCE asset not in text, when we copy anything	2019-05-22 16:13:40 +02:00
aignatov-bio	b22dba7f05	Add delay job for handling unknown tinyMCE images (#1781) ... * Add delay job for handling unknown tinyMCE images	2019-05-20 12:44:16 +02:00
aignatov-bio	f1f04adeb2	Fix placeholder in protocol description [SCI-3454] (#1769) ... * Fix placeholder in protocol description * Change task tags text	2019-05-15 14:13:13 +02:00
aignatov-bio	1555daa0c6	Fix non associated tinyMCE images (#1762) ... * Fix non assosiated tinyMCE images	2019-05-14 15:01:57 +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
Anton Ignatov	5a5101410c	Fix markup	2019-05-08 14:35:28 +02:00
Anton Ignatov	b2063d3018	Fix markup	2019-05-08 14:30:33 +02:00
Anton Ignatov	f201c5440b	Add check for old tinymce for report and reassign process	2019-05-08 14:29:25 +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	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
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
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
Anton Ignatov	c9f9523210	Remove src when save description and rename token tag	2019-04-02 13:41:32 +02:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	5d6f009ee8	fix error for delay deleting	2019-03-20 15:20:31 +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
Urban Rotnik	3992336db9	Add type and value_for attributes to user hash	2019-03-11 08:37:22 +01:00
Urban Rotnik	b8e84b5685	Add logic for saving message items values and types	2019-03-11 08:37:22 +01:00
Oleksii Kriuchykhin	61147b480c	Add main global activities bussiness logic [SCI-3014]	2019-02-26 11:01:15 +01:00
Matej Zrimšek	9480234682	Show all smart annotations when they contain special characters [SCI-2816]	2018-12-09 11:15:31 +01:00
Oleksii Kriuchykhin	2c0927b254	Search for IDs on inventory table as text [SCI-2802]	2018-11-30 15:32:01 +01:00
Oleksii Kriuchykhin	02f536cd08	Merge latest features/export-all [SCI-2733]	2018-10-16 17:20:19 +02:00
Jure Grabnar	6b47165ac1	Fix formatting according to Houndbot	2018-10-16 11:00:38 +02:00
Jure Grabnar	2558b7a313	Fix formatting according to HoundBot	2018-10-16 11:00:38 +02:00
Jure Grabnar	26df1e5a98	Add export project modal ... Closes [SCI-2645]	2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin	1cafbd8c50	Move generic code to Viewable Concern [SCI-2733]	2018-10-12 16:14:24 +02:00
zmagod	e654725d9e	fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511]	2018-07-06 14:26:20 +02:00
zmagod	23f8f35a2c	a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339]	2018-04-26 11:05:02 +02:00
zmagod	6e255a4657	fixes failing specs	2018-04-04 14:44:32 +02:00
zmagod	e630d3113f	add ID column to repository [fixes SCI-2206]	2018-04-04 11:55:11 +02:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
Luka Murn	00fe267a2a	Minor codestyle fixes	2017-11-23 11:33:39 +01:00
Luka Murn	d715eb06ef	Add team & project role-related helper functions to User model ... This will be required later once we start using Canaid.	2017-11-16 15:50:30 +01:00
Luka Murn	c62002381b	Add default settings migration and concern	2017-08-10 11:30:57 +02:00
Oleksii Kriuchykhin	0ee7e11620	Add advanced search options [SCI-1158]	2017-05-05 16:41:23 +02:00
Oleksii Kriuchykhin	07d658ab82	Improve speed of search [SCI-1157]	2017-04-11 14:55:44 +02:00
zmagod	e5ba134e83	fixes search	2016-11-16 14:50:06 +01:00
zmagod	3728a6cef9	fixed sql regex	2016-11-14 12:32:41 +01:00
zmagod	630724df2b	strips the html tags from fearch query	2016-11-11 11:41:23 +01:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00