331 commits

Author	SHA1	Message	Date
Zanz2	dfcaa40f1a	Merge branch 'master' into zz_refactor_icons_sci_2445_v2	2018-08-14 13:33:43 +02:00
Zanz2	45a4c1c598	changed the icons as per last comment in jira issue	2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin	b2bd1cb849	Upgrade to Turbolinks 5 [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin	13c374d9b3	Add hooks to new report modal [SCI-2377]	2018-06-14 15:26:06 +02:00
Luka Murn	9a4fdd166e	Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix ... Conflicts: app/views/projects/index.html.erb	2018-06-12 17:44:42 +02:00
zmagod	51e024e3d7	adds data-hooks to reports and search results [fixes SCI-2374]	2018-06-07 14:29:40 +02:00
Luka Murn	e0a3b5a941	Fix Save PDF to repository modal window	2018-06-06 16:29:07 +02:00
Luka Murn	c76b926387	Delete _report_sidebar.html.erb ... This file is no longer needed from my research.	2018-05-25 11:04:05 +02:00
Zmago Devetak	280a926554	Merge pull request #1159 from ZmagoD/zd_SCI_2372 ... adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]	2018-05-24 16:05:56 +02:00
zmagod	06f1daf7a9	rename data-hook	2018-05-24 16:02:56 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
zmagod	e97a98f189	adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]	2018-05-22 14:18:40 +02:00
zmagod	e019767e90	refactor save_pdf_to_inventory_item service	2018-05-17 13:17:19 +02:00
zmagod	b125863baf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371	2018-05-17 11:25:33 +02:00
zmagod	ca0c8cbb71	fixes typos, fixes pdf rendering	2018-05-17 11:21:34 +02:00
zmagod	4573655ec8	adds save PDF report to inventory feature [fixes SCI-2371]	2018-05-16 09:31:19 +02:00
mlorb	ed27a7a62a	some extra restyling/unifying off app	2018-05-11 18:02:17 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
mlorb	d2c0ae241e	Merge pull request #1121 from mlorb/ml-sci-2244 ... Update buttons positions and wording throughout app [SCI-2244]	2018-05-03 11:05:15 +02:00
zmagod	e9642cadad	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304	2018-04-26 14:26:30 +02:00
mlorb	88d5ba369d	Merge branch 'ux-release-1' into ml-sci-2244	2018-04-26 14:07:03 +02:00
Luka Murn	cb6fe50832	Merge branch 'master' into ux-release-1 ... Conflicts: app/assets/javascripts/repositories/index.js	2018-04-26 11:38:54 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
zmagod	503ad1ba20	removes samples from views [fixes SCI-2304]	2018-04-24 08:26:55 +02:00
zmagod	199a2a23bf	fixes per @mlorb 's request	2018-04-23 12:26:21 +02:00
zmagod	e96b690a5b	removes reports link from secondary navigation, fix bug with turbolinks	2018-04-20 11:57:52 +02:00
zmagod	dafa29d4bf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124	2018-04-20 10:33:15 +02:00
zmagod	9d282d1800	adds new reports index page [fixes SCI-2124]	2018-04-18 16:47:52 +02:00
mlorb	cc34376253	update reports show page to work with new navigation	2018-04-18 14:40:53 +02:00
Zmago Devetak	e30b2261a8	Merge pull request #1077 from ZmagoD/zd_SCI_2279 ... fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]	2018-04-05 16:52:16 +02:00
zmagod	218f421dff	fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]	2018-04-05 15:31:25 +02:00
zmagod	c0cc6c293a	fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]	2018-04-05 13:15:32 +02:00
Oleksii Kriuchykhin	f656ad1561	Fix fa icons [SCI-2217]	2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
mlorb	bc06542ed7	refactor project navigation	2018-03-22 11:41:33 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Matej Zrimšek	e36ec69ca9	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
Matej Zrimšek	13e9a2a132	Corrected some project level permissions; minor refactoring.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d423700e84	Used permissions where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
zmagod	ad742ac2d1	adds nil check in ste_table_element for table name [fixes SCI-2009]	2018-02-05 16:27:04 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
mlorb	a0b2d3f5ef	refactor read_team permission	2017-12-14 14:18:14 +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
zmagod	3dc3ed906f	fixes bug with embedded images [fixes SCI.1624]	2017-10-02 18:06:42 +02:00
Oleksii Kriuchykhin	6824f9a8bc	Improve memory utulization in PDF report generator [SCI-1482]	2017-10-02 11:29:22 +02:00
zmagod	7b9410f02f	fixes smart annotations bug in reports [fixes SCI-1328]	2017-06-27 11:26:32 +02:00
zmagod	2b2f513366	fixes export pdf error on production	2017-06-22 16:40:50 +02:00
Matej Zrimšek	d49524a26f	Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]	2017-06-20 16:10:50 +02:00
Luka Murn	02dd6636ba	Allow saving & editing of reports with repository elements ... Closes SCI-1279.	2017-06-07 16:55:00 +02:00
Luka Murn	b5f6d1da94	Allow custom repositories to be added to reports	2017-06-07 16:54:32 +02:00
mz3944	6b8c8deb16	Merge pull request #634 from mz3944/mz-SCI-414 ... Uncompleted steps not added to Reports	2017-05-23 09:58:05 +02:00
Matej Zrimšek	20265ddd69	Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]	2017-05-17 18:18:57 +02:00
Matej Zrimšek	f78c80b148	Added possibility to add uncompleted steps to report. [closes SCI-414]	2017-05-17 13:25:21 +02:00
Matej Zrimšek	2c6f888cbc	Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]	2017-05-15 18:56:41 +02:00
Matej Zrimšek	901558c733	Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	ba693c65a8	Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	dbb79ebab1	Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	b97cb91840	Refactoring of modal for adding content to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	27cfd55ea5	Simplified popup modal for adding contents to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 ... Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
zmagod	b22350136f	adds label to step in report [fixes SCI-488]	2017-05-05 09:45:18 +02:00
Matej Zrimšek	a5cffd06f3	Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]	2017-04-25 16:03:50 +02:00
zmagod	86c6ae3b03	display tinyMCE images in reports	2017-04-25 09:53:35 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +02:00
zmagod	4635a3320d	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-24 16:09:28 +01:00
zmagod	c244e69e81	fixed report comments bug [fixes SCI-1100]	2017-03-17 16:59:40 +01:00
zmagod	5d372851d3	fixes reports comment bug [fixes SCI-1100]	2017-03-14 16:24:02 +01:00
zmagod	5c2e9a4b04	adds extends and fixes report methods	2017-03-08 14:14:03 +01:00
Mojca Lorber	f84611f558	fix report - checklist items are in separate row than checkboxes	2017-02-22 15:51:26 +01:00
Oleksii Kriuchykhin	cf8566df33	Add task complete/uncomplete functionality [SCI-999]	2017-02-10 14:27:20 +01:00
zmagod	e59b2e039a	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939	2017-01-27 11:15:31 +01:00
Luka Murn	0baaf12de3	Re-display images & checkboxes in PDF reports ... Closes SCI-953.	2017-01-26 10:46:58 +01:00
Oleksii Kriuchykhin	c55f3cb99c	Add flag to disable simple_format in custom_auto_link [SCI-940]	2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin	310d8c1920	Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:18:19 +01:00
zmagod	72e13beee3	renamed organizations in views	2017-01-25 12:01:23 +01:00
Luka Murn	53699193a2	Merge branch 'smart-annotations' ... Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb	2017-01-24 14:33:23 +01:00
Mojca Lorber	8e02c2e025	add locale - fix	2017-01-20 13:37:07 +01:00
Mojca Lorber	4ea154410a	add to fields with rich text formatting	2017-01-19 15:27:24 +01:00
Mojca Lorber	44de927cf4	display smart annotations in reports - without rich text fields	2017-01-19 14:22:54 +01:00
Mojca Lorber	3b92ab9f36	add names to tables from protocol steps in reports	2017-01-18 14:22:19 +01:00
Oleksii Kriuchykhin	75031e17b9	Remove double sanitization from views [SCI-102]	2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin	0350f2f792	Add html escaping to name filelds in the views [SCI-102]	2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin	d05c16b0ba	Added auto_link wrapper with custom sanitization [SCI-102]	2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin	0546716a0b	Improve user input sanitization, fix bugs [SCI-102]	2017-01-11 15:50:11 +01:00
Oleksii Kriuchykhin	cd3924afd3	Sanitize .html_safe marked strings which contain tags [SCI-102]	2017-01-05 13:04:19 +01:00
Oleksii Kriuchykhin	9c4191a1e0	Initial code commit [SCI-102]	2017-01-05 13:04:19 +01:00
Luka Murn	a48eaf662e	Restyle step table display in reports so ... Closes SCI-546.	2016-12-19 15:09:49 +01:00
zmagod	fafecce264	adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]	2016-11-23 14:18:50 +01:00
Luka Murn	26d04b1f3c	Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss	2016-11-17 16:39:33 +01:00
Matej Zrimšek	c8eb82cc85	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	c64146904a	Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.	2016-11-17 14:46:04 +01:00
Luka Murn	d1701bd7ae	Merge pull request #276 from Ducz0r/lm-sci-637 ... Automatically resize textarea elements [SCI-637]	2016-11-17 09:58:36 +01:00
Luka Murn	a3bbf94643	Add a smart_text_area tag & implement it throughout application ... This fixes the mentioned issues @mlorb mentioned. Closes SCI-637.	2016-11-16 17:57:01 +01:00
Oleksii Kriuchykhin	d2e29935cf	Improved tutorial styling [SCI-685]	2016-11-16 15:44:06 +01:00
zmagod	b781db9667	fixed bullets	2016-11-16 15:30:14 +01:00
mlorb	1ca452db7b	Merge pull request #273 from mlorb/ml_sci_640 ... Add rich text formatting on results and remove markdown [SCI-640]	2016-11-11 12:06:13 +01:00
Oleksii Kriuchykhin	b9f982ead7	Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-11 10:07:34 +01:00
Mojca Lorber	fbaffbcaab	add formatted text in reports	2016-11-10 15:20:40 +01:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
Oleksii Kriuchykhin	0ec7c019b3	Fix issue with pop-up windows and turbolinks [SCI-463]	2016-10-17 14:25:54 +02:00
Matej Zrimšek	ece89da391	Removed ruby constants duplicates in JS, because of caching problems.	2016-10-17 11:57:47 +02:00
Matej Zrimšek	0780bd2416	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
Matej Zrimšek	a3dfb59558	Added remaining constants.	2016-10-17 11:30:05 +02:00
Jure Grabnar	6519e8dbb1	Add e-notation preprocessing to formulas ... SCI-350 #close	2016-09-13 09:46:22 +02:00
Jure Grabnar	fa3515d2eb	Add formulas to reports	2016-09-13 09:46:21 +02:00
Zmago Devetak	375a72db18	Merge pull request #114 from ZmagoD/zd_SCI_294_vol2 ... fixes reports file name [fixes SCI-294]	2016-08-30 14:59:07 +02:00
zmagod	f356acb882	fixes reports file name [fixes SCI-294]	2016-08-30 11:36:39 +02:00
zmagod	5518d1cd1e	fixed 16 step of tutorial	2016-08-30 08:52:44 +02:00
zmagod	eab05eb9db	adds font-awesome to pdf [fixes SCI-345]	2016-08-22 14:40:09 +02:00
zmagod	ca0ba1403d	set flask icon to experiment [fixes SCI-330]	2016-08-17 14:17:29 +02:00
zmagod	7abc8f3a90	Merge branch 'master' into experiment-level	2016-08-17 09:28:35 +02:00
Jure Grabnar	9f7df0af76	Fix checkbox in experiment reports	2016-08-09 13:13:50 +02:00
Jure Grabnar	208e85e7e0	Remove archived experiments from reports	2016-08-09 11:17:25 +02:00
Jure Grabnar	8b2b134614	Migrate old reports to new experiment level reports	2016-08-04 13:19:46 +02:00
Jure Grabnar	9092dd6914	Replace all occurences of module_elements	2016-08-03 12:52:52 +02:00
Jure Grabnar	ff081cd844	Simplify project contents dialog	2016-08-03 12:52:51 +02:00
Jure Grabnar	dc82830a8f	Add checkbox behaviour to experiment contents	2016-08-03 12:52:51 +02:00
Jure Grabnar	3f33ebe59a	Fix wrong closure in experiment contents	2016-08-03 12:52:51 +02:00
Jure Grabnar	acc41dae40	Add experiment content report dialog ... Adding still has to be implemented	2016-08-03 12:52:51 +02:00
Jure Grabnar	41e8c54aa5	Rename _module_element_controls to element_controls	2016-08-03 12:52:06 +02:00
Jure Grabnar	d82ba163ed	Add experiment to report screen ... Only placeholder for now, JS still needs fixing.	2016-08-03 12:52:06 +02:00
Jure Grabnar	ac708e7497	Remove no module group from reports	2016-08-03 12:52:06 +02:00
Jure Grabnar	797685fbf0	Remove workflows from project content dialog (report)	2016-08-03 12:52:06 +02:00
Jure Grabnar	daca739262	Add new line to selector for readability	2016-08-03 12:52:06 +02:00
Jure Grabnar	598c5a63fd	Add experiment level to project report contents modal	2016-08-03 12:52:05 +02:00
Mojca Lorber	ffa64445df	fixes issue SCI-223	2016-08-02 16:30:07 +02:00
zmagod	6e3ce92348	add checking for step content	2016-08-01 11:23:22 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00