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
2ff8500758
Merge pull request #1282 from okriuchykhin/ok_SCI_2693
...
Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][S…CI-2693][SCI-2694][SCI-2695]
2018-08-24 16:55:25 +02:00
Oleksii Kriuchykhin
4d49671ae8
Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][SCI-2693][SCI-2694][SCI-2695]
2018-08-24 16:41:26 +02:00
Alex Kriuchykhin
a825f1c2ec
Merge pull request #1280 from okriuchykhin/ok_SCI_2688
...
Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689]
2018-08-24 15:49:34 +02:00
Oleksii Kriuchykhin
c86063f79e
Fix failing tests [SCI-2688]
2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
c8efa4bffc
Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689]
2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
5c2f268471
Refactor JSON API mime type registration [SCI-2687]
2018-08-24 15:48:10 +02:00
Oleksii Kriuchykhin
730ce96a43
Add inventory item CREATE endpoint [SCI-2687]
2018-08-24 15:46:00 +02:00
Alex Kriuchykhin
940b7b8519
Merge pull request #1279 from okriuchykhin/ok_SCI_2687
...
Add inventory item CREATE endpoint [SCI-2687]
2018-08-24 15:38:58 +02:00
Oleksii Kriuchykhin
afef8bc0b1
Fix failing tests [SCI-2687]
2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin
5488fc66fc
Refactor JSON API mime type registration [SCI-2687]
2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin
490376513b
Add inventory item CREATE endpoint [SCI-2687]
2018-08-24 15:36:19 +02:00
Alex Kriuchykhin
818129df1b
Merge pull request #1278 from okriuchykhin/ok_SCI_2664
...
Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686]
2018-08-24 15:28:34 +02:00
Oleksii Kriuchykhin
c8abb3d9b8
Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686]
2018-08-24 15:27:59 +02:00
Alex Kriuchykhin
eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613
...
Add READ user endpoint [SCI-2613]
2018-08-24 15:23:05 +02:00
Alex Kriuchykhin
427ab5fb41
Merge pull request #1264 from okriuchykhin/ok_SCI_2615
...
Add GET inventory columns API endpoint [SCI-2615]
2018-08-24 15:22:35 +02:00
Alex Kriuchykhin
1832c0e806
Merge pull request #1262 from okriuchykhin/ok_SCI_2614
...
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
2018-08-24 15:22:13 +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
Oleksii Kriuchykhin
a8013118d4
Add READ user endpoint [SCI-2613]
2018-08-21 13:56:14 +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
Oleksii Kriuchykhin
8df6ebb5f2
Remove test for old api token endpoint [SCI-2515]
2018-08-17 14:14:18 +02:00
Oleksii Kriuchykhin
ecde634a2c
Add OAuth2 provider [SCI-2515]
2018-08-17 13:17:59 +02:00
