2436 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zanz2	03e40017e4	Updated local	2017-10-19 19:58:18 +02:00
Zanz2	ae9ac46472	Put the two blocks of code into seperate partials	2017-10-19 00:13:35 +02:00
Zanz2	67b09adaeb	Fixed last few rubocop errors	2017-10-17 19:43:46 +02:00
Zanz2	6cf775a4b1	Refactored code, made html render on preview too	2017-10-17 19:27:20 +02:00
Zanz2	e72c1bebcb	deleted comments	2017-10-12 19:18:22 +02:00
Zanz2	8d0d6f0502	refactored methods	2017-10-12 19:10:16 +02:00
Zanz2	21036a1081	Deleted unnecesarry if's	2017-10-12 17:22:02 +02:00
Zanz2	414a15872c	Made seperate method for steps mapping	2017-10-12 17:15:43 +02:00
Zanz2	5d667f146e	Moved .js form reset and made a standalone description method	2017-10-11 17:59:09 +02:00
Zanz2	8720222ac2	Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper)	2017-10-07 22:45:01 +02:00
Zanz2	183c93d21b	Refactoring to git review specifications	2017-10-07 22:13:31 +02:00
Zanz2	9655c98566	Github review refactor	2017-10-07 20:47:05 +02:00
Zanz2	3a8092b663	Refactor and threw out useless comments	2017-10-07 18:05:09 +02:00
Zanz2	d52400f741	Refactored code according to review	2017-10-07 17:58:23 +02:00
Zanz2	2b9563ec6d	Added preview text to en.yml	2017-10-07 17:45:23 +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	48f03d6dfb	hound blank line fix	2017-10-05 18:41:58 +02:00
Zanz2	fc1cd73e1d	fixed hound blank line	2017-10-05 18:38:44 +02:00
Zanz2	9fd67019e0	Deleted unused file	2017-10-05 18:09:07 +02:00
Zanz2	64b72f4ad4	Fixed a bug, where if the url get query is nil (if you go directly to /protocols, it doesnt get the public type from url, now when it is nil it just defaults to public	2017-10-05 17:31:49 +02:00
Zanz2	b23ca33e73	Deleted todo-list comments :D	2017-09-26 16:46:17 +02:00
Zanz2	9bf69276ae	deleted unused files	2017-09-26 16:39:19 +02:00
Zanz2	c72cf6320a	Finished rubocop refactoring	2017-09-26 16:19:09 +02:00
Zanz2	3074acbc0d	Made javascript code nicer	2017-09-26 13:31:24 +02:00
Zanz2	055746bfd9	Rubocop beautified code v2	2017-09-26 13:21:48 +02:00
Zanz2	ad1847256c	Rubocop beautified code	2017-09-26 13:20:55 +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	79e065a811	Fixed a mistake in the fix that made it not render the preview	2017-09-25 14:39:43 +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	549346bb0a	Deleted a warning that was out of place	2017-09-22 16:13:06 +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	6a07aa28e4	Accidentally removed this line after reviewing git changes, adding it back	2017-09-22 13:11:49 +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	df8cbc2741	vastly improved protocol preview styling to look more like documentation specifications	2017-09-21 13:46:52 +02:00
Zanz2	8da72eb64a	made code look nicer	2017-09-21 09:29:13 +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	ed64ce814a	i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript	2017-09-19 16:07:54 +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