Zanz2
72c707ae88
protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit
2017-09-20 15:31:10 +02:00
Zanz2
7b85d74a23
added jquery code to reset file selector selected file after it is canceled in the preview modal
2017-09-20 09:32:31 +02:00
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
osboxes.org
8c83b3a196
Added updated_at values and unnecessary migration rollback [fixes SCI-1145]
2017-05-11 11:08:36 +02:00
Mojca Lorber
b1e939e715
add experiment to activities
2017-04-20 13:16:11 +02:00
Oleksii Kriuchykhin
d2c8e9a395
Set team for assets and tables in generators [SCI-1046]
2017-03-24 14:46:20 +01: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
okriuchykhin
2a33391f4b
Merge pull request #511 from okriuchykhin/ok_SCI_1090
...
Refactoring of the comments using STI [SCI-1090]
2017-03-10 10:50:43 +01:00
Luka Murn
ae96223437
Fix rake db:add_user task
2017-03-09 15:37:15 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Mojca Lorber
330fe9c291
fix repeat tutorial is always created on the same team
...
Closes SCI-1028.
2017-02-22 13:43:03 +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
Mojca Lorber
99a40961fa
fix problem with protocol export
2017-01-25 16:12:48 +01:00
zmagod
1220466035
fixing hound
2017-01-25 15:00:14 +01:00
zmagod
a6285f0431
renamed utilities
2017-01-25 10:24: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
2434c73a0c
Remove unneeded HTML scrabber in protocol importer [SCI-921]
2017-01-24 09:52:38 +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
69f31a62e7
Initial code commit [SCI-742]
2017-01-23 17:33:10 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
zmagod
65fa631b1c
adding tinyMce first run
2017-01-18 22:40:08 +01:00
okriuchykhin
18d329fb42
Merge pull request #423 from okriuchykhin/ok_SCI_896
...
Make search work for full names in smart annotations [SCI-896]
2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin
6555fd02b6
Make search work for full names in smart annotations [SCI-896]
2017-01-18 16:57:51 +01:00
Oleksii Kriuchykhin
e45749d3b2
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 14:46:53 +01:00
Mojca Lorber
f656a1093d
fix hound
2017-01-18 14:40:24 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Oleksii Kriuchykhin
50edaef4ff
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-16 16:55:10 +01:00
zmagod
1840fdb7e5
cleanup js
2017-01-12 09:52:29 +01:00
zmagod
065e1a7120
fix hound
2017-01-11 15:06:00 +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
a434649f42
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-01-03 16:35:25 +01:00
zmagod
e554fdf805
code refactor
2016-12-21 16:52:15 +01:00
Nejc Bernot
ef60982913
Subdomain checks fixed
2016-12-01 14:20:43 +01:00
Nejc Bernot
495c648f41
Added subdomain based routing constraints
...
Non-wopi routes will only work with the subdomain set by the env variable USER_SUBDOMAIN (if it is set). Likewise, wopi routes will only work with the WOPI_SUBDOMAIN if it is set, but they also require the WOPI_ENABLED to be true.
2016-11-30 16:43:33 +01:00
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
Jure Grabnar
a6ebff06a7
Add error message to wopi discovery
...
Fix ambigious open call
2016-09-30 10:39:14 +02:00
Jure Grabnar
ff47f29dc2
Add wopi file activity
...
SCI-393 #close
2016-09-29 16:16:42 +02:00
Jure Grabnar
5aea0fbb19
Refactor the rest of WOPI logic from Nejc
2016-09-28 09:33:44 +02:00