scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 23:44:55 +08:00
Code Issues Projects Releases Packages Wiki Activity
3637 commits 43 branches 185 tags 169 MiB
Commit graph

111 commits

Author SHA1 Message Date
mlorb
4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
zmagod
7af4816ce8 removes js brakepoint 2018-01-05 17:13:39 +01:00
zmagod
3fae267547 fix import protocol preview [fixes SCI-1867] 2018-01-05 15:30:11 +01:00
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747 
Improve server side assets validation display for steps [SCI-1747]
 2017-12-04 14:12:43 +01:00
Oleksii Kriuchykhin
373d7e8aa6 Clear selected files after successful upload [SCI-1747] 2017-12-01 11:51:22 +01:00
Oleksii Kriuchykhin
745dac09a7 Improve clean-up of dropped files [SCI-1747] 2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin
e35031dd9a Small code fixies [SCI-1747] 2017-11-28 11:34:57 +01:00
zmagod
d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
zmagod
afbeafb137 adds RTE images import, disables turbolinks on edit step actions 2017-11-22 16:28:14 +01:00
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Mojca Lorber
a0f7030a70 fix bug with tinyMCE text validaton 2017-09-07 14:54:12 +02:00
Zmago Devetak
4873624cec Merge pull request #658 from ZmagoD/zd_SCI_1011 
Multiple file upload with drag & drop capability in steps and results
 2017-06-09 10:03:33 +02:00
zmagod
33b996ffee refactor 2017-06-09 09:49:57 +02:00
zmagod
c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +02:00
Luka Murn
f382c04f01 Refactor JS code a bit 
Closes SCI-1323.
 2017-06-06 08:02:01 +02:00
Luka Murn
1712fc0611 Fix bug with protocol preview modal not working in protocol repo 
Closes SCI-1323.
 2017-06-05 17:10:13 +02:00
zmagod
ab4961ddb1 adds overlay partial 2017-06-05 11:31:05 +02:00
zmagod
67d902db52 refactor 2017-06-05 10:43:58 +02:00
zmagod
1c021b11db adds drag and drop files upload to steps [fixes SCI-1310] 2017-06-02 16:34:09 +02:00
ajugo
a9bd86352d Step: wrong last columns of table [fixes SCI-405] (#600) 
* Step: wrong last two columns of table after add table results [fixes SCI-405]

* Changing double quotes to single

* Adding empty line back
 2017-06-01 15:52:02 +02:00
zmagod
5806cb8e67 removes unneeded animateSpinner call 2017-05-29 09:10:11 +02:00
zmagod
b21923cf98 prevent to duplicate new step [fixes SCI-1280] 2017-05-16 11:52:07 +02:00
zmagod
2081e0a94b Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1 2017-05-10 15:14:17 +02:00
Zmago Devetak
4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
zmagod
f784844472 fixes bug with empty checklist item [fixes SCI-1233] 2017-05-04 16:15:00 +02:00
zmagod
acc5594f1b add popup for approval to complete the Task [fixes SCI-1200] 2017-05-04 12:41:22 +02:00
Matej Zrimšek
a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02:00
Mojca Lorber
49574e7a06 remove behavior of not allowing the empty tables in steps 2017-04-25 10:21:16 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
Oleksii Kriuchykhin
181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +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
zmagod
8c035a1981 renames organization in assets 2017-01-25 12:12:27 +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
Oleksii Kriuchykhin
401b37956b Simplify protocol export start [SCI-742] 2017-01-23 17:43:48 +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
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
Mojca Lorber
dde9854bf1 update protocol import/export and clone 2017-01-18 14:22:19 +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
Luka Murn
a2935c6620 Add sample info modal popup to sample smart annotations 
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').

Closes SCI-892.
 2017-01-16 15:52:02 +01:00