589 commits

Author	SHA1	Message	Date
Zanz2	72c707ae88	protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit	2017-09-20 15:31:10 +02:00
Zanz2	7b85d74a23	added jquery code to reset file selector selected file after it is canceled in the preview modal	2017-09-20 09:32:31 +02:00
Zanz2	3812b2e64b	Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore	2017-09-20 08:58:00 +02:00
Zanz2	ea8f3e822d	Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone	2017-09-20 08:38:34 +02:00
Zanz2	7aba782639	optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show	2017-09-19 15:02:16 +02:00
Zanz2	f861b1fc52	Configured the controller,the main task ahead is to figure out how to import all of the data i have available	2017-09-15 15:52:55 +02:00
Zanz2	5d6cc341ed	added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done	2017-09-14 14:42:04 +02:00
Zanz2	29b9d50363	Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer	2017-09-14 11:30:53 +02:00
Zanz2	9fc91aac32	added protocols io upload preview modal	2017-09-13 16:04:16 +02:00
Zanz2	b7432b336a	added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller	2017-09-13 15:15:08 +02:00
Žan Žagar	706031dacb	added model and controler, model should go to services while the controller should go to protocols controller	2017-09-12 15:25:22 +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
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
Mojca Lorber	e6ec184dba	fix multiple errors handling on fields in repositories tables	2017-06-14 13:09:23 +02:00
zmagod	2d3b5f4308	refactor	2017-06-14 10:55:24 +02:00
zmagod	cee052fc19	added service object	2017-06-14 09:11:20 +02:00
Matej Zrimšek	cea6d15d3e	Fixed Hound warning. [SCI-1351]	2017-06-13 18:15:47 +02:00
Matej Zrimšek	1bc46fe0cb	Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351]	2017-06-13 18:12:42 +02:00
Mojca Lorber	849b269d87	fix errors in repo table	2017-06-13 16:56:34 +02:00
mlorb	074a47aae1	Merge pull request #675 from mlorb/ml_sci_1272 ... Fix permissions [SCI-1272]	2017-06-13 10:51:04 +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