zmagod
|
c0d276ebee
|
fixes bug with xslx files with numeric values [fixes SCI-2589]
|
2018-07-05 14:08:03 +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 |
|
zmagod
|
c9dd8b356a
|
fixes locale, fixes custom file upload style
|
2018-07-04 13:43:45 +02:00 |
|
zmagod
|
43903080ce
|
code style fixes
|
2018-07-04 12:42:28 +02:00 |
|
zmagod
|
3eef4f87bf
|
fixes hound alerts
|
2018-07-03 16:18:44 +02:00 |
|
zmagod
|
8b86891177
|
fixes file destroy button [fixes SCI-2546]
|
2018-07-03 15:25:37 +02:00 |
|
zmagod
|
28bac14667
|
first working version of the edit form object
|
2018-07-03 12:57:39 +02:00 |
|
zmagod
|
c93e00b8c2
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_2546
|
2018-07-03 09:13:54 +02:00 |
|
Zanz2
|
8e42dba7de
|
Found the fix
|
2018-07-03 08:20:56 +02:00 |
|
ZmagoD
|
1e66d25578
|
refactor list item dropdown
|
2018-07-02 17:05:52 +02:00 |
|
Oleksii Kriuchykhin
|
42ce72170c
|
Fix inventory cell copy with file attached [SCI-2585]
|
2018-07-02 12:58:49 +02:00 |
|
ZmagoD
|
23de3abd61
|
Fixes repository items edit action, adds additional event listener for file upload
|
2018-06-29 16:59:26 +02:00 |
|
nbernot
|
7aacc2b4a2
|
extract repository_item html form creation in to a separate 'class'
|
2018-06-29 14:28:06 +02:00 |
|
zmagod
|
0dbd2dc877
|
fixes typo
|
2018-06-29 10:29:39 +02:00 |
|
zmagod
|
eb75f6c03d
|
fixes bug with checkAvailableColumns function [fixes SCI-2578]
|
2018-06-29 10:28:46 +02:00 |
|
Oleksii Kriuchykhin
|
6660b240c8
|
Fix rendering permissions of inventory annotations [SCI-2534]
|
2018-06-28 15:30:32 +02:00 |
|
okriuchykhin
|
10554fecb4
|
Merge pull request #1223 from ZmagoD/zd_SCI_2566
fixes tagsinput text-area on long input [fixes SCI-2566]
|
2018-06-28 10:50:12 +02:00 |
|
Zmago Devetak
|
54a17e0574
|
Merge pull request #1209 from ZmagoD/zd_SCI_2165
Update team migration script to support "list of values" and "file" repository columns/cells [fixes SCI-2165]
|
2018-06-27 15:31:27 +02:00 |
|
Zmago Devetak
|
29c379dbae
|
add rep_item to update_annotation function
|
2018-06-27 15:17:02 +02:00 |
|
Zmago Devetak
|
7fd3eec195
|
Merge pull request #1219 from ZmagoD/zd_SCI_2415
move maximum file size limit to an ENV variable [fixes SCI-2415]
|
2018-06-26 18:43:16 +02:00 |
|
Luka Murn
|
9637af51e6
|
Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout
Fix the sign in halt layout
|
2018-06-26 17:51:18 +02:00 |
|
zmagod
|
1a15ac7acf
|
fixes setting sidebar teams link[fixes SCI-2429]
|
2018-06-26 13:09:56 +02:00 |
|
zmagod
|
4b81c2c4db
|
fixes tagsinput text-area on long input [fixes SCI-2566]
|
2018-06-26 09:52:07 +02:00 |
|
mlorb
|
52f7d4075d
|
Merge pull request #1218 from mlorb/ml-sci-2406
Fix firefox bug with browse buttons position [SCI-2406]
|
2018-06-19 14:58:46 +02:00 |
|
Oleksii Kriuchykhin
|
c0232d9eb2
|
Add extend for task child elements in reports [SCI-2377]
|
2018-06-19 14:34:36 +02:00 |
|
zmagod
|
db1944cc90
|
move maximum file size limit to an ENV variable [fixes SCI-2415]
|
2018-06-19 14:15:14 +02:00 |
|
mlorb
|
0792ce46af
|
fix firefox bug with browse buttons position
|
2018-06-19 13:39:03 +02:00 |
|
zmagod
|
d68ae63c40
|
adds repository_items to smart annotation import
|
2018-06-19 11:58:22 +02:00 |
|
Zmago Devetak
|
16bce8de60
|
Merge pull request #1215 from ZmagoD/zd_SCI_2294
removes duplicated keywords [fixes SCI-2294]
|
2018-06-18 16:36:09 +02:00 |
|
zmagod
|
fbcc788597
|
fixes per @duczOr request
|
2018-06-18 14:00:49 +02:00 |
|
zmagod
|
5f1489a100
|
fix columns check [fixes SCI-2408]
|
2018-06-18 13:36:56 +02:00 |
|
Zmago Devetak
|
cb7023c18e
|
Merge pull request #1214 from ZmagoD/zd_SCI_2410
disable buttons on new/edit repository_item action [fixes SCI-2410]
|
2018-06-18 13:03:11 +02:00 |
|
zmagod
|
ed39294733
|
removes duplicated keywords [fixes SCI-2294]
|
2018-06-18 12:15:52 +02:00 |
|
zmagod
|
2f141e9217
|
disable buttons on new/edit repository_item action [fixes SCI-2410]
|
2018-06-15 11:37:01 +02:00 |
|
zmagod
|
6a6ff534c0
|
fixes import flash message [fixes SCI-2398]
|
2018-06-15 11:12:11 +02:00 |
|
okriuchykhin
|
801d0a4a22
|
Merge pull request #1212 from okriuchykhin/ok_SCI_2377
Add hooks to new report modal [SCI-2377]
|
2018-06-14 15:48:43 +02:00 |
|
Oleksii Kriuchykhin
|
13c374d9b3
|
Add hooks to new report modal [SCI-2377]
|
2018-06-14 15:26:06 +02:00 |
|
zmagod
|
3d7591100a
|
adds repository row assets to team import/export [fixes SCI-2165]
|
2018-06-14 15:20:57 +02:00 |
|
zmagod
|
4a82d1e7ac
|
fixes repository items import
|
2018-06-14 14:40:43 +02:00 |
|
zmagod
|
bb62fc3715
|
adds data-hook
|
2018-06-14 12:42:49 +02:00 |
|
Oleksii Kriuchykhin
|
e10ed86fa1
|
Remove result validation [SCI-2376]
|
2018-06-13 14:06:55 +02:00 |
|
zmagod
|
f2c0b3aa92
|
removes samples, adds list_items
|
2018-06-13 12:45:48 +02:00 |
|
Zmago Devetak
|
29fe58de80
|
Merge pull request #1208 from ZmagoD/zd_SCI_2408
adds an additional check if some other user has added/removed reposit…
|
2018-06-13 11:30:43 +02:00 |
|
Zmago Devetak
|
2eb6613c6a
|
Merge pull request #1206 from ZmagoD/zd_SCI_2442
make manage columns page more responsive [fixes SCI-2442]
|
2018-06-13 11:14:35 +02:00 |
|
Zmago Devetak
|
d457a66996
|
Merge pull request #1205 from ZmagoD/zd_SCI_2427
enables tooltip on long column names [fixes SCI-2427]
|
2018-06-13 11:14:29 +02:00 |
|
Zmago Devetak
|
a8981d7039
|
Merge pull request #1201 from ZmagoD/zd_SCI_2421
fixes bug with tinymce/at.js [fixes SCI-2421]
|
2018-06-13 11:14:17 +02:00 |
|
Zmago Devetak
|
673410251d
|
Merge pull request #1197 from ZmagoD/zd_SCI_2384
fixes repository table on sidebar toggle [fixes SCI-2384]
|
2018-06-13 09:57:27 +02:00 |
|
Zmago Devetak
|
50c1a712d8
|
Merge pull request #1204 from ZmagoD/zd_SCI_2434
fixes bug with repository items dropdown [fixes SCI-2434]
|
2018-06-13 08:42:13 +02:00 |
|
Zmago Devetak
|
6cab1746cd
|
Merge pull request #1202 from ZmagoD/zd_SCI_2392
prevents asset preview modal to close on click [fixes SCI-2392]
|
2018-06-13 08:41:41 +02:00 |
|
Zmago Devetak
|
e06ab02f68
|
Merge pull request #1192 from ZmagoD/zd_SCI_2435
removes visibility toggle from Name column [fixes SCI-2435]
|
2018-06-13 08:41:25 +02:00 |
|
Luka Murn
|
9a4fdd166e
|
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
Conflicts:
app/views/projects/index.html.erb
|
2018-06-12 17:44:42 +02:00 |
|
zmagod
|
f8ac083d39
|
adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]
|
2018-06-12 15:28:03 +02:00 |
|
Luka Murn
|
a66d65fb28
|
Fix the sign in halt layout
... so it's not dependant on common addon any more.
|
2018-06-12 14:47:15 +02:00 |
|
zmagod
|
1cff4a5060
|
make manage columns page more responsive [fixes SCI-2442]
|
2018-06-12 10:22:48 +02:00 |
|
zmagod
|
a8971b4e20
|
enables tooltip on long column names [fixes SCI-2427]
|
2018-06-11 15:22:56 +02:00 |
|
Zmago Devetak
|
a174e186bb
|
removes unneeded code
|
2018-06-11 15:00:13 +02:00 |
|
zmagod
|
256e502982
|
fixes bug with repository items dropdown [fixes SCI-2434]
|
2018-06-11 14:57:27 +02:00 |
|
mlorb
|
1e1330847f
|
remove unused code
|
2018-06-11 14:49:03 +02:00 |
|
mlorb
|
40f3365596
|
fix bug with truncating string
|
2018-06-11 14:47:25 +02:00 |
|
zmagod
|
32a09f9780
|
prevents asset preview modal to close on click [fixes SCI-2392]
|
2018-06-11 13:03:11 +02:00 |
|
zmagod
|
374a16abad
|
fixes bug with tinymce/at.js [fixes SCI-2421]
|
2018-06-11 10:18:35 +02:00 |
|
okriuchykhin
|
acd6efae57
|
Merge pull request #1200 from okriuchykhin/ok_SCI_2212
Add result content hook [SCI-2212]
|
2018-06-11 09:28:30 +02:00 |
|
Zmago Devetak
|
6ba5c587f7
|
Merge pull request #1189 from ZmagoD/zd_SCI_2211
add data-hook, refactor add user to project modal to support addons
|
2018-06-08 15:23:26 +02:00 |
|
Zmago Devetak
|
a7dc4f8933
|
Merge pull request #1194 from ZmagoD/add_data_hook
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
|
2018-06-08 14:49:48 +02:00 |
|
Zmago Devetak
|
0b5c1e3ecc
|
Merge pull request #1195 from ZmagoD/zd_SCI_2487
fixes assign items flash message [fixes SCI-2487]
|
2018-06-08 14:40:48 +02:00 |
|
Zmago Devetak
|
eff68aead8
|
Merge pull request #1193 from ZmagoD/zd_SCI_2481_
fixes project validation message [fixes SCI-2481]
|
2018-06-08 14:40:27 +02:00 |
|
Zmago Devetak
|
74ccaf06b9
|
Merge pull request #1184 from ZmagoD/zd_SCI_2417
adds asset_text_data to global search options
|
2018-06-08 14:30:52 +02:00 |
|
Oleksii Kriuchykhin
|
87925271e8
|
Add result content hook [SCI-2212]
|
2018-06-08 14:22:03 +02:00 |
|
Luka Murn
|
bfaedab4b4
|
Fix buttons style on tags modal
Closes SCI-2397.
|
2018-06-08 13:43:23 +02:00 |
|
zmagod
|
b7ecf09963
|
fixes repository table on sidebar toggle [fixes SCI-2384]
|
2018-06-08 10:58:28 +02:00 |
|
zmagod
|
f769215468
|
fixes assign items flash message [fixes SCI-2487]
|
2018-06-08 10:02:57 +02:00 |
|
zmagod
|
86c4093bf2
|
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
|
2018-06-08 09:41:04 +02:00 |
|
Luka Murn
|
eb29c50379
|
Fix asset link preview, fix inventory item modal window styling
|
2018-06-08 09:01:59 +02:00 |
|
Luka Murn
|
dbceac7aa4
|
Style inventories secondary navigation section
|
2018-06-08 08:31:22 +02:00 |
|
zmagod
|
11ebea573a
|
fixes project validation message [fixes SCI-2481]
|
2018-06-07 16:42:11 +02:00 |
|
Luka Murn
|
4cdfe67115
|
Fix protocol management filter display (css)
|
2018-06-07 15:57:59 +02:00 |
|
zmagod
|
51e024e3d7
|
adds data-hooks to reports and search results [fixes SCI-2374]
|
2018-06-07 14:29:40 +02:00 |
|
zmagod
|
c0b659a252
|
adds data-hook to repositories/show page
|
2018-06-07 10:50:48 +02:00 |
|
Luka Murn
|
b324a2dab3
|
Restyle activities page
|
2018-06-07 09:29:47 +02:00 |
|
Luka Murn
|
0417af716b
|
Remove new experiment button from canvas, change edit canvas btn
|
2018-06-06 17:41:07 +02:00 |
|
zmagod
|
43a60b632a
|
adds datahook to experiment card [fixes SCI-2373]
|
2018-06-06 17:28:04 +02:00 |
|
Luka Murn
|
c07fa5adc2
|
Update blank page for projects
|
2018-06-06 17:23:22 +02:00 |
|
Luka Murn
|
e0a3b5a941
|
Fix Save PDF to repository modal window
|
2018-06-06 16:29:07 +02:00 |
|
zmagod
|
a51ea399f4
|
removes unneeded empty lines
|
2018-06-05 16:39:22 +02:00 |
|
zmagod
|
66cac0b676
|
removes visibility toggle from Name column [fixes SCI-2435]
|
2018-06-05 16:36:36 +02:00 |
|
Luka Murn
|
3823eb8c74
|
Merge pull request #1191 from ZmagoD/zd_SCI_2486
fixes project duplication [fixes SCI-2486]
|
2018-06-05 09:49:34 +02:00 |
|
zmagod
|
2def874ffd
|
fixes project duplication [fixes SCI-2486]
|
2018-06-05 09:44:03 +02:00 |
|
Zmago Devetak
|
fad67d7730
|
Merge pull request #1185 from ZmagoD/zd_SCI_2468
Limits the max. amount of rows when importing into inventories [fixes…
|
2018-06-04 16:29:33 +02:00 |
|
zmagod
|
9b9143f145
|
add hook to tab pane
|
2018-06-01 16:46:27 +02:00 |
|
okriuchykhin
|
04accc8fc8
|
Merge pull request #1190 from okriuchykhin/ok_SCI_2478
Fix project_tree for non admin users [SCI-2478]
|
2018-06-01 16:40:05 +02:00 |
|
Oleksii Kriuchykhin
|
8de0e282e3
|
Fix project_tree for non admin users [SCI-2478]
|
2018-06-01 16:38:49 +02:00 |
|
zmagod
|
997748561b
|
adds missing js changes
|
2018-06-01 16:14:50 +02:00 |
|
zmagod
|
84170f6de0
|
add data-hook, refactor add user to project modal to support addons
|
2018-06-01 16:13:22 +02:00 |
|
okriuchykhin
|
5ba60d9f8f
|
Merge pull request #1188 from okriuchykhin/ok_SCI_2478
Improve sidebar rendering performance [SCI-2478]
|
2018-06-01 15:17:34 +02:00 |
|
Luka Murn
|
4ba07fb082
|
Merge pull request #1186 from Ducz0r/lm-sci-2477-fix
Move sign-in flow layout to core [SCI-2477]
|
2018-06-01 15:08:44 +02:00 |
|
Oleksii Kriuchykhin
|
58d8414f92
|
Code fixes for sidebar [SCI-2478]
|
2018-06-01 15:05:12 +02:00 |
|
Oleksii Kriuchykhin
|
2ddc0fb561
|
Improve sidebar rendering performance [SCI-2478]
|
2018-06-01 13:49:02 +02:00 |
|
mlorb
|
0a8bfdb860
|
Reposition the arrow for opening/closing of Navigation
|
2018-06-01 13:18:49 +02:00 |
|