Commit graph

4477 commits

Author SHA1 Message Date
Luka Murn
586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2
e9e7fa08b0 new tooltip texts, provided by Tea 2018-09-05 08:42:00 +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
Luka Murn
fcf947e29b
Update VERSION to 1.14.4 2018-08-29 11:02:44 +02:00
Jure Grabnar
93bd461a83 Generate table.csv 2018-08-29 00:31:11 +02:00
Jure Grabnar
01d48cf679 Add suffixes to all names 2018-08-29 00:21:17 +02:00
Jure Grabnar
4b0357b392 Add export of Inventories and their assets 2018-08-28 23:22:55 +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
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
Jure Grabnar
295c6a9432 Add export all functionality (basic skeleton) 2018-08-21 21:07:45 +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
4e55fdc9b5 Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662 2018-08-21 12:09:05 +02:00
Zanz2
601335a807 Fixed non .js errors hound 2018-08-21 12:08:14 +02:00
Zanz2
0ed62b7375 refactored according to PR review 2018-08-21 11:35:22 +02:00
Zanz2
817d09ad5f fixed hound 2018-08-21 11:29:38 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
36cca3d6aa Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax 2018-08-21 11:11:25 +02:00
Zanz2
880582de25 Added just a data attribute, so i dont have to add it on other branch 2018-08-21 09:59:49 +02:00
Zanz2
9a482eab2e Checkbox now gets styled properly and defaults to true 2018-08-21 09:02:54 +02:00
Zanz2
beb1d02914 Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always 2018-08-20 15:57:09 +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
Zanz2
91f112dc38 Saving minor changes, deleted comments, stuck at drag n drop 2018-08-20 13:45:43 +02:00
Oleksii Kriuchykhin
6795b08a91 Refactor invite users modal initialization [SCI-2651] 2018-08-20 13:13:34 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin
1a57289009 Improve health check endpoint [SCI-2604] 2018-08-17 16:13:21 +02:00
Zanz2
8c492e1491 started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute 2018-08-17 16:03:49 +02:00
Zanz2
e1cadfc75e saving work, removed testing buttons 2018-08-17 11:52:10 +02:00
Zanz2
637c7dfb19 modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic 2018-08-17 11:33:44 +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