403 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	2ddb0ea009	Improve XLSX parsing with Roo [SCI-1915]	2018-01-11 17:52:57 +01:00
Luka Murn	cf291bf887	Merge branch 'gilson-iot-rails4' ... Conflicts: Gemfile.lock	2017-12-19 10:56:39 +01:00
Zmago Devetak	027f4a5921	Merge pull request #890 from ZmagoD/zd_SCI_1651 ... export and import RTE images	2017-11-24 16:28:28 +01:00
Zmago Devetak	3cd7e6fdde	fix open method	2017-11-24 15:19:58 +01:00
mlorb	9e7b75a880	Merge pull request #892 from mlorb/ml-sci-1215_v2 ... Make background gray for paperclip images [SCI-1215]	2017-11-23 17:32:09 +01:00
Mojca Lorber	0ffe476a54	make background gray for paperclip images	2017-11-23 14:35:42 +01:00
Mojca Lorber	fe5828fa97	add copying of TinyMce assets when cloning the protocol	2017-11-22 16:47:21 +01:00
zmagod	91fec89cab	adds tiny_mce_assets to protocol export	2017-11-21 16:30:48 +01:00
Oleksii Kriuchykhin	f202687291	Allow import of the sample with missing non mandatory fields [SCI-1819]	2017-11-15 16:40:14 +01:00
Oleksii Kriuchykhin	84f4aba213	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00
Mojca Lorber	f75a2710d5	fix preview for images with transparent background	2017-11-13 18:03:14 +01:00
okriuchykhin	8e90e041b9	Merge pull request #825 from okriuchykhin/ok_SCI_1665 ... Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-17 17:26:00 +02:00
Oleksii Kriuchykhin	c8d2ae70fa	Move duplicated code to service [SCI-1665]	2017-10-17 14:46:16 +02:00
Oleksii Kriuchykhin	d266034406	Use case insensitive sample types and groups in import [SCI-1689]	2017-10-13 17:15:51 +02:00
Oleksii Kriuchykhin	56f52ebfa7	Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-12 14:43:25 +02:00
Oleksii Kriuchykhin	9a8e33c6d7	Small fixes [SCI-1642]	2017-10-11 17:24:31 +02:00
Oleksii Kriuchykhin	6820511ea0	Further canvas optimizations [SCI-1642]	2017-10-06 12:43:27 +02:00
Oleksii Kriuchykhin	b26b963e54	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
Mojca Lorber	0e14420193	fix bugs with importing samples	2017-09-06 14:41:14 +02:00
Oleksii Kriuchykhin	fc0e2d2172	Add validation for uid uniqness [GIOT-29]	2017-09-01 17:00:13 +02:00
Oleksii Kriuchykhin	c3fceb90df	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
Oleksii Kriuchykhin	6a43483a2f	Fix adding and editing repository items [SCI-1519]	2017-07-26 11:22:26 +02:00
Oleksii Kriuchykhin	efd03db6db	Further samples import improvement [SCI-101]	2017-07-25 10:56:07 +02:00
Oleksii Kriuchykhin	67b0c78593	Improve samples import speed [SCI-101]	2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin	6d56e6b72e	Remove redundant self [SCI-1487]	2017-07-20 11:51:42 +02:00
Oleksii Kriuchykhin	6c33b46f6a	Improve import of repository records plus tsv file import fixes [SCI-1487]	2017-07-20 11:44:10 +02:00
Oleksii Kriuchykhin	ece27b2652	Fix importing files with empty header cells and error messages improvements [SCI-1484]	2017-07-18 14:54:35 +02:00
Nbernot	d746ae2549	Removes parentheses around if conditions	2017-07-11 13:33:47 +02:00
Nejc Bernot	803934e07d	Changes the host for the download and redirect paths	2017-07-05 10:23:10 +02:00
Nejc Bernot	91fe7fe4ad	Changes the completely NOT ruby code	2017-07-04 17:13:59 +02:00
Nejc Bernot	bd9904adb3	Adds support for business servers ... If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files	2017-07-04 14:27:43 +02:00
okriuchykhin	d126391940	Merge pull request #710 from okriuchykhin/ok_SCI_1356 ... Add global search in custom repositories [SCI-1356]	2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin	f2f57de264	Fix changing protocol ownership logic when removing user from the team [SCI-1415]	2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin	e038bc58fa	Add global search in custom repositories [SCI-1356]	2017-06-23 16:12:56 +02:00
zmagod	703be13fb0	removes imported repository row if the row value is not valid [fixes SCI-1393]	2017-06-22 15:21:36 +02:00
zmagod	28129ebb73	refactor	2017-06-21 17:39:20 +02:00
zmagod	bad52ceff1	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336	2017-06-21 15:56:07 +02:00
zmagod	18fd5b00ba	fix hound	2017-06-21 15:01:55 +02:00
zmagod	f66fb49b56	adds import records to repositories [fixes SCI-1336]	2017-06-21 14:45:50 +02:00
zmagod	f64e1ac713	fix locales	2017-06-21 09:31:39 +02:00
Matej Zrimšek	6c7987681c	Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]	2017-06-20 14:52:41 +02:00
zmagod	70fa681519	split the import service	2017-06-19 14:05:37 +02:00
Zmago Devetak	21577cd0e9	Merge pull request #664 from ZmagoD/zd_SCI_1315 ... removes the delete function of uncompleted steps [fixes SCI-1315]	2017-06-13 09:32:26 +02:00
zmagod	a865253a2e	first run	2017-06-13 08:10:10 +02:00
Matej Zrimšek	e3db79b3cc	Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275]	2017-06-12 17:49:42 +02:00
Matej Zrimšek	4ea8972a6c	Fixed rebasing mistake. [SCI-1275]	2017-06-09 19:48:20 +02:00
rekonder	ede744849b	Export repository [aj-SCI-1275]	2017-06-09 19:44:28 +02:00
Luka Murn	e26337d5ee	Merge pull request #671 from biosistemika/custom-repositories ... Merge custom-repositories into master	2017-06-09 18:46:47 +02:00
zmagod	5f8606c9c5	removes the delete function of uncompleted steps [fixes SCI-1315]	2017-06-08 14:03:06 +02:00
Luka Murn	810599bef2	Fix en.yml localization bug	2017-06-08 13:36:37 +02:00