Zmago Devetak
039a8d7da6
Merge pull request #426 from ZmagoD/zd_add_tinyMCE
...
Add tiny mce
2017-01-19 12:57:55 +01:00
zmagod
2cbb8ba41a
removed unneeded comments
2017-01-19 12:54:48 +01:00
mz3944
da604d2619
Merge pull request #427 from mz3944/mz-sci-908
...
Some smart annotations refactoring [SCI-908]
2017-01-19 12:15:20 +01:00
zmagod
f2d5066dc7
fix some bugs
2017-01-19 11:37:59 +01:00
Matej Zrimšek
5d86bbb812
Smart annotations improved documentation. [SCI-908]
2017-01-19 10:56:02 +01:00
Matej Zrimšek
fec83e8c45
Smart annotations refactoring. [SCI-908]
2017-01-19 10:55:43 +01:00
zmagod
2ccafdd670
bug fix
2017-01-19 10:12:01 +01:00
zmagod
27d3868f37
fix bugs
2017-01-19 09:40:39 +01:00
zmagod
88d7cb200e
removed quill
2017-01-18 23:06:14 +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
okriuchykhin
7f6ceef9e9
Merge pull request #422 from okriuchykhin/ok_SCI_897
...
Remove sample type and group from smart annotation [SCI-897]
2017-01-18 16:26:25 +01:00
mz3944
b5e38afb64
Merge pull request #416 from mz3944/mz-sci-884
...
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
2017-01-18 16:13:19 +01:00
Matej Zrimšek
dbbb709bf2
Smart annotations minor refactoring. [SCI-884, SCI-889]
2017-01-18 16:04:39 +01:00
Matej Zrimšek
24458fe590
Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]
2017-01-18 15:29:48 +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
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
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
okriuchykhin
8a220c2351
Merge pull request #414 from okriuchykhin/ok_SCI_887
...
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-18 13:50:22 +01:00
Oleksii Kriuchykhin
55d0e82fcd
Change If statement to ternary operator [SCI-887]
2017-01-18 13:43:21 +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
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
okriuchykhin
781a68e0d5
Merge pull request #415 from okriuchykhin/ok_SCI_888
...
Add missed space in the string [SCI-888]
2017-01-18 09:34:51 +01:00
zmagod
cb0483a6e6
refactor
2017-01-18 08:34:29 +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
Matej Zrimšek
3085452ec9
Fixed some hound alerts. [SCI-884]
2017-01-17 11:04:16 +01:00
Matej Zrimšek
d3c33c9dca
Refactored smart annotation JS. [SCI-884]
2017-01-17 10:05:41 +01:00
Luka Murn
baf72ef3b8
Merge pull request #413 from Ducz0r/lm-sci-892-fix
...
Add sample info modal popup to sample smart annotations [SCI-892]
2017-01-17 08:30:06 +01:00
Luka Murn
ffc2b56dff
Fix String quotes
2017-01-17 08:28:41 +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
Oleksii Kriuchykhin
0ce71884a5
Add missed space in the string [SCI-888]
2017-01-16 17:09:41 +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
Luka Murn
16955dcee6
Fix Hound errors.
2017-01-16 15:58:37 +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
Matej Zrimšek
2877126dc6
Fixed selected search filter button style. [SCI-884]
2017-01-16 12:52:03 +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
