Commit graph

26 commits

Author SHA1 Message Date
Luka Murn 08c6210f7c Also employ "no format" Nokogiri strategy when sanitizing
Closes SCI-691.
2016-11-17 16:43:14 +01:00
Luka Murn fc32aa8606 Add custom scrubber for QuillJs 2016-11-17 16:43:14 +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
Luka Murn 29f0557d3c Prevent CORS when importing protocols 2016-11-15 17:06:39 +01:00
Luka Murn fa6d8d3020 Save first time tutorial Activity-s without callbacks
This PR adds a new, pretty useful little gem called sneaky-save.
Closes SCI-655
2016-11-14 15:55:44 +01:00
zmagod a116feac9c fixed typos and added truncation to org name 2016-10-17 15:21:19 +02:00
zmagod e85ed788f2 fixed user_generator 2016-10-17 15:10:26 +02:00
Matej Zrimšek f2cd9890dd Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS. 2016-10-17 11:57:47 +02:00
Matej Zrimšek a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Oleksii Kriuchykhin 28ab599373 Change double quotes to single [fixes SCI-314] 2016-09-22 16:36:37 +02:00
Oleksii Kriuchykhin 9b7360eebf Fixes issue with import of empty protocol [fixes SCI-314] 2016-09-20 13:41:29 +02:00
Matej Zrimšek 76ff34a8a9 URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring. 2016-09-13 18:56:47 +02:00
Matej Zrimšek 40355dcc97 If file is recognized as office file, it's allowed to be any office file type. 2016-09-07 14:04:11 +02:00
Luka Murn 0e0228cb8c Codestyle fixes 2016-08-30 13:06:49 +02:00
Luka Murn 30e8e33774 Add comment activities to first time data generator 2016-08-30 08:19:35 +02:00
zmagod dbdbff12eb add experiment level tutorial step [fixes SCI-338] 2016-08-24 19:03:58 +02:00
Jure Grabnar c3074e91de Fix activity in first time generator 2016-08-18 08:33:08 +02:00
Zmago Devetak da735a51f4 Merge pull request #62 from ZmagoD/zd_SCI_318
Zd sci 318
2016-08-17 10:01:10 +02:00
zmagod 4293f9c267 Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271 2016-08-17 09:58:29 +02:00
zmagod 852fe499fb clean up linked protocol 2016-08-12 16:31:40 +02:00
zmagod d1f6a0f58d fixed hound 2016-08-11 16:24:44 +02:00
zmagod a128815122 fixed tutorial tasks on canvas 2016-08-11 16:06:51 +02:00
Luka Murn c8ef3b1899 Fix first time generator 2016-07-28 16:40:51 +02:00
Jure Grabnar 49cd8a783d Update first time data generator with experiment. 2016-07-26 12:20:31 +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