2533 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
mlorb	47784e09a8	Merge pull request #867 from mlorb/ml-sci-1434 ... Add explanation when copying custom repositories [SCI-1434]	2017-11-15 11:34:02 +01:00
mlorb	06fc0eac5e	Merge pull request #868 from mlorb/ml-sci-1215 ... Fix preview for images with transparent background [SCI-1215]	2017-11-15 11:28:57 +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
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	9bd198eaf6	Merge pull request #875 from Zanz2/removed_txt_1793 ... Removed the .txt text from translations file [SCI-1793]	2017-11-14 19:12:32 +01:00
Zanz2	6cd2c6f518	Merge pull request #876 from Zanz2/valid_format_1791 ... Made validations for JSON format and .txt and .json files [SCI-1791]	2017-11-14 19:12:16 +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	7ec8d7c2b2	Made button green and added .json to supported file	2017-11-14 11:46:19 +01:00
Zanz2	3e964da241	Removed the .txt text from translations file	2017-11-14 11:42:10 +01:00
Zanz2	8ba27f734e	Merge pull request #869 from Zanz2/Tables_and_protocol_info_integration ... Made the two seperate branches from previous jira issues work together (fixed a small bug)	2017-11-14 11:26:48 +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
Mojca Lorber	f75a2710d5	fix preview for images with transparent background	2017-11-13 18:03:14 +01:00
Mojca Lorber	be74338d9f	add explanation when copying custom repositories	2017-11-13 16:30:42 +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	4750d6f270	Merge pull request #862 from Zanz2/move_tablev2 ... Protocols.io converted html tables to scinote table elements [SCI-1692]	2017-11-13 10:06:21 +01:00
Zanz2	23d3ffa5a4	Fixed PR	2017-11-12 15:48:45 +01:00
Zanz2	e26adc2905	Quick formatting fix	2017-11-12 15:41:50 +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	a40a63ae50	Made code more aesthetic	2017-11-09 15:38:06 +01:00
Zanz2	60da9d136c	Merge pull request #859 from Zanz2/p_succ_msg_SCI-1694 ... Protocols.io import success flash messagge [SCI-1694]	2017-11-09 15:23:47 +01:00
Zmago Devetak	26260d01fd	Merge pull request #856 from ZmagoD/zd_SCI_1610 ... trigger an alert to on canvas save if page reload [fixes SCI-1610]	2017-11-09 11:35:39 +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
zmagod	f43492adff	trigger an alert to on canvas save if page reload [fixes SCI-1610]	2017-11-07 15:08:26 +01:00
Luka Murn	09ac0febbb	Bump version to 1.12.6	2017-11-07 12:48:53 +01:00
Zmago Devetak	a9bba07c74	Merge pull request #847 from ZmagoD/zd_SCI_1683 ... add whacamole configuration [fixes SCI-1683]	2017-11-06 15:56:29 +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	04c6f0c20d	schema missing space	2017-11-03 21:50:06 +01:00
Zanz2	0dc0109d91	reverted schema	2017-11-03 21:47:52 +01:00
Zanz2	4354363215	rubocop refactor css	2017-11-03 16:46:03 +01:00
Zanz2	ac26b17ddf	Rubocop refactor	2017-11-03 16:45:15 +01:00
Zanz2	aa03a889c7	Fixed PR review	2017-11-03 16:28:15 +01:00
okriuchykhin	80405800ca	Merge pull request #818 from okriuchykhin/ok_SCI_1626 ... Enable :preserve_files in paperclip config [SCI-1626]	2017-11-03 11:56:57 +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
Zmago Devetak	58c850cfad	Merge pull request #849 from ZmagoD/zd_SCI_1724 ... adds environment variable that disables/enables the creation of new t…	2017-10-26 12:37:55 +02:00