Commit graph

6239 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
3e7fc6720c Fix team import service 2018-07-20 16:10:45 +02:00
Zanz2
54caa772d9
Merge pull request #1230 from Zanz2/tables_value_error_sci2588
Tables value error [SCI-2588]
2018-07-19 10:02:13 +02:00
Zanz2
eab389c0dd Fixes tinymce editor not displaying, updated tinymce-rails gem to 4.7.11 2018-07-17 16:06:00 +02:00
Zanz2
c6ef14290a Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again 2018-07-17 11:41:42 +02:00
Zanz2
887ddbfce3
Merge pull request #1229 from Zanz2/unify_match_case_sci1324
Fix protocol names are case insensitive unique [SCI-1324]
2018-07-17 08:22:03 +02:00
Luka Murn
f67b8d05c7
Merge pull request #1225 from okriuchykhin/ok_SCI_2534
Fix rendering permissions of inventory annotations [SCI-2534]
2018-07-13 15:18:59 +02:00
Luka Murn
f23cc36803
Merge pull request #1224 from ZmagoD/zd_SCI_2429
fixes setting sidebar teams link[fixes SCI-2429]
2018-07-13 14:55:24 +02:00
Luka Murn
de29ab1b11
Merge pull request #1234 from ZmagoD/zd_SCI_2581
adds missing js in experiment canvas view [fixes SCI-2581]
2018-07-13 14:54:59 +02:00
Luka Murn
752fb8dcd8
Merge pull request #1238 from ZmagoD/zd_SCI_2511
fixes smart annotation serch queries/dropdown item picker [fixes SCI-…
2018-07-13 14:54:42 +02:00
Luka Murn
13aab686b1
Merge pull request #1242 from ZmagoD/zd_SCI_2492
adds the ability to scroll to the active element in the navigation si…
2018-07-13 14:54:30 +02:00
Luka Murn
9b2f00cd5d
Merge pull request #1245 from ZmagoD/zd_SCI_2600
sanitizes the report name on repors index page [fixes SCI-2600]
2018-07-13 14:54:18 +02:00
Luka Murn
ba9f6e22b7
Merge pull request #1246 from ZmagoD/zd_SCI_1334
adds skip_user_status parameter to popover_for_user_name function in …
2018-07-13 14:54:00 +02:00
zmagod
29e0ecbc89 move FirstTimeDataGenerator helper from applictaion controller 2018-07-11 11:19:39 +02:00
Zmago Devetak
5a1615825d
removes unneeded comment 2018-07-11 09:29:10 +02:00
Oleksii Kriuchykhin
0be2fa36f0 Update VERSION to 1.14.3 2018-07-10 17:58:56 +02:00
zmagod
8fe1977ca8 adds skip_user_status parameter to popover_for_user_name function in order to keep the functionality more extendable [fixes SCI-1334] 2018-07-10 15:34:07 +02:00
zmagod
a7e47faa61 sanitizes the report name on repors index page [fixes SCI-2600] 2018-07-10 10:58:39 +02:00
Luka Murn
0e9571c499
Merge pull request #1244 from ZmagoD/zd_SCI_2593_v2
trim long file names [fixes SCI-2593]
2018-07-09 17:27:13 +02:00
zmagod
1491c61d51 trim long file names [fixes SCI-2593] 2018-07-09 17:00:47 +02:00
Luka Murn
0371bceb9d
Merge pull request #1243 from biosistemika/Ducz0r-patch-1
Fix clean unconfirmed users task for LinkedIn
2018-07-09 16:39:39 +02:00
Luka Murn
8c0f5757ed
Fix clean unconfirmed users task for LinkedIn 2018-07-09 16:21:11 +02:00
zmagod
62d4796741 adds the ability to scroll to the active element in the navigation sidebar on page load [fixes SCI-2492] 2018-07-09 15:40:52 +02:00
Zmago Devetak
a6a395e394
Merge pull request #1240 from ZmagoD/zd_SCI_2593
fixes css for new repository item field field [fixes SCI-2593]
2018-07-09 13:15:15 +02:00
zmagod
10d20a6555 fixes datatable header on add new item action 2018-07-09 13:12:48 +02:00
zmagod
6585eaa338 fixes hound 2018-07-09 12:55:25 +02:00
zmagod
14254fbde3 fixes per @mlorb 's request 2018-07-09 12:54:02 +02:00
okriuchykhin
1ad603658c
Merge pull request #1239 from okriuchykhin/ok_SCI_2594
Fix delete button in inventories [SCI-2594]
2018-07-09 11:08:43 +02:00
zmagod
dd00de928c fixes css for new repository item field field [fixes SCI-2593] 2018-07-09 10:33:19 +02:00
Oleksii Kriuchykhin
3aceb12f03 Fix delete button in inventories [SCI-2594] 2018-07-08 21:59:02 +02:00
zmagod
e654725d9e fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511] 2018-07-06 14:26:20 +02:00
Zmago Devetak
00ed339520
Merge pull request #1233 from ZmagoD/zd_SCI_2589
fixes bug with xslx files with numeric values [fixes SCI-2589]
2018-07-06 11:08:27 +02:00
Zmago Devetak
db90736c62
Merge pull request #1237 from ZmagoD/zd_SCI_2512
fixes list item height on columns management page [fixes SCI-2512]
2018-07-06 10:47:29 +02:00
Zmago Devetak
6b4d5c1562
Merge pull request #1236 from ZmagoD/zd_SCI_2592
fixes file name label in repository file field [fixes SCI-2592]
2018-07-06 10:47:13 +02:00
Luka Murn
95b832800f
Merge pull request #1228 from okriuchykhin/ok_SCI_2585
Fix inventory cell copy with file attached [SCI-2585]
2018-07-06 10:45:44 +02:00
zmagod
f1833b9bc1 fixes list item height on columns management page [fixes SCI-2512] 2018-07-06 09:28:03 +02:00
zmagod
a55d0b9c85 fixes file name label in repository file field [fixes SCI-2592] 2018-07-05 16:59:59 +02:00
okriuchykhin
3bc3519d0c
Merge pull request #1235 from okriuchykhin/ok_SCI_2590
Fix uploaded file max size validation in JS [SCI-2590]
2018-07-05 15:32:40 +02:00
Oleksii Kriuchykhin
a169639b3c Fix uploaded file max size validation in JS [SCI-2590] 2018-07-05 15:23:26 +02:00
zmagod
185657c626 adds missing js in experiment canvas view [fixes SCI-2581] 2018-07-05 14:36:54 +02:00
zmagod
c0d276ebee fixes bug with xslx files with numeric values [fixes SCI-2589] 2018-07-05 14:08:03 +02:00
Luka Murn
339fe1cc81
Merge pull request #1232 from ZmagoD/zd_safari_bug_fix
fixes bug with bootstrap-select
2018-07-04 20:49:02 +02:00
zmagod
fdedfec7d3 fixes bug with bootstrap-select 2018-07-04 17:38:16 +02:00
Zmago Devetak
eb61f728b4
Merge pull request #1227 from ZmagoD/zd_SCI_2546
Refactor inline row editing in repository
2018-07-04 15:28:08 +02:00
zmagod
5b9b86a2d4 fixes per @Ducz0r 's request 2018-07-04 15:23:41 +02:00
Zanz2
ccd8088f93 Fixed some small oversights 2018-07-04 14:48:23 +02:00
Zanz2
08d72fc7d8 made everything more robust, so that if something does break (exception) it reverts back to how it used to calculate 2018-07-04 14:45:57 +02:00
Zanz2
6b0d0eeaca saving debug code 2018-07-04 14:11:57 +02:00
Zmago Devetak
4386f54787
Merge pull request #1226 from ZmagoD/zd_SCI_2578
fixes bug with checkAvailableColumns function [fixes SCI-2578]
2018-07-04 13:52:08 +02:00
zmagod
c9dd8b356a fixes locale, fixes custom file upload style 2018-07-04 13:43:45 +02:00
Zanz2
f73d63579a changed ruleJS formula parser to use big.js library for decimal calculations, since numeral.js had a few issues of its own for big decimals 2018-07-04 13:38:49 +02:00