840 commits

Author	SHA1	Message	Date
Zanz2	bc00c4a28b	Merge pull request #874 from Zanz2/supported_file_1794 ... Made button green and added .json to supported file [SCI-1794]	2017-11-14 19:12:45 +01:00
Zanz2	6b9a10ffe4	Made validations for JSON format and .txt and .json files	2017-11-14 12:02:17 +01:00
Zanz2	7ec8d7c2b2	Made button green and added .json to supported file	2017-11-14 11:46:19 +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	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	a40a63ae50	Made code more aesthetic	2017-11-09 15:38:06 +01:00
Zanz2	518eb09110	Deleted un needed error flash	2017-11-09 10:49:44 +01:00
Zanz2	4b837dbe9d	Forgot flash fail messagges, now added them for file too big and general error	2017-11-09 10:49:44 +01:00
Zanz2	feb686b4ac	Fixed alignement	2017-11-09 10:49:44 +01:00
Zanz2	8b247770ef	Added the success flash alert	2017-11-09 10:49:44 +01:00
Zanz2	9086cd8b6b	Jira branch code	2017-11-09 10:49:44 +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	096ee00e07	removed unnecessary html	2017-11-03 01:28:20 +01:00
Zanz2	6a4c38bbee	Fixed table elements render bugs, now renders after shown event	2017-11-03 01:04:50 +01:00
Zanz2	6fc1afe4c1	Trying to fix this messy table preview	2017-10-30 01:57:42 +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	a167db11da	Scinote table elements code	2017-10-28 20:20:19 +02:00
Zanz2	c291caaae3	Debbuging preive hot tables	2017-10-28 16:59:36 +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
Zanz2	a645bcb32d	fixed oversight;Changed double quote to single	2017-10-25 17:21:05 +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	49501b3d3d	Finished review refactor	2017-10-24 19:24:53 +02:00
Zanz2	03e40017e4	Updated local	2017-10-19 19:58:18 +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	ae9ac46472	Put the two blocks of code into seperate partials	2017-10-19 00:13:35 +02:00
Zmago Devetak	fd755eedf0	Merge pull request #832 from ZmagoD/zd_SCI_1560 ... adds label under protocols keywords input [fixes SCI-1560]	2017-10-18 14:06:13 +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
zmagod	30d091dc65	adds label under protocols keywords input [fixes SCI-1560]	2017-10-17 14:10:56 +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
Luka Murn	2fb2b90da3	Merge pull request #820 from Ducz0r/lm-sci-1675 ... Add Add-ons page to User -> Settings -> Account [SCI-1675]	2017-10-16 13:05:43 +02:00
okriuchykhin	db9a031581	Merge pull request #813 from okriuchykhin/ok_SCI_1642 ... Refactor canvas [SCI-1642]	2017-10-12 17:45:34 +02:00
Oleksii Kriuchykhin	56f52ebfa7	Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-12 14:43:25 +02:00
Zanz2	5d667f146e	Moved .js form reset and made a standalone description method	2017-10-11 17:59:09 +02:00
Luka Murn	fe89b942e7	Add Add-ons page to User -> Settings -> Account ... Closes SCI-1675.	2017-10-11 14:15:37 +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
Oleksii Kriuchykhin	6820511ea0	Further canvas optimizations [SCI-1642]	2017-10-06 12:43:27 +02:00