Commit graph

4243 commits

Author SHA1 Message Date
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
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
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
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
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
3f7590bb57 Rename type for inventories and add mimetype for JSON API [SCI-2614][SCI-2616][SCI-2617] 2018-08-10 17:01:14 +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
Oleksii Kriuchykhin
ef7e0ac489 Add GET inventory columns API endpoint [SCI-2615] 2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin
5efcacbf3d Rename type for rows and cells serializers [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:15:08 +02:00
Oleksii Kriuchykhin
6c59e1e159 Fix failing tests [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
4df9a4c9ca Fix code style warnings [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
8d11e03d47 Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
938ec5acb8 Change primary key to bigint on repositories [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +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
Oleksii Kriuchykhin
8f5d30ad1f Fix load protocol modal [SCI-2253] 2018-08-02 14:35:19 +02:00
okriuchykhin
3503eb775b
Merge pull request #1254 from okriuchykhin/ok_SCI_2601
Fix files search results display [SCI-2601]
2018-08-02 11:53:02 +02:00
okriuchykhin
dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608
Adds API authentication with Azure AD [SCI-2608]
2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin
38c36ab798 Fix modals handling with Turbolinks [SCI-2253] 2018-08-02 11:25:14 +02:00
okriuchykhin
6c49ecfd4c
Merge pull request #1250 from okriuchykhin/team_migration_fix
Fix team import service
2018-08-01 15:01:43 +02:00
okriuchykhin
53c287224b
Merge pull request #1247 from ZmagoD/zd_SCI_2489
move FirstTimeDataGenerator helper from applictaion controller [SCI-2489]
2018-07-31 14:33:51 +02:00
Oleksii Kriuchykhin
1c3f1a1a6c Fix fontawesome package paths [SCI-2253] 2018-07-31 13:52:21 +02:00
Oleksii Kriuchykhin
22e12d8fc3 Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin
26b0bd9e11 Refactor tasks tree API endpoint [SCI-2609] 2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin
cd63d4b25f Update JS packages [SCI-2253] 2018-07-30 13:49:48 +02:00
Oleksii Kriuchykhin
33c376c4df Update Sanitize gem [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
5c999300b5 Fix avatar upload validators [SCI-2253] 2018-07-27 17:26:46 +02:00