Oleksii Kriuchykhin
7f7ece2be0
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
2018-09-21 17:46:18 +02:00
Luka Murn
5d6881bae1
Merge pull request #1309 from biosistemika/release-1.14.5
...
Merge release-1.14.5 into master
2018-09-20 08:53:51 +02:00
Luka Murn
32e068f298
Merge pull request #1307 from biosistemika/release-1.14.4
...
Merge release-1.14.4 into release-1.14.5
2018-09-19 15:29:57 +02:00
Luka Murn
90caad3c85
Update VERSION to 1.14.5
2018-09-19 14:37:43 +02:00
Alex Kriuchykhin
adf31581f1
Merge pull request #1306 from okriuchykhin/ok_SCI_2739
...
Improve search speed on files and inventories [SCI-2739]
2018-09-18 15:16:36 +02:00
Oleksii Kriuchykhin
872a48082a
Remove Samples from search controller [SCI-2739]
2018-09-18 15:03:19 +02:00
Alex Kriuchykhin
105d34f2ae
Merge pull request #1305 from okriuchykhin/ok_SCI_2739
...
Improve search speed on files and inventories [SCI-2739]
2018-09-18 10:25:08 +02:00
Oleksii Kriuchykhin
4ee9eb3134
Improve search speed on files and inventories [SCI-2739]
2018-09-17 17:06:47 +02:00
Luka Murn
f9d771d01a
Add minor comment
2018-09-13 14:50:00 +02:00
Luka Murn
0ddc3e0968
Merge pull request #1303 from biosistemika/release-1.14.4
...
Merge release-1.14.4 into master
2018-09-13 14:47:17 +02:00
Zanz2
a9c0201fcc
Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629
...
Fixed disabled export button after new inventory item save [SCI-2629]
2018-09-13 11:35:07 +02:00
Luka Murn
99c156de94
Fix (hopefully) the TinyMCE files from being cached
...
Closes SCI-2717.
2018-09-12 15:28:21 +02:00
Zanz2
7cb50145a0
Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621
...
Fixed table add and remove crash [SCI-2621]
2018-09-11 09:37:07 +02:00
Zanz2
0efaf827b8
Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2
...
Replaced image icon with paperclip on scinote [SCI-2712]
2018-09-11 09:36:47 +02:00
Luka Murn
fcf947e29b
Update VERSION to 1.14.4
2018-08-29 11:02:44 +02:00
Zanz2
15c124f3fd
replaced image icon with paperclip, to represent files, removed all image icons
2018-08-27 13:07:18 +02:00
Luka Murn
50f6bd24e1
Merge pull request #1283 from Ducz0r/lm-sci-2707-fix
...
Fix bootstrap-select to work with turbolinks 5.x [SCI-2707]
2018-08-24 17:24:35 +02:00
Luka Murn
b71c5d14c6
Fix bootstrap-select to work with turbolinks 5.x
...
This was causing invite users modal, among other things, to not
function correctly after visiting another redirect within SciNote
using Turbolinks 5.x.
Closes SCI-2707.
2018-08-24 17:11:59 +02:00
Alex Kriuchykhin
18dfeb537b
Merge pull request #1269 from okriuchykhin/ok_SCI_2604
...
Improve health check endpoint [SCI-2604]
2018-08-24 16:55:47 +02:00
Alex Kriuchykhin
10a650c3c5
Merge pull request #1281 from okriuchykhin/ok_SCI_2686
...
Make API V1 togglable [SCI-2686]
2018-08-24 14:22:29 +02:00
Oleksii Kriuchykhin
0322316d74
Make API V1 togglable [SCI-2686]
2018-08-24 12:11:28 +02:00
Alex Kriuchykhin
151d1cf44d
Merge pull request #1270 from okriuchykhin/ok_SCI_2651
...
Refactor invite users modal initialization [SCI-2651]
2018-08-23 14:34:42 +02:00
Alex Kriuchykhin
0ca9972905
Merge pull request #1271 from okriuchykhin/ok_SCI_2628
...
Fix error on activities page when user doesn't have any [SCI-2628]
2018-08-22 14:21:18 +02:00
Alex Kriuchykhin
75a48291e1
Merge pull request #1272 from okriuchykhin/ok_SCI_2654
...
Fix report elements sorting [SCI-2654]
2018-08-22 14:20:54 +02:00
Luka Murn
92eab25a07
Merge pull request #1261 from mlorb/ml-sci-2634
...
fix editing of inventory items of hidden columns [SCI-2634]
2018-08-21 16:59:37 +02:00
Luka Murn
92a4a54ae7
Slighty change the parameter parsing of removed file cells
2018-08-21 16:46:47 +02:00
Zanz2
6e4730619f
Fixed the bug, disabled class in dropdown menu when there was no need
2018-08-21 14:29:34 +02:00
Zanz2
d8fb47ff4d
Merge pull request #1267 from Zanz2/zz_refactor_icons_sci_2445_v2
...
Changed some icons to fontawesome [SCI-2445]
2018-08-21 13:33:12 +02:00
Zanz2
ab3b15e13e
Found the bug and fixed it
2018-08-21 13:26:16 +02:00
Zanz2
0ed62b7375
refactored according to PR review
2018-08-21 11:35:22 +02:00
Oleksii Kriuchykhin
62d99a4372
Fix report elements sorting [SCI-2654]
2018-08-20 14:46:23 +02:00
Oleksii Kriuchykhin
3a5238f6f3
Fix error on activities page when user doesn't have any [SCI-2628]
2018-08-20 14:26:42 +02:00
Oleksii Kriuchykhin
6795b08a91
Refactor invite users modal initialization [SCI-2651]
2018-08-20 13:13:34 +02:00
Oleksii Kriuchykhin
1a57289009
Improve health check endpoint [SCI-2604]
2018-08-17 16:13:21 +02:00
Alex Kriuchykhin
422baaf64a
Merge pull request #1258 from okriuchykhin/ok_SCI_2619
...
Add team deletion service [SCI-2619]
2018-08-17 10:56:11 +02:00
Zanz2
dfcaa40f1a
Merge branch 'master' into zz_refactor_icons_sci_2445_v2
2018-08-14 13:33:43 +02:00
Zanz2
45a4c1c598
changed the icons as per last comment in jira issue
2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin
ca6fc84ae2
Remove duplicated task outputs deletion [SCI-2619]
2018-08-10 16:43:40 +02:00
Zanz2
27e0d27862
Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621
...
Fixes duplicate checkbox entries in activity log [SCI-1621]
2018-08-09 11:50:34 +02:00
Zanz2
2bc7d8a9bd
Merge pull request #1249 from Zanz2/zz_protocols_edit_rtf_form_bug_sci2305_v2
...
Fixes tinymce rtf editor not displaying (updated gem) [SCI-2305]
2018-08-09 11:49:59 +02:00
Zanz2
2608561560
Merge branch 'master' into zz_protocols_edit_rtf_form_bug_sci2305_v2
2018-08-09 11:38:15 +02:00
Zanz2
1de9e4b360
changed version
2018-08-09 11:35:50 +02:00
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611
...
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
2018-08-08 16:59:42 +02:00
Oleksii Kriuchykhin
dc2411c5ed
Fix Hound warnings [SCI-2611][SCI-2612]
2018-08-08 16:27:43 +02:00
mlorb
30091da94f
Merge pull request #1263 from mlorb/ml-sci-2652
...
fix time zone selector [SCI-2652]
2018-08-08 15:00:11 +02:00
mlorb
a6dd577b4e
fix time zone selector
2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin
298b866df4
Fix failing tests [SCI-2611][SCI-2612]
2018-08-07 14:58:02 +02:00
mlorb
f52ccfd606
fix editing of inventory items of hidden columns
2018-08-07 11:47:26 +02:00
okriuchykhin
29f0f2afeb
Merge pull request #1257 from okriuchykhin/ok_SCI_2609
...
Refactor tasks tree API endpoint [SCI-2609]
2018-08-02 17:10:55 +02:00
okriuchykhin
bb5d029c30
Merge pull request #1251 from okriuchykhin/ok_SCI_2253
...
Upgrade to Turbolinks 5 [SCI-2253]
2018-08-02 14:43:19 +02:00
