106 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
mlorb	88d5ba369d	Merge branch 'ux-release-1' into ml-sci-2244	2018-04-26 14:07:03 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
Zanz2	cff2f933a0	removed byebug :D	2018-04-04 15:19:00 +02:00
Zanz2	ec743a7420	fixed the issue	2018-04-04 15:16:31 +02:00
Zanz2	1606982966	found a hackish fix by doing a manual ajax call and some other things with jquery	2018-04-02 19:56:25 +02:00
Zanz2	c5728c4018	Merge branch 'master' into null_step_crash_sci2043	2018-03-05 16:37:24 +01:00
Zanz2	5c93bd9676	Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom	2018-02-16 14:14:51 +01:00
Zanz2	673901fb01	Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 ... Fixed tables getting cut when certain attributes are at max length [SCI-1834]	2018-02-16 12:52:51 +01:00
Zanz2	b9db39f87d	removing last commit	2018-02-16 00:00:53 +01:00
Zanz2	95501eb046	saving work for later	2018-02-15 20:01:36 +01:00
Zanz2	ad8f93b57f	Merge pull request #991 from Zanz2/missplaced_authors_sci1808 ... protocols io authors are now real authors, not user that added the protocol [SCI-1808]	2018-02-15 16:53:39 +01:00
Zanz2	128f15f984	Merge pull request #990 from Zanz2/code_formatting_sci1822 ... Commands in protocols io steps are now properly formatted like code [SCI-1822]	2018-02-08 08:52:44 +01:00
Zanz2	49a4d9cf23	Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar	2018-02-07 15:50:42 +01:00
Zanz2	60aa1a0953	Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before	2018-02-07 15:12:03 +01:00
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	367eff6401	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00
Zanz2	dac59cf4d0	Refactored to PR, deleted unrelated things	2018-02-06 09:06:33 +01:00
Zanz2	70a972c264	Fixed pr and small oversight	2018-01-27 14:33:01 +01:00
Zanz2	2a287193b7	Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix	2018-01-27 13:50:35 +01:00
Zanz2	e8f6dc0d24	Merge pull request #962 from Zanz2/missing_error_SCI1993 ... A red error messagge is now displayed when not selecting protocol [SCI-1993]	2018-01-26 16:00:15 +01:00
Zanz2	98b3ddbdb0	Merge branch 'master' into images_not_imported_SCI1807	2018-01-26 15:13:40 +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	fc541147c8	A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone	2018-01-25 15:54: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	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
Zanz2	3c6d37ce64	Fixed according to PR review	2018-01-11 18:37:36 +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
Zanz2	d0a9198408	Fixed the styling	2017-12-10 01:20:08 +01:00
Zanz2	fcbd956d6e	Finished code beautification	2017-12-03 01:17:49 +01:00
Zanz2	835ac6910f	Code refactor part 1	2017-12-02 00:29:47 +01:00
Zanz2	dc5904aed9	Fixed this jira issue and added workarounds for bugs	2017-11-24 01:45:40 +01:00
Zanz2	764e5259d1	Fixed last review, and a bug i found	2017-11-22 23:38:22 +01:00
Zanz2	f577bf93b5	Fixed pull request review	2017-11-21 19:20:15 +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	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	c3f6c2b34a	Found a bug where i forot to include protocol description in preview modal and fixed it	2017-11-14 19:46:51 +01:00
Zanz2	7ec8d7c2b2	Made button green and added .json to supported file	2017-11-14 11:46:19 +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	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	9086cd8b6b	Jira branch code	2017-11-09 10:49:44 +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