605 commits

Author	SHA1	Message	Date
Zanz2	9655c98566	Github review refactor	2017-10-07 20:47:05 +02:00
Zanz2	f5b2ad0d34	Refactor github code review	2017-10-07 16:07:04 +02:00
Zanz2	66e5004e60	Changed import text to be inside en.yml, as said in the code review, deleted some blank lines	2017-10-07 15:56:43 +02:00
Zanz2	b23ca33e73	Deleted todo-list comments :D	2017-09-26 16:46:17 +02:00
Zanz2	c72cf6320a	Finished rubocop refactoring	2017-09-26 16:19:09 +02:00
Zanz2	8d961c934a	Rubocop refactored part of the controller code	2017-09-26 13:17:00 +02:00
Zanz2	2bfe8f0b95	Testing why rubocop gives errors	2017-09-25 15:27:24 +02:00
Zanz2	292c1e3c31	Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first	2017-09-25 14:14:27 +02:00
Zanz2	11b2ef3112	Made code nicer, hopefully not unintentionally breaking something	2017-09-25 13:53:32 +02:00
Zanz2	dd4d4072e8	Made code more aesthetic	2017-09-22 16:02:56 +02:00
Zanz2	6ebdea5dce	Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)	2017-09-22 15:12:29 +02:00
Zanz2	4051c0b06b	Deleted old unused files i spotted on github	2017-09-22 13:28:38 +02:00
Zanz2	deef790951	added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions	2017-09-22 11:56:50 +02:00
Zanz2	1dbb03e22d	Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer	2017-09-21 16:05:33 +02:00
Zanz2	f48833c47a	added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();	2017-09-21 08:40:05 +02:00
Zanz2	d59234a1e3	minor changes, working on refresh after submit	2017-09-20 16:04:52 +02:00
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