69 commits

Author	SHA1	Message	Date
Luka Murn	cf72da5635	Merge branch 'improved-files-handling' into 'master' ... Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb	2017-01-18 11:29:40 +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	0546716a0b	Improve user input sanitization, fix bugs [SCI-102]	2017-01-11 15:50:11 +01:00
Oleksii Kriuchykhin	d2b76d8385	Improved image preview modal [SCI-694]	2016-12-19 17:36:18 +01:00
Oleksii Kriuchykhin	8738b3e09d	Added image preview to Results [SCI-694]	2016-12-16 15:55:46 +01:00
zmagod	40fdfef67f	setup delayed_paperclip gem	2016-12-08 15:24:14 +01:00
zmagod	ac52e643be	cleanup direct upload	2016-12-08 11:26:13 +01:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
zmagod	1eb9f772f4	refactor sciNote comments js and unified all comments behavior [fixes SCI-474]	2016-09-27 10:30:48 +02:00
zmagod	02bfa1949e	fixed project comments	2016-09-27 09:00:02 +02:00
zmagod	06b1992e94	Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436	2016-09-21 19:20:55 +02:00
zmagod	9f56df02d2	removes comment tab and add comment in the info tab [fixes SCI-436]	2016-09-20 18:53:51 +02:00
zmagod	b9b466cd8e	Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas	2016-09-16 09:28:19 +02:00
Mojca Lorber	a9029e0928	fixes responsiveness on mobile phone for sample view	2016-09-14 11:08:40 +02:00
Jure Grabnar	6519e8dbb1	Add e-notation preprocessing to formulas ... SCI-350 #close	2016-09-13 09:46:22 +02:00
Jure Grabnar	e096f936f9	Add formulas to results	2016-09-13 09:44:17 +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