598 commits

Author	SHA1	Message	Date
okriuchykhin	2e0bf91467	Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675 ... Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2	2017-10-27 11:14:39 +02:00
zmagod	d2ed415a25	Fixes per @okriuchykhin 's request	2017-10-26 10:42:18 +02:00
zmagod	5e6a4bb69a	adds environment variable that disables/enables the creation of new team when user sign up	2017-10-25 15:29:04 +02:00
okriuchykhin	44733fefda	Merge pull request #839 from okriuchykhin/ok_SCI_1609 ... Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 16:26:36 +02:00
Oleksii Kriuchykhin	631b41cdaa	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02: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	cd0aba1896	Change any? to empty? [SCI-1665]	2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin	c8d2ae70fa	Move duplicated code to service [SCI-1665]	2017-10-17 14:46:16 +02:00
Luka Murn	4e06b5c397	Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""	2017-10-17 13:17:49 +02:00
Luka Murn	4d8f2665d3	Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"	2017-10-17 13:10:02 +02:00
Luka Murn	2fb2b90da3	Merge pull request #820 from Ducz0r/lm-sci-1675 ... Add Add-ons page to User -> Settings -> Account [SCI-1675]	2017-10-16 13:05:43 +02:00
okriuchykhin	db9a031581	Merge pull request #813 from okriuchykhin/ok_SCI_1642 ... Refactor canvas [SCI-1642]	2017-10-12 17:45:34 +02:00
gazvoda	88f03a0706	Merge pull request #735 from gazvoda/lg-SCI-1249-v2 ... Truncate checklist items in activity modal [fixes SCI-1249]	2017-10-12 15:58:05 +02:00
Oleksii Kriuchykhin	56f52ebfa7	Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-12 14:43:25 +02:00
Luka Murn	fe89b942e7	Add Add-ons page to User -> Settings -> Account ... Closes SCI-1675.	2017-10-11 14:15:37 +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
Oleksii Kriuchykhin	6824f9a8bc	Improve memory utulization in PDF report generator [SCI-1482]	2017-10-02 11:29:22 +02:00
lenart	e781dfc6a6	Truncate activity taking smart annotations into account fixes [SCI-1249]	2017-08-02 15:51:32 +02:00
Oleksii Kriuchykhin	6a43483a2f	Fix adding and editing repository items [SCI-1519]	2017-07-26 11:22:26 +02:00
Matej Zrimšek	ad0dce921b	Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]	2017-07-24 18:12:41 +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
Oleksii Kriuchykhin	036ee390ed	Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]	2017-07-14 16:19:03 +02:00
Mojca Lorber	739f8b5b4e	remove redundant rollback call	2017-07-13 13:49:26 +02:00
Nbernot	2a3e830a3c	Merge pull request #732 from biosistemika/business_users ... Business users [SCI-1428, SCI-1447]	2017-07-11 13:34:56 +02:00
Luka Murn	16e672b9d8	Add VERSION file where the sciNote Core version is stored	2017-07-10 09:26:35 +02:00
lenart	58e2575c75	Truncate checklist items in activity modal [fixes SCI-1249]	2017-07-07 15:56:16 +02:00
Nejc Bernot	d917cf3340	Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST	2017-07-05 11:52:36 +02:00
Nejc Bernot	803934e07d	Changes the host for the download and redirect paths	2017-07-05 10:23:10 +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	4060ba2ac3	Code style fixes [SCI-1356]	2017-06-27 13:23:51 +02:00
Matej Zrimšek	f847b44067	Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]	2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin	e038bc58fa	Add global search in custom repositories [SCI-1356]	2017-06-23 16:12:56 +02:00
zmagod	7367435c6d	refactor	2017-06-22 17:32:12 +02:00
zmagod	2dd9b6ff19	fix update repository_row	2017-06-22 17:29:17 +02:00
zmagod	590135b9b3	refactor	2017-06-22 17:26:11 +02:00
zmagod	e7328c2e20	fixes row dupplication [fixes SCI-1385]	2017-06-22 16:01:37 +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
Matej Zrimšek	d907819de5	Removed byebug calls. [SCI-1383]	2017-06-21 10:49:00 +02:00
zmagod	f64e1ac713	fix locales	2017-06-21 09:31:39 +02:00
Matej Zrimšek	47407ef40c	Removed empty first column of repository export file. [SCI-1383]	2017-06-20 18:40:41 +02:00
mlorb	7cbc8a2f95	Merge pull request #694 from mlorb/ml_sci_1347 ... Fix flash when deleting samples of other users [SCI-1347]	2017-06-19 14:19:57 +02:00
mlorb	beaba6a92b	Merge pull request #693 from mlorb/ml_sci_1351_v3 ... Fix error msg when editing empty cell in repositories [SCI-1351]	2017-06-19 14:19:27 +02:00
zmagod	70fa681519	split the import service	2017-06-19 14:05:37 +02:00
Mojca Lorber	9b941fe374	fix flash when deleting samples of other users	2017-06-16 17:12:04 +02:00
Mojca Lorber	1b683bc70e	fix error msg when editing empty cell in repositories	2017-06-16 15:09:04 +02:00
Mojca Lorber	ea455d3596	fix no repository name in activity bug	2017-06-15 09:43:10 +02:00