mz3944
|
fd63a1de12
|
Merge pull request #432 from mlorb/ml-sci-fix-847
Add dynamic length for sample type/group field when adding new sample [SCI-847]
|
2017-01-20 15:46:34 +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
|
3789769af3
|
add dynamic length for sample type/group field when adding new sample
|
2017-01-20 09:53:44 +01:00 |
|
Mojca Lorber
|
6653f0d4c1
|
small fixes
|
2017-01-19 16:42:14 +01:00 |
|
Luka Murn
|
94809013ab
|
Update reprocess Paperclip rake task
|
2017-01-19 13:26:43 +01:00 |
|
okriuchykhin
|
6f3378e554
|
Merge pull request #411 from okriuchykhin/ok_SCI_873
Add truncation of image description in the preview [SCI-873]
|
2017-01-18 15:11:03 +01:00 |
|
Mojca Lorber
|
f656a1093d
|
fix hound
|
2017-01-18 14:40:24 +01:00 |
|
Mojca Lorber
|
6155a458e7
|
update search
|
2017-01-18 14:22:19 +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
|
0520690e8d
|
Merge pull request #407 from ZmagoD/zd_SCI_831
adds rake task for repocess file thumbnails [fixes SCI-831]
|
2017-01-18 11:09:03 +01:00 |
|
okriuchykhin
|
9dfa30fbb4
|
Merge pull request #418 from okriuchykhin/ok_SCI_855_v2
Remove previous fix for popups [SCI-855]
|
2017-01-18 11:00:54 +01:00 |
|
Oleksii Kriuchykhin
|
12eb1df69f
|
Remove previous fix for popups [SCI-855]
|
2017-01-18 10:59:00 +01:00 |
|
zmagod
|
e1ed1b74f8
|
fixes hound
|
2017-01-18 08:02:11 +01:00 |
|
okriuchykhin
|
735b0c48df
|
Merge pull request #417 from okriuchykhin/ok_SCI_102_v2
Fix issue in report editor [SCI-102]
|
2017-01-17 14:25:10 +01:00 |
|
Oleksii Kriuchykhin
|
ea8f6a8c6b
|
Fix issue in report editor [SCI-102]
|
2017-01-17 14:21:59 +01:00 |
|
Luka Murn
|
2f48409fdd
|
Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2
Fix filter not working correctly with hidden custom columns [SCI-813]
|
2017-01-17 08:17:52 +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 |
|
mlorb
|
88cc87d168
|
Merge pull request #408 from mlorb/ml-sci-847-v2
Adjust columns width in samples table header after selecting sample group [SCI-847]
|
2017-01-16 10:52:00 +01:00 |
|
Luka Murn
|
a0e9e5afa8
|
Merge pull request #402 from mz3944/mz-sci-848-v2
Unable to delete samples [SCI-848]
|
2017-01-16 10:47:13 +01:00 |
|
Luka Murn
|
0fd9660eb7
|
Merge pull request #403 from Ducz0r/lm-sci-876-fix
Year difference problems with notifications [SCI-876]
|
2017-01-14 10:01:38 +01:00 |
|
Luka Murn
|
1acf258c70
|
Fix minor Zmagohound comment
|
2017-01-14 10:00:52 +01:00 |
|
Mojca Lorber
|
9f1a49847e
|
fix table header again
|
2017-01-13 18:54:43 +01:00 |
|
Luka Murn
|
ba567284ed
|
Fix filter not working correctly with hidden custom columns
Closes SCI-813.
|
2017-01-13 17:03:19 +01:00 |
|
Mojca Lorber
|
5f7e0b2227
|
adjust columns width in samples table header after selecting sample group
|
2017-01-13 15:59:47 +01:00 |
|
okriuchykhin
|
1ae5e6f8a7
|
Merge pull request #406 from okriuchykhin/ok_SCI_855
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
|
2017-01-13 15:56:37 +01:00 |
|
zmagod
|
f560a9999a
|
adds rake task for repocess file thumbnails [fixes SCI-831]
|
2017-01-13 15:06:20 +01:00 |
|
Oleksii Kriuchykhin
|
a190ef36ff
|
Extend comment to make more clear [SCI-855]
|
2017-01-13 12:43:43 +01:00 |
|
mlorb
|
db4af3fc15
|
Merge pull request #404 from mlorb/ml-sci-fix-284-881-843
Fix broken scrolling functionality in samples table [SCI-284-881-843]
|
2017-01-13 11:58:55 +01:00 |
|
Oleksii Kriuchykhin
|
097209bd9d
|
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
|
2017-01-13 11:34:05 +01:00 |
|
Mojca Lorber
|
bc6fbc5f91
|
fix hound
|
2017-01-13 11:18:44 +01:00 |
|
Mojca Lorber
|
4250088447
|
fix broken scrolling functionality in samples table
|
2017-01-13 11:07:33 +01:00 |
|
Oleksii Kriuchykhin
|
f567d0307e
|
Fix includes [SCI-102]
|
2017-01-12 17:02:01 +01:00 |
|
Oleksii Kriuchykhin
|
75031e17b9
|
Remove double sanitization from views [SCI-102]
|
2017-01-12 16:54:15 +01:00 |
|
Oleksii Kriuchykhin
|
69b65c27f8
|
Remove input sanitization in the models [SCI-102]
|
2017-01-12 16:20:37 +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 |
|
Matej Zrimšek
|
93a8e0bdae
|
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
|
2017-01-12 14:08:29 +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 |
|
mz3944
|
aba12b9b2c
|
Merge pull request #401 from mz3944/mz-sci-878
Protocol repository - user cannot download files
|
2017-01-11 16:25:45 +01:00 |
|
Oleksii Kriuchykhin
|
0546716a0b
|
Improve user input sanitization, fix bugs [SCI-102]
|
2017-01-11 15:50:11 +01:00 |
|
okriuchykhin
|
404952336d
|
Merge pull request #400 from okriuchykhin/ok_SCI_846
Fixes sorting of custom columns in samples datatable [SCI-846]
|
2017-01-11 15:34:02 +01:00 |
|
mlorb
|
fe1ef97523
|
Merge pull request #398 from mlorb/ml_sci_843
Adjust samples tables height when in edit mode selecting sample type/group [SCI-843]
|
2017-01-11 15:33:52 +01:00 |
|
Mojca Lorber
|
3a3f20a215
|
fix bug with different approach
|
2017-01-11 15:25:10 +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 |
|