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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|