zmagod
55c8c498e2
add image upload functionality to result text
2017-04-24 12:28:27 +02:00
zmagod
550f563666
working version for steps first run
2017-04-21 16:09:04 +02:00
zmagod
0757563d02
adds step tiny_mce asset relation
2017-04-19 17:22:57 +02:00
zmagod
4385c68f5f
adds zip_export utility first run
2017-03-21 16:15:11 +01:00
zmagod
7b16e5643e
fix assets preprocesor for wopi files
2017-03-13 13:20:49 +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
zmagod
9624a17298
rename database tables, columns
2017-01-24 16:07:22 +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
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +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
488613afcc
Add index to users' full name attribute
2017-01-05 16:26:49 +01:00
zmagod
8cd092b521
update schema
2017-01-03 16:51:02 +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
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
Mojca Lorber
01e75fbbcc
create samples table model and migration
2016-12-05 11:08:33 +01:00
Nejc Bernot
cb03ed8384
Users can now have multiple tokens
...
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
2016-11-30 16:48:42 +01:00
Luka Murn
c1c73ad804
Update schema.rb
2016-11-25 16:51:39 +01:00
zmagod
557957c857
fixed issue with mozilla browsers
2016-10-17 15:21:19 +02:00
zmagod
a116feac9c
fixed typos and added truncation to org name
2016-10-17 15:21:19 +02:00
zmagod
e092679ef6
fixes schema
2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311
setup global team switch view and controller action
2016-10-17 15:10:26 +02:00
Mojca Lorber
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +02:00
Oleksii Kriuchykhin
5399033fce
Added user settings for email notifications [SCI-443]
2016-10-11 16:43:17 +02:00
Luka Murn
c37885692d
Add DB index onto checked field of user_notifications
2016-10-05 16:21:13 +02:00
zmagod
a68e7abc57
first run notification settings
2016-10-04 15:52:48 +02:00
zmagod
e1a1b93d44
fixed migrations
2016-09-29 14:49:58 +02:00
zmagod
485497334d
generated notification related migrations and model tests
2016-09-28 14:18:52 +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
zmagod
7abc8f3a90
Merge branch 'master' into experiment-level
2016-08-17 09:28:35 +02:00
scibb
a6d39762db
the migration to update canvas coordinates
2016-08-09 10:04:10 +02:00
zmagod
1a56396eb5
add workflow image to project overview page [fixes SCI-41]
2016-08-08 16:02:17 +02:00
Jure Grabnar
964b51f84a
Add experiment reports element
2016-08-03 12:52:52 +02:00
Luka Murn
3187843d14
Change updated_by -> last_modified_by
2016-07-25 14:47:13 +02:00
Luka Murn
785fb2cba1
Initial migration & changes in ActiveRecords
2016-07-22 10:43:55 +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
