330 commits

Author	SHA1	Message	Date
Zanz2	a6356d2420	Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines	2018-02-07 14:46:25 +01:00
Zanz2	efaf5ad721	Commands now get styled like code	2018-02-07 13:51:22 +01:00
Zanz2	a2df9777f6	Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000 ... fixed empty table name unable to generate reports bug [SCI-2000]	2018-02-06 14:34:31 +01:00
Zanz2	83e9550feb	Merge pull request #966 from Zanz2/images_not_imported_SCI1807 ... Images not imported [SCI-1807]	2018-02-06 14:33:35 +01:00
Zanz2	748af2cbf7	Fixed the issue, table name defaults to empty string space now	2018-02-06 10:29:49 +01:00
mlorb	553039b7b4	fix type error at changing task at navigation bar after seting due date	2018-01-30 13:29:54 +01:00
Zanz2	0607579d06	Fixes the database error i was having on home machine too, wasnt exclusive to me	2018-01-27 14:57:07 +01:00
Zanz2	70a972c264	Fixed pr and small oversight	2018-01-27 14:33:01 +01:00
Zanz2	98b3ddbdb0	Merge branch 'master' into images_not_imported_SCI1807	2018-01-26 15:13:40 +01:00
Zanz2	a15e624b06	Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995 ... Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]	2018-01-26 15:08:03 +01:00
Zanz2	48b48c945c	Refactored hound errors, now that rubocop works	2018-01-26 11:17:49 +01:00
Zanz2	020e9ddc16	Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807	2018-01-26 11:08:47 +01:00
Zanz2	a48fc168a9	deleted un needed function	2018-01-26 11:05:19 +01:00
Zanz2	6f56f829da	Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title	2018-01-26 10:49:38 +01:00
Zanz2	4ee51959eb	fixed hound	2018-01-26 09:56:59 +01:00
Zanz2	4ed1555ebb	small fix, ordering	2018-01-26 09:45:41 +01:00
Zanz2	346f9feaef	Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html	2018-01-26 09:34:58 +01:00
Zanz2	24e772d7e5	Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816	2018-01-26 08:26:38 +01:00
Zanz2	00ac774fde	Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result	2018-01-24 13:40:13 +01:00
Zanz2	7fe1c20ebe	Finished the protocol reorder functions and implemented them	2018-01-24 09:31:43 +01:00
Zanz2	96253c1089	Made some functions to help solve reordering of the protocols io steps	2018-01-23 18:40:23 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
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
Zmago Devetak	0e6931b1f3	Merge pull request #908 from ZmagoD/zd_SCI_1866 ... Wrong date at activity	2018-01-08 14:20:26 +01:00
zmagod	eb8124ea5a	follow @duco 's suggestions	2018-01-05 17:08:00 +01:00
mlorb	99185871c4	fix naming things	2018-01-05 15:15:50 +01:00
Zanz2	7bad722553	Made small oversight and fixed it	2017-12-24 02:06:14 +01:00
Zanz2	83e1b04c7a	Fixed pull request	2017-12-24 01:49:04 +01:00
Zanz2	53561ffd84	Refactored according to PR	2017-12-15 20:39:15 +01:00
mlorb	2936770c01	refactor can view team users ATWHO permission	2017-12-14 14:18:18 +01:00
mlorb	7c1ae6bc82	refactor manage repository permissions	2017-12-14 14:18:18 +01:00
mlorb	2918a9833d	refactor manage repository column permissions	2017-12-14 14:18:18 +01:00
mlorb	3f5e9e60b7	refactor view repository permission	2017-12-14 14:18:18 +01:00
mlorb	079ac7a4d3	refactor manage repository row permissions	2017-12-14 14:18:18 +01:00
mlorb	740ecc674b	refactor view repositories permission	2017-12-14 14:18:18 +01:00
mlorb	3ca51f097f	refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions	2017-12-14 14:18:17 +01:00
mlorb	29f9414839	refactor create project permission	2017-12-14 14:18:17 +01:00
mlorb	72023c7dfe	refactor update/delete sample permissions	2017-12-14 14:18:17 +01:00
mlorb	b09377cd8d	refactor update sample permission	2017-12-14 14:18:17 +01:00
mlorb	f801ed8eb6	refactor view/export samples permission	2017-12-14 14:18:16 +01:00
mlorb	0d37f9c85a	refactor clone protocol permission	2017-12-14 14:18:16 +01:00
mlorb	f6d36ae6a2	refactor update protocol type in repository	2017-12-14 14:18:16 +01:00
mlorb	806fcbce36	refactor update protocol in repository permission	2017-12-14 14:18:16 +01:00
mlorb	e0d1ae174e	refactor read protocol in repository permission	2017-12-14 14:18:15 +01:00
mlorb	ccc2451494	refactor create sample permissions	2017-12-14 14:18:15 +01:00
mlorb	43c01b74b1	refactor create protocol permission	2017-12-14 14:18:14 +01:00
mlorb	a0b2d3f5ef	refactor read_team permission	2017-12-14 14:18:14 +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
Oleksii Kriuchykhin	6256acdfea	Rename notifications settings accessor [SCI-1864]	2017-12-07 13:59:33 +01:00
Zanz2	b0012ab936	Simplified repeating method calls	2017-12-03 16:50:06 +01:00