zmagod
acc5594f1b
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-04 12:41:22 +02:00
Mojca Lorber
f8f6a5f63a
fix bug edit canvas not working and fix positioning of cloned task/workflow
2017-05-04 10:54:50 +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
zmagod
86c6ae3b03
display tinyMCE images in reports
2017-04-25 09:53:35 +02:00
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
c25df63a14
add tinymce img importer and refactor input sanitize helper
2017-04-19 09:11:52 +02:00
okriuchykhin
3d805d529d
Merge pull request #554 from okriuchykhin/ok_SCI_877
...
Add image preview to protocol repository [SCI-877]
2017-04-18 08:58:39 +02:00
Oleksii Kriuchykhin
4fac6484b5
Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]
2017-04-14 16:05:35 +02:00
zmagod
f104444a0c
adds additional explanations [fixes SCI-1103]
2017-04-12 16:56:47 +02:00
Oleksii Kriuchykhin
181d981a51
Add image preview to protocol repository [SCI-877]
2017-04-12 16:05:38 +02:00
Zmago Devetak
9c31239318
Merge pull request #552 from biosistemika/release-1.9.0
...
Release 1.9.1
2017-04-12 13:08:37 +02:00
zmagod
9610c5f5a0
fix info dropdown links [fixes SCI-1141]
2017-04-07 11:31:09 +02:00
zmagod
f16607579f
refactor steps annotation
2017-04-06 13:03:13 +02:00
mlorb
317739af1e
Merge pull request #530 from biosistemika/ml_sci_1044
...
Add data-hook and yadcf-filter plug-in [SCI-1044]
2017-03-31 14:00:23 +02:00
Mojca Lorber
503ee5b62e
change place of data-hook
2017-03-30 17:21:29 +02:00
Mojca Lorber
9458f391e5
add data-hook and yadcf-filter plug-in
2017-03-29 15:59:51 +02:00
Zmago Devetak
0019fd19ea
Merge pull request #525 from ZmagoD/zd_SCI_765
...
Export large files - utility class
2017-03-29 11:55:51 +02:00
zmagod
0096f9dc14
refactor
2017-03-29 09:32:23 +02:00
okriuchykhin
05a49e5a82
Merge pull request #528 from okriuchykhin/ok_SCI_1133
...
Fix secondary navigation on Mac [SCI-1133]
2017-03-29 09:30:34 +02:00
Oleksii Kriuchykhin
391c5af267
Fix secondary navigation on Mac [SCI-1133]
2017-03-28 14:36:52 +02:00
zmagod
7039420f99
add hook to canvas module actions
2017-03-28 10:43:39 +02:00
zmagod
0996c14449
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
2017-03-27 10:41:58 +02:00
zmagod
2235fd3fb7
adds view if download expires
2017-03-27 10:38:28 +02:00
mlorb
3beb179f87
Merge pull request #514 from biosistemika/ml_sci_1089
...
Add error messages to sample group/type edit/delete actions [SCI-1089]
2017-03-27 09:57:32 +02:00
zmagod
4635a3320d
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-24 16:09:28 +01:00
Zmago Devetak
804fb2fec9
Merge pull request #519 from ZmagoD/zd_SCI_1092_v2
...
adds hooks in team switch [fixes SCI-1092]
2017-03-24 12:56:52 +01:00
zmagod
023b3213e8
fixes email link [fixes SCI-765]
2017-03-24 12:10:07 +01:00
Mojca Lorber
83fa8570d7
refactoring
2017-03-17 17:52:15 +01:00
zmagod
c244e69e81
fixed report comments bug [fixes SCI-1100]
2017-03-17 16:59:40 +01:00
zmagod
70f17a924e
adds hooks in team switch [fixes SCI-1092]
2017-03-17 16:10:22 +01:00
Mojca Lorber
7a4e3201e7
add error messages to sample group/type edit/delete actions
2017-03-14 17:32:25 +01:00
zmagod
5d372851d3
fixes reports comment bug [fixes SCI-1100]
2017-03-14 16:24:02 +01:00
zmagod
856a4611c6
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-14 15:58:08 +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
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
1e3a697a91
Merge pull request #508 from biosistemika/lm-sci-838-fix
...
Open edit/view Office files in new browser tab/window [SCI-838]
2017-03-09 10:39:16 +01:00
Luka Murn
0e8f5f8e99
Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix
...
Conflicts:
app/views/my_modules/_state_buttons.html.erb
2017-03-09 08:44:09 +01:00
zmagod
5c2e9a4b04
adds extends and fixes report methods
2017-03-08 14:14:03 +01:00
Luka Murn
800df7a26b
Also make button icons work when rendering them via JS
...
Closes SCI-1073.
2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Luka Murn
7c9aa2e476
Hide complete&uncomplete task buttons if user cannot do it
...
Closes SCI-1091.
2017-03-06 16:01:04 +01:00
Luka Murn
86a800a84e
Open edit/view Office files in new browser tab/window
...
Closes SCI-838.
2017-03-06 14:12:18 +01:00
Luka Murn
473487faec
Add HTML <head><title> to edit, view file pages
...
Closes SCI-1049.
2017-03-06 13:55:07 +01:00
Luka Murn
4ddb139911
Fix padding of state buttons
...
Closes SCI-1073.
2017-03-03 16:36:52 +01:00
Luka Murn
3d7f09bde6
Fix protocol state buttons a bit
...
Closes SCI-1073.
2017-02-28 14:35:12 +01:00
Luka Murn
fecfc9e41d
Merge pull request #498 from biosistemika/release-1.8.1
...
Release 1.8.1
2017-02-23 14:57:30 +01:00
Luka Murn
dc89c160be
Fix a bug with team page not working from user task modal
2017-02-23 14:45:00 +01:00
mlorb
a72a072fac
Merge pull request #495 from mlorb/ml_sci_948
...
Fix report - checklist items are in separate row than checkboxes [SCI-948]
2017-02-23 10:50:48 +01:00
Mojca Lorber
f84611f558
fix report - checklist items are in separate row than checkboxes
2017-02-22 15:51:26 +01:00
Zmago Devetak
58f97fdb5b
Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook
...
adds hook for lock task action
2017-02-22 14:24:01 +01:00
mlorb
42e6a99911
Merge pull request #487 from mlorb/ml_sci_1032
...
Fix visual bug in edit avatar mode [SCI-1032]
2017-02-22 10:59:18 +01:00
mlorb
8c111db31a
Merge pull request #486 from mlorb/ml_sci_1033
...
Fix user has no teams view [SCI-1033]
2017-02-22 10:58:39 +01:00
zmagod
151dc79a81
adds hook for lock task action
2017-02-21 16:25:50 +01:00
Mojca Lorber
ac0988ef32
add data-hooks for remove manage teams button
2017-02-21 15:39:08 +01:00
Mojca Lorber
0fd41e8a6d
remove changes on user has no teams view
2017-02-21 15:12:58 +01:00
mlorb
ea1711be83
Merge pull request #485 from mlorb/ml_sci_1001
...
Add data-hook for E-signature manifestation/display [SCI-1001]
2017-02-21 14:25:08 +01:00
mlorb
01d9f306a5
change div to span
2017-02-21 14:22:28 +01:00
Mojca Lorber
6b30f097f0
fix visual bug in edit avatar mode
2017-02-21 14:02:42 +01:00
Mojca Lorber
90864a45a0
fix user has no teams view
2017-02-21 13:08:06 +01:00
Luka Murn
6f1c19ae2d
Fix _user_dropdown.html.erb
2017-02-21 09:27:42 +01:00
Mojca Lorber
cb2127ee7f
add data-hook for E-signature manifestation/display
2017-02-20 18:03:55 +01:00
okriuchykhin
8e18ff44a6
Merge pull request #479 from okriuchykhin/ok_SCI_999
...
Add task complete/uncomplete functionality [SCI-999]
2017-02-20 15:19:00 +01:00
Luka Murn
ce617894c5
Fix manage project users modal bug
...
Closes SCI-1026.
2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin
218e96b1f0
Code style fixes [SCI-999]
2017-02-16 11:45:07 +01:00
Luka Murn
d097f0dd15
Merge pull request #477 from Ducz0r/lm-sci-928
...
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
2017-02-13 16:42:57 +01:00
Luka Murn
f93cc89624
Fix system notification email links not working bug
...
Closes SCI-964.
2017-02-10 15:13:33 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0
Move user profile to settings
2017-02-09 11:34:52 +01:00
Luka Murn
5cb3eb5e09
Refactor preferences -> move them to subcontroller, subroute
2017-02-09 11:07:16 +01:00
okriuchykhin
c2a69982aa
Merge pull request #471 from okriuchykhin/ok_SCI_936
...
Adds datatable to all teams page [SCI-936]
2017-02-07 10:33:33 +01:00
zmagod
c99a540eb3
adds hook to team name in the invitation template [fixes SCI-930]
2017-02-03 16:53:42 +01:00
Oleksii Kriuchykhin
62535a01bd
Move teams datatable js code into separate file [SCI-936]
2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin
8b105aa030
Add override hooks [SCI-936]
2017-02-02 23:35:47 +01:00
Zmago Devetak
65bbd81497
Merge pull request #469 from ZmagoD/zd_SCI_929
...
Adds hook in user settings navigation
2017-02-02 15:01:37 +01:00
mlorb
970d99e6e3
Merge pull request #465 from mlorb/ml_sci_937
...
Redesign of individual team page [SCI-937]
2017-02-02 11:15:55 +01:00
mlorb
5510fa7751
rename data-hooks in team view
2017-02-02 10:36:23 +01:00
Oleksii Kriuchykhin
db90c5d63b
Add datatable to all teams page [SCI-936]
2017-02-02 09:53:59 +01:00
zmagod
bb42bd04a5
adds hook in user settings navigation
2017-02-01 17:10:22 +01:00
Mojca Lorber
86351ce17d
add data-hooks for billing
2017-02-01 15:01:54 +01:00
Mojca Lorber
d3e0eca44e
redesign individual team page
2017-02-01 14:44:47 +01:00
Oleksii Kriuchykhin
031741d122
Disable protocols link if user has no teams [SCI-934]
2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin
c119b7c014
Make sciNote work for users without any teams [SCI_934]
2017-02-01 14:16:26 +01:00
Zmago Devetak
5c9954bb89
Merge pull request #450 from ZmagoD/zd_SCI_939
...
Refactor "organizations" to "teams"
2017-02-01 13:12:02 +01:00
okriuchykhin
067b9452a4
Merge pull request #464 from okriuchykhin/ok_SCI_935
...
Add config option to enable/disable users registration [SCI-935]
2017-02-01 09:36:36 +01:00
Luka Murn
db75231617
Update URLs to sciNote support pages
...
Closes SCI-978.
2017-01-31 15:48:56 +01:00
Oleksii Kriuchykhin
d1e69438de
Add config option to enable/disable users registration [SCI-935]
2017-01-30 15:04:02 +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
Luka Murn
0baaf12de3
Re-display images & checkboxes in PDF reports
...
Closes SCI-953.
2017-01-26 10:46:58 +01:00
Luka Murn
8c5a52417c
Merge pull request #445 from okriuchykhin/ok_SCI_940
...
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:49:38 +01:00
okriuchykhin
648d256dff
Merge pull request #448 from okriuchykhin/ok_SCI_945
...
Fix openning of protocol preview with images [SCI-945]
2017-01-25 17:27:01 +01:00
Oleksii Kriuchykhin
c55f3cb99c
Add flag to disable simple_format in custom_auto_link [SCI-940]
2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin
310d8c1920
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:18:19 +01:00
zmagod
afd8328e9c
rename ortanizations -> teams
2017-01-25 14:22:06 +01:00
Mojca Lorber
6905fc8c08
remove letter f
2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin
90e4b26c69
Fix openning of protocol preview with images [SCI-945]
2017-01-25 13:06:12 +01:00
zmagod
72e13beee3
renamed organizations in views
2017-01-25 12:01:23 +01:00
Mojca Lorber
2277af534c
fix table titles
2017-01-25 11:01:35 +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
6e7fa21dd3
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
2017-01-24 10:51:12 +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
Mojca Lorber
8e02c2e025
add locale - fix
2017-01-20 13:37:07 +01:00
mlorb
9a3c56de97
Merge pull request #421 from mlorb/ml_sci_540
...
Protocol steps/results - adding titles for tables [SCI-540]
2017-01-20 11:41:49 +01:00
Mojca Lorber
6653f0d4c1
small fixes
2017-01-19 16:42:14 +01:00
Mojca Lorber
4ea154410a
add to fields with rich text formatting
2017-01-19 15:27:24 +01:00
Mojca Lorber
44de927cf4
display smart annotations in reports - without rich text fields
2017-01-19 14:22:54 +01:00
zmagod
2cbb8ba41a
removed unneeded comments
2017-01-19 12:54:48 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +01:00
zmagod
27d3868f37
fix bugs
2017-01-19 09:40:39 +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
Mojca Lorber
3b92ab9f36
add names to tables from protocol steps in reports
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
Oleksii Kriuchykhin
a490a12fb1
Add truncation of image description in the preview [SCI-873]
2017-01-18 13:28:56 +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
Zmago Devetak
1b9f7db385
Merge pull request #405 from ZmagoD/zd_SCI_832
...
Visualization of User smart annotation after saving the field
2017-01-18 09:36:42 +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
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
Luka Murn
1acf258c70
Fix minor Zmagohound comment
2017-01-14 10:00:52 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
75031e17b9
Remove double sanitization from views [SCI-102]
2017-01-12 16:54:15 +01:00
Luka Murn
bc03a26d4b
Also fix this new year issue on comments display
2017-01-12 15:06:12 +01:00
Luka Murn
8b01f912a0
Fix new year problems with activities
...
Closes SCI-876.
2017-01-12 14:47:15 +01:00
Oleksii Kriuchykhin
0350f2f792
Add html escaping to name filelds in the views [SCI-102]
2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin
d05c16b0ba
Added auto_link wrapper with custom sanitization [SCI-102]
2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +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
Matej Zrimšek
30a9c283fb
Added back bullets to images in protocol preview in protocol repository.
2017-01-11 14:15:07 +01:00
Matej Zrimšek
852dc2eb7e
Added file downloading to protocol preview in protocol repository. [SCI-878]
2017-01-11 14:14:12 +01:00
zmagod
a4aa933151
refactor smart annotation parser helper
2017-01-11 10:34:14 +01:00
zmagod
a903772de8
style dropdown
2017-01-10 17:05:32 +01:00
zmagod
fc76a4ae6d
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
2017-01-10 14:22:04 +01:00
zmagod
89e8946a47
expand smart annotation
2017-01-10 14:14:21 +01:00
zmagod
e0e998a0d8
add smart annotation parser helper
2017-01-10 14:14:21 +01:00
zmagod
94262b56ef
prepare data for atwho
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
okriuchykhin
3f930ccfce
Merge pull request #392 from okriuchykhin/ok_SCI_858
...
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 12:49:38 +01:00
mz3944
ef431da2db
Merge pull request #389 from mz3944/mz-sci-848
...
Unable to delete samples [SCI-848]
2017-01-09 11:57:48 +01:00
mlorb
f14ad0f762
Merge pull request #387 from mlorb/ml_sci_732
...
Add protocol preview to search results [SCI-732]
2017-01-09 11:28:04 +01:00
Oleksii Kriuchykhin
bc8db28746
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 09:38:42 +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
Matej Zrimšek
ec7a1cb4c0
Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00
Luka Murn
7835753d3c
Add atwho-users URL to <body>
2017-01-06 12:48:37 +01:00
Mojca Lorber
aad2eadeae
syntax fix
2017-01-06 10:46:36 +01:00
Mojca Lorber
4e7e261225
fix protocol preview
2017-01-06 10:10:33 +01:00
Mojca Lorber
356edba1b3
add protocol preview to search results
2017-01-05 18:08:59 +01:00
Matej Zrimšek
4b0f47675a
Fixes experiment button not being clicable in project overview page. [SCI-849]
2017-01-05 14:42:52 +01:00
Oleksii Kriuchykhin
cd3924afd3
Sanitize .html_safe marked strings which contain tags [SCI-102]
2017-01-05 13:04:19 +01:00
Oleksii Kriuchykhin
9c4191a1e0
Initial code commit [SCI-102]
2017-01-05 13:04:19 +01:00
mlorb
59751ec41e
Merge pull request #373 from mlorb/ml_sci_709
...
Add Protocol Preview to Protocol repository [SCI-709]
2017-01-04 11:28:55 +01:00
Luka Murn
3bee9d2e12
Save an (yet unworking) version of user smart annotations
...
Used so other devs can start working on smart annotations.
2017-01-04 10:54:02 +01:00
Luka Murn
6402acc102
Merge pull request #377 from Ducz0r/lm-sci-820-fix
...
Fix 2 bugs with comments editing [SCI-820]
2017-01-04 10:47:29 +01:00
Luka Murn
37cd6417c8
Merge pull request #374 from Ducz0r/lm-sci-808-814-fix
...
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
2017-01-04 09:50:26 +01:00
Mojca Lorber
a0704cd873
remove duplicated includes of css and js
2017-01-03 17:33:01 +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
Mojca Lorber
e555535dfb
add edit button to protocol preview modal
2017-01-03 10:04:14 +01:00
okriuchykhin
68ac3486c7
Merge pull request #381 from okriuchykhin/ok_SCI_275
...
Add task name to project activity [SCI-275]
2016-12-30 15:32:08 +01:00
okriuchykhin
cce57d066c
Merge pull request #370 from okriuchykhin/ok_SCI_817
...
Fix issue with long samples column names in import modal [SCI-817]
2016-12-30 15:29:32 +01:00
okriuchykhin
e8955b0304
Merge pull request #375 from okriuchykhin/ok_SCI_361
...
Add sorting to Project's experiments overview [SCI-361]
2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin
f076226b3f
Add task name to project activity [SCI-275]
2016-12-29 16:31:48 +01:00
Oleksii Kriuchykhin
d798f1b120
Fix XSS vulnerability in protocol keywords [SCI-632]
2016-12-29 15:15:29 +01:00
Luka Murn
b931b20f02
Fix 2 bugs with comments editing
...
Closes SCI-820.
2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin
4d3e002c81
Add sorting to Project's experiments overview [SCI-361]
2016-12-23 15:40:01 +01:00
Luka Murn
4b50c73474
Merge pull request #363 from Ducz0r/lm-sci-546-fix
...
Restyle step table display in reports [SCI-546]
2016-12-23 12:57:54 +01:00
Luka Murn
3922be2b17
Change String in sample types & groups
...
Closes SCI-808.
2016-12-23 11:48:57 +01:00
Mojca Lorber
40e3240a99
add content to preview modal
2016-12-22 11:43:11 +01:00
zmagod
e554fdf805
code refactor
2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin
53ea09c3de
Fix issue with long samples column names in import modal [SCI-817]
2016-12-21 14:34:53 +01:00
Oleksii Kriuchykhin
00ea3a027c
Fix generation of preview url for new steps and results [SCI-694]
2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin
cbef971d85
Fix timeouts when fetching images from S3 [SCI-694]
2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin
d2b76d8385
Improved image preview modal [SCI-694]
2016-12-19 17:36:18 +01:00
Luka Murn
a48eaf662e
Restyle step table display in reports so
...
Closes SCI-546.
2016-12-19 15:09:49 +01:00
zmagod
efe41817f2
removes sample group/type link in new sample form [fixes SCI-809]
2016-12-19 10:49:21 +01:00
Oleksii Kriuchykhin
b537feb8a0
Added large preview [SCI-694]
2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin
8738b3e09d
Added image preview to Results [SCI-694]
2016-12-16 15:55:46 +01:00
Oleksii Kriuchykhin
0541253ffa
Added modal for images preview [SCI-694]
2016-12-16 15:53:16 +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
ba58ac2a77
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796
2016-12-15 09:26:12 +01:00
zmagod
4d6a85ed7c
fixed sample groups colorpicker [fixes SCI-781]
2016-12-15 09:23:38 +01:00
zmagod
b07f9fae59
fixes new sample group/type link in sample row [fixes SCI-796]
2016-12-15 09:23:38 +01:00
zmagod
6d2fb3b02c
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790
2016-12-14 17:05:00 +01:00
okriuchykhin
c4ff12be51
Merge pull request #349 from okriuchykhin/ok_SCI_783
...
Fix columns ordering when deleting custom fields [SCI-783]
2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin
fa1cf1f04d
Better handling of columns deleting with fixing columns ordering [SCI-783]
2016-12-14 15:23:00 +01:00
zmagod
1ff98bb6df
adds tooltip to samples dropdown and column names
2016-12-14 13:36:10 +01:00
zmagod
9037ab3f48
fixed navigation link
2016-12-14 10:35:48 +01:00
Mojca Lorber
2cfcba0ceb
add protocol preview modal
2016-12-13 10:39:18 +01:00
zmagod
4b0e2baa3f
fixes breadcrumbs in secondary nav
2016-12-12 16:03:14 +01:00
zmagod
8dd8a7e7cd
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
2016-12-12 15:52:25 +01:00
zmagod
5176f8b459
clean unneeded code [fixes SCI-778] refactor js
2016-12-12 15:40:13 +01:00
zmagod
d9025a9601
changes create/edit mode buttons [fixes SCI-777]
2016-12-12 14:42:06 +01:00
zmagod
8bb452e4f7
trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]
2016-12-12 10:30:03 +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
Luka Murn
1a8b141b95
Add delete custom field functionality
2016-12-09 13:49:19 +01:00
Luka Murn
da630ac2cb
Make edit, delete buttons clickable & hide them if neccesary
2016-12-09 13:18:59 +01:00
Mojca Lorber
0e3526c9ad
Merge branch 'mlorb-ml-sci-696' into improved-sample-table
...
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
2016-12-08 15:44:50 +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
