676 commits

Author	SHA1	Message	Date
Zanz2	b105920d4e	Merge pull request #901 from Zanz2/code_refactor ... Protocols.io code beautification and refactoring [SCI-1929]	2018-01-12 12:34:00 +01:00
Luka Murn	cf291bf887	Merge branch 'gilson-iot-rails4' ... Conflicts: Gemfile.lock	2017-12-19 10:56:39 +01:00
Zmago Devetak	00be4460cc	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step ... Fixes bug with embedded images [SCI-1624]	2017-12-12 09:53:24 +01:00
okriuchykhin	b3b0e367e8	Merge pull request #889 from okriuchykhin/ok_SCI_1747 ... Improve server side assets validation display for steps [SCI-1747]	2017-12-04 14:12:43 +01:00
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
zmagod	066c782cd2	Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step	2017-11-24 16:29:32 +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
Oleksii Kriuchykhin	fe8b7d26c1	Improve server side assets validation display for steps [SCI-1747]	2017-11-21 13:48:06 +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
Oleksii Kriuchykhin	84f4aba213	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +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
mlorb	cd6799d571	Merge pull request #866 from biosistemika/protocols-io-import ... Protocols io import	2017-11-13 11:53:28 +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
mlorb	126f278308	Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json ... Scinote protocols IO base branch	2017-11-06 14:53:01 +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
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
Zanz2	a732c8afa7	Code for protocol repository scinote table elements view	2017-10-26 17:28:27 +02:00
zmagod	d2ed415a25	Fixes per @okriuchykhin 's request	2017-10-26 10:42:18 +02:00
Zanz2	79e0a11054	Fixed before start and link not displaying in protocol description	2017-10-25 17:39:01 +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
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
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
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
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