90 commits

Author	SHA1	Message	Date
Zanz2	835ac6910f	Code refactor part 1	2017-12-02 00:29:47 +01:00
Zanz2	bb8aef3b73	Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833 ... Fixed validations lengths and added workarounds for bugs [SCI-1833]	2017-11-24 17:55:20 +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
Zanz2	dc5904aed9	Fixed this jira issue and added workarounds for bugs	2017-11-24 01:45:40 +01:00
Zanz2	f577bf93b5	Fixed pull request review	2017-11-21 19:20:15 +01:00
zmagod	91fec89cab	adds tiny_mce_assets to protocol export	2017-11-21 16:30:48 +01:00
Zanz2	d8c809ffd0	Reviewed pull request	2017-11-20 23:19:34 +01:00
Zanz2	cf66d94d45	Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields	2017-11-20 00:59:32 +01:00
Zanz2	fa25a6785b	Made the propper files and functionality for the text truncation to function	2017-11-17 02:43:32 +01:00
Zanz2	b2e1623cf1	Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784	2017-11-16 20:04:12 +01:00
Zanz2	c44465817d	Added the functions and put in limitations from my validations files, changed controller name, added some locals	2017-11-16 20:03:44 +01:00
Zanz2	1b540a75a1	Fixed to use .megabytes	2017-11-16 15:17:13 +01:00
Zanz2	41c1193a78	Fixed unit error;Now when comparing file size, both are in bytes	2017-11-16 01:34:38 +01:00
mlorb	288e3ddcbd	Merge pull request #877 from mlorb/ml-sci-1190 ... Fix bug when removing all keywords in protocol [SCI-1190]	2017-11-15 11:22:18 +01:00
Mojca Lorber	c2a5b52767	fix bug when removing all keywords in protocol	2017-11-14 15:04:37 +01:00
Zanz2	6b9a10ffe4	Made validations for JSON format and .txt and .json files	2017-11-14 12:02:17 +01:00
Zanz2	f35ab78849	Added some code to make the two seperate jira issues work together (protocol info and scinote tables	2017-11-14 00:56:39 +01:00
Zanz2	b265beb386	Merge pull request #864 from Zanz2/move_desc ... Move protocol.io protocol description to step 1 of protocols [SCI-1695]	2017-11-13 10:07:01 +01:00
Zanz2	23d3ffa5a4	Fixed PR	2017-11-12 15:48:45 +01:00
Zanz2	e7384ac38d	Code review fixes, made seperate helper file	2017-11-12 15:31:04 +01:00
Zanz2	fa2c0fe556	merging	2017-11-09 18:55:17 +01:00
Zanz2	812fa3f1d5	Hopefully this will resolve my merge problems	2017-11-09 17:42:17 +01:00
Zanz2	aa03a889c7	Fixed PR review	2017-11-03 16:28:15 +01:00
Zanz2	de9a3a1d0d	Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly	2017-10-28 23:57:29 +02:00
Zanz2	2413dc251a	Added new preview tables code	2017-10-28 02:19:22 +02:00
Zanz2	a732c8afa7	Code for protocol repository scinote table elements view	2017-10-26 17:28:27 +02:00
Zanz2	79e0a11054	Fixed before start and link not displaying in protocol description	2017-10-25 17:39:01 +02:00
Zanz2	19b9da2e83	deleted comment	2017-10-24 19:44:34 +02:00
Zanz2	49501b3d3d	Finished review refactor	2017-10-24 19:24:53 +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	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	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