Commit graph

3435 commits

Author SHA1 Message Date
Luka Murn
95340bcf36 Update team name placeholder & sublabel on sign up pages 2018-10-24 13:43:56 +02:00
mlorb
e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +02:00
Zanz2
4dc1320988
Merge pull request #1326 from Zanz2/zz_pio_upload_button_sci2760
Disabled turbolinks in left navigation bar protocols button [SCI-2760]
2018-10-10 17:14:15 +02:00
Zanz2
cfe5801856 Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue 2018-10-06 12:56:13 +02:00
Luka Murn
21a24dc98b Fix invite users modal to display tooltips in all variants
Closes SCI-2759.
2018-10-02 17:55:39 +02:00
Luka Murn
d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +02:00
Luka Murn
c079f16d58 Fix the tooltips positioning on canvas 2018-10-02 13:50:26 +02:00
Luka Murn
9632d1cd01 Set tooltips initialization to comply with turbolinks
Also add custom styling options as another data attribute.
2018-10-02 13:49:19 +02:00
Luka Murn
c12f77d1d1 Fix styling (ESLint) on tooltip_helper.js 2018-10-02 11:25:51 +02:00
Zanz2
ada98e9eaf
Merge pull request #1289 from Zanz2/step_save_table_too_long_bug_sci2719
Fixed bug with table name of step not being length validated [SCI-2719]
2018-09-28 14:37:08 +02:00
Zanz2
16f9728a05 fixed to not use gon gem 2018-09-28 14:26:05 +02:00
Zanz2
c6936bc71e fixed the implementation according to PR review, now validates all table names, when multiple are present, and uses gon gem 2018-09-28 13:13:25 +02:00
Zanz2
1a512698e8
Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2
( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]
2018-09-26 12:04:09 +02:00
Alex Kriuchykhin
112343e65d
Merge pull request #1311 from okriuchykhin/ok_SCI_2738
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
2018-09-25 11:49:19 +02:00
Luka Murn
63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
2018-09-24 16:23:53 +02:00
Luka Murn
2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
2018-09-24 16:23:28 +02:00
Zanz2
87d2b0db14 fixed accordign to pr review 2018-09-24 15:57:31 +02:00
Zanz2
b536aa6f3e
Merge pull request #1287 from Zanz2/zz_dropdown_blue_sci2672
Fixed blue block in dropdown, now its a full line [SCI-2672]
2018-09-23 11:27:00 +02:00
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
Oleksii Kriuchykhin
872a48082a Remove Samples from search controller [SCI-2739] 2018-09-18 15:03:19 +02:00
Oleksii Kriuchykhin
4ee9eb3134 Improve search speed on files and inventories [SCI-2739] 2018-09-17 17:06:47 +02:00
Zanz2
5b955da74c makes tooltip behaviour more reliable and less erratic 2018-09-16 21:34:36 +02:00
Zanz2
07757e382a fixed hound 2018-09-14 13:43:31 +02:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +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
Zanz2
a0c6a0c407 changed name of data attribute 2018-09-07 15:33:38 +02:00
Luka Murn
cbb5bda7fe Hound is love, Hound is life 2018-09-05 16:42:15 +02:00
Luka Murn
586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2
384371802c fixes travis 2018-08-31 13:12:34 +02:00
Zanz2
1bed2c2a3c Partially fixed according to pull request review, added comments to code review 2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
2018-08-31 11:42:26 +02:00
Zanz2
7d093fa11d Fixed the issue, tested for all 3 reported scenarios 2018-08-31 11:18:18 +02:00
Zanz2
67f4555584 Fixed the issue, tested all 3 scenarios 2018-08-31 11:04:20 +02:00
Zanz2
db610f146f fixed hound 2018-08-29 11:41:07 +02:00
Zanz2
c84ff3d9fe Small oversight fix 2018-08-29 11:37:07 +02:00
Zanz2
ed5a5e7390 Fixed blue block in dropdown, now its a full line 2018-08-29 11:33:20 +02:00
Zanz2
728b1fe491 Reverted deleted lines by accident 2018-08-28 14:51:05 +02:00
Zanz2
b26530a02f Found a new, and more elegant fix inside controller with Luka 2018-08-28 14:48:23 +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
Oleksii Kriuchykhin
0322316d74 Make API V1 togglable [SCI-2686] 2018-08-24 12:11:28 +02:00