Commit graph

5668 commits

Author SHA1 Message Date
Michael c0f0f0ea81 close SCI-2698; unit tests for DELETE inventory item 2018-09-07 15:11:53 -07:00
Zanz2 e82af2186e Route comment 2018-09-07 15:52:30 +02:00
Zanz2 2a50c3d736 Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662 2018-09-07 15:35:49 +02:00
Zanz2 a0c6a0c407 changed name of data attribute 2018-09-07 15:33:38 +02:00
Zanz2 bad07841da Created new controllers and serializers for nested task related attributes 2018-09-07 15:19:20 +02:00
Zanz2 7496e3749b fixed types to plural for naming convention 2018-09-07 13:39:00 +02:00
Zanz2 2d3f5f2377 new routes for endpoints 2018-09-07 13:36:55 +02:00
Zanz2 4acc8f5719 fixes travis ci mistake 2018-09-07 12:54:09 +02:00
Zanz2 e64aee5db0 Completed the functionality for experiments and related endpoints 2018-09-07 11:58:02 +02:00
Michael 212bdfeffe close SCI-2696 2018-09-06 17:54:24 -07:00
Michael c22ad02858 inventory_item #create correct response unit test 2018-09-06 13:45:28 -07:00
Zanz2 1589cfb1b2 saving work 2018-09-06 15:38:48 +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 f9d55f913a trying to fix display of my modules data 2018-09-05 12:54:08 +02:00
Zanz2 5ada21725f inital experiments api functionality 2018-09-05 09:55:04 +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 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