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
Matej Zrimšek
d3c33c9dca
Refactored smart annotation JS. [SCI-884]
2017-01-17 10:05:41 +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
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
1840fdb7e5
cleanup js
2017-01-12 09:52:29 +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
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
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
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
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
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
Luka Murn
5beaa26224
Update utils.js
...
Closes SCI-811.
2016-12-22 10:03:00 +01:00
Luka Murn
af6bf2aee1
Fix jQuery selector, make it work for new samples
2016-12-21 16:23:09 +01:00
Luka Murn
e52277bdad
Fix sample types & groups when editing sample in samples table
...
Closes SCI-811.
2016-12-21 13:15:55 +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
Zmago Devetak
daee14bed5
Merge pull request #343 from ZmagoD/zd_SCI_780
...
fixed step description links [fixes SCI-780]
2016-12-15 13:12:25 +01:00
zmagod
50c9dd3f59
fixed typo
2016-12-14 14:40:56 +01:00
zmagod
2426539715
fixes long names in columns dropdown [fixes SCI-784]
2016-12-13 14:54:37 +01:00
zmagod
b56913cc87
refactor
2016-12-12 16:21:38 +01:00
Matej Zrimšek
54de13de82
Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701]
2016-12-09 17:22:09 +01:00
Matej Zrimšek
0b12c87b09
Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701]
2016-12-09 16:44:50 +01:00
zmagod
e23be6cc0e
fixed step description links [fixes SCI-780]
2016-12-09 15:26:41 +01:00
Matej Zrimšek
aea679ec11
Added links for creating new sample type and group when creating new sample. [fixes SCI-701]
2016-12-09 11:39:12 +01:00
zmagod
9f1e436623
limits max size of all uploaded files at the one time [fixes SCI-740]
2016-12-07 09:02:04 +01:00
Matej Zrimšek
1db926101d
Minor refactoring.
2016-11-23 10:48:43 +01:00
Matej Zrimšek
6bc2603157
Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707]
2016-11-23 10:36:09 +01:00
Oleksii Kriuchykhin
d7aa155860
Disable keyboard navigation in tutorial [SCI-703]
2016-11-22 14:14:42 +01:00
Oleksii Kriuchykhin
cc86ff268f
Reload page after exit from tutorial [SCI-703]
2016-11-22 13:49:57 +01:00
mz3944
c5bc3a4dc6
Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2
...
Added additional tutorial step for showing protocol link. Tutorial st…
2016-11-21 16:06:45 +01:00
Oleksii Kriuchykhin
d6f5f6b9bf
Changes default behaviour for absolute urls in Quill [SCI-684]
2016-11-21 14:18:08 +01:00
Matej Zrimšek
f13cc5be0e
Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).
2016-11-17 18:03:49 +01:00
Luka Murn
26d04b1f3c
Merge branch 'rich-text-formatting' into 'master'
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +01:00
Matej Zrimšek
c8eb82cc85
Fixed tutorial step numbers and changed getting next page reference on protocols page.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
0e97bfc002
Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
c64146904a
Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.
2016-11-17 14:46:04 +01:00
Matej Zrimšek
47c1308ba6
Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step.
2016-11-17 14:46:04 +01:00
