114 commits

Author	SHA1	Message	Date
Zanz2	7aba782639	optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show	2017-09-19 15:02:16 +02:00
Zanz2	f861b1fc52	Configured the controller,the main task ahead is to figure out how to import all of the data i have available	2017-09-15 15:52:55 +02:00
Zanz2	d85e02730d	Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc	2017-09-15 12:19:58 +02:00
Zanz2	175aa16a7d	Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this	2017-09-14 15:52:44 +02:00
Zanz2	5d6cc341ed	added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done	2017-09-14 14:42:04 +02:00
Zanz2	d6d1f9d490	changed second modal preview styling to fit its specifications	2017-09-14 11:46:41 +02:00
Zanz2	29b9d50363	Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer	2017-09-14 11:30:53 +02:00
Zanz2	9fc91aac32	added protocols io upload preview modal	2017-09-13 16:04:16 +02:00
Zanz2	b7432b336a	added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller	2017-09-13 15:15:08 +02:00
Mojca Lorber	dde9854bf1	update protocol import/export and clone	2017-01-18 14:22:19 +01:00
zmagod	da54d779ec	Merge branch 'rich-text-formatting' of https://github.com/biosistemika/scinote-web into zd_SCI_687	2016-11-17 08:48:40 +01:00
zmagod	b781db9667	fixed bullets	2016-11-16 15:30:14 +01:00
Luka Murn	83160a487b	Fix importer so it supports rendering & importing rich text format ... Closes SCI-674.	2016-11-15 16:57:53 +01:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00