scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 16:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
1869 commits 70 branches 179 tags 165 MiB
Commit graph

31 commits

Author SHA1 Message Date
zmagod 55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
Oleksii Kriuchykhin 5c0197220d Fix moving of the steps after adding a new one [SCI-615] 2017-04-06 12:53:21 +02:00
Oleksii Kriuchykhin 218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +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
Oleksii Kriuchykhin 100cc700c6 Fix RTF toolbar init after eding new step [SCI-943] 2017-01-26 16:37:44 +01:00
zmagod afd8328e9c rename ortanizations -> teams 2017-01-25 14:22:06 +01:00
Oleksii Kriuchykhin 365eef506c Fixes merge conflicts with smart-annotations branch 2017-01-24 15:20:50 +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
zmagod 9c3bc8dac7 fixes checklist item user popover bug [fixes SCI-907] 2017-01-23 09:47:04 +01:00
zmagod 9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
zmagod f2d5066dc7 fix some bugs 2017-01-19 11:37:59 +01:00
zmagod 88d7cb200e removed quill 2017-01-18 23:06:14 +01:00
zmagod 65fa631b1c adding tinyMce first run 2017-01-18 22:40:08 +01:00
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
zmagod 3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
zmagod 89e8946a47 expand smart annotation 2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin 4c9c9037ed Enable image preview after editing protocol and disable preview modal animation [SCI-868] 2017-01-09 17:19:46 +01:00
Oleksii Kriuchykhin aa2b573278 Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
Oleksii Kriuchykhin d2b76d8385 Improved image preview modal [SCI-694] 2016-12-19 17:36:18 +01:00
Zmago Devetak c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
zmagod 897e34a23b reinitialize highlight.js after ajax call 2016-12-16 11:44:42 +01:00
zmagod b87246c8c2 cleanup spinner after edit step 2016-12-16 11:10:03 +01:00
zmagod 50c9dd3f59 fixed typo 2016-12-14 14:40:56 +01:00
zmagod e23be6cc0e fixed step description links [fixes SCI-780] 2016-12-09 15:26:41 +01:00
zmagod de3099e4d1 removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository 2016-12-09 13:59:49 +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
zmagod 8d7285ce7c load comments after edit step [fixes SCI-716] 2016-11-22 14:39:08 +01:00
Matej Zrimšek a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Matej Zrimšek ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Renamed from app/assets/javascripts/protocols/steps.js (Browse further)