284 commits

Author	SHA1	Message	Date
Zanz2	ea8f3e822d	Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone	2017-09-20 08:38:34 +02:00
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	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	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	b1e939e715	add experiment to activities	2017-04-20 13:16:11 +02:00
Oleksii Kriuchykhin	2edebb282a	Add team_id field to assets and tables [SCI-1046]	2017-03-23 10:36:55 +01:00
zmagod	0c2523beca	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-03-10 16:21:43 +01:00
Oleksii Kriuchykhin	031741d122	Disable protocols link if user has no teams [SCI-934]	2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin	c119b7c014	Make sciNote work for users without any teams [SCI_934]	2017-02-01 14:16:26 +01:00
zmagod	c2c5616078	rename Organization to Team in controllers	2017-01-24 17:06:51 +01:00
zmagod	21c2f82582	rename controllers where org/organization	2017-01-24 16:57:14 +01:00
Oleksii Kriuchykhin	d555ba7905	Add export to protocol management page and code style improvements [SCI-742]	2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin	14a6705b55	Implemented protocol export through Zip::OutputStream [SCI-742]	2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin	1abd7fc574	Added xml schemas and zip gem [SCI-742]	2017-01-23 17:34:02 +01:00
Oleksii Kriuchykhin	0546716a0b	Improve user input sanitization, fix bugs [SCI-102]	2017-01-11 15:50:11 +01:00
Oleksii Kriuchykhin	835e982292	SAnitize AJAX calls in controllers and datatables [SCI-102]	2017-01-05 13:12:22 +01:00
Oleksii Kriuchykhin	cd3924afd3	Sanitize .html_safe marked strings which contain tags [SCI-102]	2017-01-05 13:04:19 +01:00
mlorb	59751ec41e	Merge pull request #373 from mlorb/ml_sci_709 ... Add Protocol Preview to Protocol repository [SCI-709]	2017-01-04 11:28:55 +01:00
zmagod	a434649f42	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-01-03 16:35:25 +01:00
Mojca Lorber	c476faca30	fix hound	2017-01-03 11:04:09 +01:00
Mojca Lorber	e555535dfb	add edit button to protocol preview modal	2017-01-03 10:04:14 +01:00
Oleksii Kriuchykhin	d798f1b120	Fix XSS vulnerability in protocol keywords [SCI-632]	2016-12-29 15:15:29 +01:00
Mojca Lorber	40e3240a99	add content to preview modal	2016-12-22 11:43:11 +01:00
zmagod	e554fdf805	code refactor	2016-12-21 16:52:15 +01:00
Mojca Lorber	2cfcba0ceb	add protocol preview modal	2016-12-13 10:39:18 +01:00
Oleksii Kriuchykhin	3d25da5db7	Fixed bug with protocol loading from file [SCI-605]	2016-11-03 14:15:22 +01:00
Oleksii Kriuchykhin	e8d20dfc01	Added additional activities [SCI-605]	2016-11-02 10:43:36 +01:00
zmagod	d7f514db09	fixes search	2016-10-17 15:10:26 +02:00
Jure Grabnar	1f67aec258	Prevent destroying protocols when file is edited ... SCI-552 #close	2016-10-06 16:13:42 +02:00
zmagod	852fe499fb	clean up linked protocol	2016-08-12 16:31:40 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00