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
Matej Zrimšek
15d7944302
Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889]
2017-01-13 18:51:05 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Zmago Devetak
e6a8f46139
Merge pull request #393 from ZmagoD/zd_SCI_834
...
Smart annotations for Samples, Tasks, Experiments and Projects
2017-01-12 11:03:38 +01:00
zmagod
1840fdb7e5
cleanup js
2017-01-12 09:52:29 +01:00
zmagod
065e1a7120
fix hound
2017-01-11 15:06:00 +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
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
ccdb7729d8
removed xregxep
2017-01-10 14:14:21 +01:00
zmagod
6efcf49927
working version of dropdown filter
2017-01-10 14:14:21 +01:00
zmagod
53d20df449
added xregexp
2017-01-10 14:14:21 +01:00
zmagod
94262b56ef
prepare data for atwho
2017-01-10 14:14:21 +01:00
Luka Murn
859bf562ad
Merge pull request #391 from Ducz0r/lm-sci-290
...
Add mention system for users to step comments
2017-01-10 10:44:06 +01:00
Luka Murn
5873eea994
We serve to please the Hound
2017-01-10 10:42:52 +01:00
Luka Murn
0ee5b98977
Refactor code a bit, add dismiss button to header
2017-01-07 09:59:52 +01:00
Luka Murn
7835753d3c
Add atwho-users URL to <body>
2017-01-06 12:48:37 +01:00
Luka Murn
488613afcc
Add index to users' full name attribute
2017-01-05 16:26:49 +01:00
Luka Murn
b614ce714b
Restyle atwho dropdown
2017-01-05 14:06:48 +01:00
Luka Murn
a78bb79618
Temp commit
2017-01-05 12:07:17 +01:00
Luka Murn
eb64162633
Remove Gem dependency, add atwho as regular vendor/js
2017-01-05 12:06:59 +01:00
Luka Murn
e12907c9b9
Remove original atwho css, apply our own
2017-01-05 10:52:28 +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
23e60e0d01
Add Gems for smart annotations (atwho)
2017-01-04 10:51:55 +01:00
Zmago Devetak
5d0e80a5e1
Merge pull request #369 from ZmagoD/zd_SCI_812
...
fixes bug with samples sorting [fixes SCI-812]
2017-01-03 08:56:59 +01:00
okriuchykhin
7f99449f63
Merge pull request #371 from okriuchykhin/ok_SCI_819
...
Fix an issue with sample editing and type/group dropdowns [SCI-819]
2016-12-30 15:52:13 +01:00
Oleksii Kriuchykhin
c77c83752e
Remove unused css class link-look [SCI-819]
2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
0d01a4b2bd
Remove unneeded function from utils.js [SCI-819]
2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
4065be9e4e
Fix marking of selected option [SCI-819]
2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
e22ff6f8bb
Fix an issue with sample editing and type/group dropdowns [SCI-819]
2016-12-30 15:50:43 +01:00
okriuchykhin
2474eac37d
Merge pull request #367 from okriuchykhin/ok_SCI_818
...
Fix sample info popup [SCI-818]
2016-12-30 15:43:28 +01:00
okriuchykhin
e826791429
Merge pull request #365 from okriuchykhin/ok_SCI_807
...
Fix buttons disappear when deleting columns in samples [SCI-807]
2016-12-30 15:43:13 +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
73478d7b5e
Merge pull request #372 from okriuchykhin/ok_SCI_816
...
Fix flash message display in samples table [SCI-816]
2016-12-30 15:30:14 +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
okriuchykhin
b29e041e27
Merge pull request #380 from okriuchykhin/ok_SCI_766
...
Add description to Clone actions [SCI-766]
2016-12-30 15:28:32 +01:00
okriuchykhin
36f07b908a
Merge pull request #379 from okriuchykhin/ok_SCI_632
...
Fix XSS vulnerability in protocol keywords [SCI-632]
2016-12-30 15:28:05 +01:00
Oleksii Kriuchykhin
f076226b3f
Add task name to project activity [SCI-275]
2016-12-29 16:31:48 +01:00
Oleksii Kriuchykhin
d898f8993f
Add description to Clone actions [SCI-766]
2016-12-29 15:33:49 +01:00
Oleksii Kriuchykhin
d798f1b120
Fix XSS vulnerability in protocol keywords [SCI-632]
2016-12-29 15:15:29 +01:00
Oleksii Kriuchykhin
e156dbc987
Implement flash message hiding through module pattern [SCI-816]
2016-12-28 14:52:03 +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
mlorb
876ce37a96
Merge pull request #366 from mlorb/ml-sci-284
...
Samples - freeze header row and edit button... [SCI-284]
2016-12-23 12:29:41 +01:00
Luka Murn
e16c826bb1
Version bump to 1.6.0
2016-12-22 11:43:52 +01:00
