Urban Rotnik
bf6041e13d
Update sanitization of html descriptions
2019-06-19 11:05:22 +02:00
Urban Rotnik
7e69375016
Drop header column and row when extract tables
2019-06-19 10:47:38 +02:00
Urban Rotnik
2a579f2240
Add Warnings, Before start and Guidelinese to protocol description
2019-06-19 09:02:42 +02:00
Mojca Lorber
ebcaa4b014
Implement protocols.io error handling for api client and normalizer
2019-06-18 14:01:57 +02:00
Urban Rotnik
7fad5fc594
Add search service and normalizer for list
2019-06-17 12:24:15 +02:00
Jure Grabnar
362b0cd45d
Hound fixes
2019-06-17 12:24:11 +02:00
Jure Grabnar
640f6c1211
Fix tests after BuildProtocolFromClientService refactor
...
Closes SCI-3544
2019-06-17 12:24:11 +02:00
Jure Grabnar
1e8627c450
Refactor ImportProtocol service to BuildProtocolService
...
Closes SCI-3544
2019-06-17 12:24:10 +02:00
Urban Rotnik
2bb4f558b7
View rendering simplified, small improvements
2019-06-17 12:24:09 +02:00
Urban Rotnik
807104035c
Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated
2019-06-17 12:24:09 +02:00
Urban Rotnik
6a4deb0201
Add ProtocolIntermediateObject
2019-06-17 12:24:09 +02:00
Urban Rotnik
aadf2eecb4
Basic data normalizer for ProtocolIO
2019-06-17 12:24:08 +02:00
Urban Rotnik
ec49388283
Add protocol base normalizer class
2019-06-17 12:24:08 +02:00
Jure Grabnar
c1cee07a63
Extract API client constants to constants.rb
2019-06-17 12:24:08 +02:00
Jure Grabnar
a15b1f6dfa
Add logging for ApiClient and fix hound formatting
2019-06-17 12:24:08 +02:00
Jure Grabnar
5685709f48
Implement API client for protocols.io
...
Closes SCI-3357
2019-06-17 12:24:07 +02:00
aignatov-bio
68937dd192
Fix RTE import for protocol repository ( #1833 )
2019-06-14 16:20:27 +02:00
Oleksii Kriuchykhin
8920d38a02
Make repositories more extendable [SCI-3528]
2019-06-06 17:28:59 +02:00
Oleksii Kriuchykhin
6917ea56e8
Fix import of ELN protocols [SCI-3506]
2019-05-29 15:41:54 +02:00
aignatov-bio
3633274c8f
Fix import for eln ( #1741 )
2019-05-13 10:22:30 +02:00
Anton Ignatov
7c55fcf0cf
Merge branch 'master' into master-with-note-section
2019-04-30 12:07:59 +02:00
Jure Grabnar
b37349624a
Merge pull request #1714 from biosistemika/jg_sci_3380
...
Add editnew action for editing new office files [SCI-3380]
2019-04-30 09:57:07 +02:00
Jure Grabnar
ed003aca13
Add editnew action for editing new office files
...
Closes SCI-3380
2019-04-30 08:19:52 +02:00
Anton Ignatov
7d60eb5572
Fix migration issues
2019-04-23 11:11:22 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
aignatov-bio
6b45dcd475
Update eln export for new tinyMCE image format ( #1680 )
2019-04-19 14:44:40 +02:00
Mojca Lorber
b00cf07684
Add activity for importing inventory items
2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin
f9832013b0
Improve experiment preview image generation [SCI-3177]
2019-04-17 12:06:46 +02:00
Oleksii Kriuchykhin
e7151e6e6b
Disable inventory import activity logging [SCI-3290]
2019-04-03 22:42:33 +02:00
Alex Kriuchykhin
d8ce4d4a91
Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2
...
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
2019-04-03 21:14:36 +02:00
Oleksii Kriuchykhin
14978f7c1f
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
2019-04-03 19:51:54 +02:00
Jure Grabnar
f00f4d39af
Refactor step activities using position_plus_one
...
Closes SCI-3273
2019-04-03 13:10:45 +02:00
Jure Grabnar
a2623b5124
Fix non-existant current_team in WOPI create_activity
...
Closes SCI-3279
2019-04-02 14:20:01 +02:00
mlorb
b24a07f1c8
Merge pull request #1616 from mlorb/ml-sci-3237
...
Change activities for task protocols [SCI-3237]
2019-04-01 14:32:16 +02:00
Jure Grabnar
6533368763
Add activity for importing inv items
2019-03-29 15:41:34 +01:00
Mojca Lorber
3c69225d6b
Change activities for task protocols
2019-03-29 15:09:20 +01:00
Miha Mencin
4c3c0ef908
removing activity creation from demo project
2019-03-25 15:45:10 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities
2019-03-25 14:35:24 +01:00
Mojca Lorber
e34ddeaefd
Remove activities from demo project
2019-03-20 13:25:59 +01:00
Mojca Lorber
cd7a87348f
Protocol activities refactoring, without tests
2019-03-19 16:12:07 +01:00
Miha Mencin
6deaff6382
fixing hound errors
2019-03-04 18:36:32 +01:00
Miha Mencin
fa7bba9de7
scheduling creation of demo project at the sign in time
...
remove wrong schema, fix comment, add migration
2019-03-04 18:26:15 +01:00
Miha Mencin
4f9daa9590
SCI-3112 Change the the comments in demo project generator
2019-02-28 11:39:44 +01:00
Miha Mencin
088a860683
Merge pull request #1539 from biosistemika/features/templates
...
Features/templates
2019-02-28 10:23:13 +01:00
Miha Mencin
d03ef2cd2a
Merge branch 'master' into features/templates
2019-02-28 09:41:20 +01:00
Jure Grabnar
93490a1f47
Add missing created_at and fix typo
...
Closes SCI-3100, SCI-3098
2019-02-28 07:29:25 +01:00
Jure Grabnar
0fbbe8b5de
Add result comments to demo project
...
Closes [SCI-3100].
2019-02-27 20:32:28 +01:00
Jure Grabnar
0699204d3b
Add changes for parallel exec discussed with Miha
2019-02-27 15:22:19 +01:00
Jure Grabnar
30bc536d07
Fix smart annotations in demo project
...
Closes SCI-3097, SCI-3102.
2019-02-26 14:36:48 +01:00
Jure Grabnar
2464a45f83
Fix ordering for another step in demo project
...
Closes SCI-3098.
2019-02-26 08:34:50 +01:00
Jure Grabnar
c409c39e60
Fix demo project's checklist item ordering
...
Closes SCI-3099.
2019-02-26 08:26:02 +01:00
Jure Grabnar
b6dd783114
Improve generation of a demo project
...
Closes SCI-3096
2019-02-26 08:06:07 +01:00
Urban Rotnik
c8ab9f8ff8
Fix tests
2019-02-26 08:04:05 +01:00
Jure Grabnar
d7e91676c3
Rename initial experiment back to the old one
2019-02-24 08:13:57 +01:00
Jure Grabnar
f98d6fbd4d
Remove archived task in Demo project
...
Closes SCI-3082.
2019-02-22 11:58:32 +01:00
Jure Grabnar
ffe0493013
Rename Demo project and create rake task to create it on existing users
...
Closes SCI-3080.
2019-02-21 23:31:55 +01:00
Mojca Lorber
16f99afbc0
Minor fixes
2019-02-13 12:20:14 +01:00
Mojca Lorber
227aeb284c
change mydemo projects data
2019-02-05 11:15:16 +01:00
Mojca Lorber
fa1dff6352
refactor Demo project generation
2019-01-24 13:40:53 +01:00
Oleksii Kriuchykhin
c86063f79e
Fix failing tests [SCI-2688]
2018-08-24 15:48:49 +02:00
zmagod
e654725d9e
fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511]
2018-07-06 14:26:20 +02:00
mlorb
f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix
...
Update software with new logo & new brand [SCI-2416]
2018-05-23 15:47:17 +02:00
Oleksii Kriuchykhin
5c41527b92
Enable editing office online files in inventories [SCI-2342]
2018-05-21 15:48:48 +02:00
Luka Murn
69d1f0511f
Rename sciNote -> SciNote (app/ folder)
2018-05-21 15:19:11 +02:00
Oleksii Kriuchykhin
39d594b0da
Disable some validations in repository import to improve speed [SCI-2404]
2018-05-15 11:14:43 +02:00
Luka Murn
5e2622ecfc
Change default repository state to Ruby representation
...
Also remove some dead code from repositories datatables
2018-04-20 12:31:22 +02:00
Zmago Devetak
93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259
...
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-19 17:17:54 +02:00
Luka Murn
09c60d2468
Fixes per @Ducz0r's request
2018-04-12 14:38:22 +02:00
Luka Murn
9bf8b5d864
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
...
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
2018-04-12 13:16:46 +02:00
zmagod
23653d1d95
refactor
2018-04-11 09:29:08 +02:00
zmagod
e4b49e62a3
fixes import limit
2018-04-10 15:45:51 +02:00
Oleksii Kriuchykhin
51860652c1
Refactor smart annotations modal [SCI-2223]
2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin
a105e61d48
Remove tutorial [SCI-1860]
2018-03-18 13:18:05 +01:00
zmagod
b67a54e2d1
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import
2018-03-13 15:25:57 +01:00
zmagod
5b56f3dbd6
fix hound
2018-03-13 14:47:35 +01:00
zmagod
dd2f7dd417
Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration
2018-03-13 13:24:36 +01:00
zmagod
0996745781
refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024]
2018-03-02 13:39:22 +01:00
zmagod
83ba412c48
remove unneeded comment
2018-03-01 11:51:39 +01:00
zmagod
6908368506
refactor
2018-02-27 10:43:57 +01:00
zmagod
3aa28f6d11
assign repository row to task
2018-02-27 10:40:52 +01:00
Matej Zrimšek
1904099954
Put permissions helper methods inside utility module.
2018-02-21 20:22:13 +01:00
zmagod
18eab358c7
generate custom repository when user is created [fixes SCI-2020]
2018-02-13 10:44:50 +01:00
okriuchykhin
a2896031ab
Merge pull request #951 from okriuchykhin/ok_SCI_1949
...
Allow first user seeding from env variables [SCI-1949]
2018-01-23 14:02:54 +01:00
Oleksii Kriuchykhin
df28503ec1
Fix fetching protocol name in protocol import [SCI-1951]
2018-01-18 17:25:20 +01:00
Oleksii Kriuchykhin
d1a515da90
Allow first user seeding from env variables [SCI-1949]
2018-01-18 16:23:33 +01:00
zmagod
3fae267547
fix import protocol preview [fixes SCI-1867]
2018-01-05 15:30:11 +01:00
zmagod
e69e9f6794
remove unneeded comment and add tiny_mce_asset regex in a constant
2017-11-24 17:04:01 +01:00
Zmago Devetak
728f656472
update protocols_exporter.rb
2017-11-24 15:23:19 +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
zmagod
91fec89cab
adds tiny_mce_assets to protocol export
2017-11-21 16:30:48 +01:00
mlorb
126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
...
Scinote protocols IO base branch
2017-11-06 14:53:01 +01:00
okriuchykhin
db9a031581
Merge pull request #813 from okriuchykhin/ok_SCI_1642
...
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
Zanz2
f5b2ad0d34
Refactor github code review
2017-10-07 16:07:04 +02:00
Zanz2
48f03d6dfb
hound blank line fix
2017-10-05 18:41:58 +02:00
Zanz2
fc1cd73e1d
fixed hound blank line
2017-10-05 18:38:44 +02:00
Oleksii Kriuchykhin
b26b963e54
Optimize update canvas SQL and remove module group name [SCI-1642]
2017-10-05 16:19:25 +02:00
Zanz2
79e065a811
Fixed a mistake in the fix that made it not render the preview
2017-09-25 14:39:43 +02:00
Luka Murn
05e627e976
Fix missing value in delayed_uploader_tutorial
...
Closes OPENSCI-26.
2017-09-22 17:10:53 +02:00
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
Jure Grabnar
674326e761
Add timestamp WOPI checking
...
Change status error code to 500.
2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec
First working version of office integration
...
Only works on scinote-preview
2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5
Initial commit of WOPI integration
2016-09-28 09:33:44 +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