scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
4849 commits 70 branches 179 tags 165 MiB
Commit graph

3793 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin 60e78fa868 Improve code style for error handling [SCI-2773] 2018-11-07 15:43:44 +01:00
mlorb 4d156080ac fix empty projects page bug and projects tree bug 2018-11-07 13:45:46 +01:00
mlorb 039faf2964
Merge pull request #1359 from mlorb/ml-sci-2843 
Fix bug with new project button not working [SCI-2843]
 2018-11-07 11:02:47 +01:00
Oleksii Kriuchykhin 82a11ebca2 Remove duplicate destroy for report [SCI-2834] 2018-11-07 09:55:06 +01:00
Matej Zrimšek 2f6a6072e1 Fix repository ZIP export test to work with enabled workers [SCI-2646] 2018-11-07 06:14:40 +01:00
Matej Zrimšek 8fe0249f45 Fix test for repository ZIP export & return path for ZIP exports [SCI-2646] 2018-11-07 05:04:29 +01:00
mlorb 63e039e235 fix bug with new project button not working 2018-11-06 11:38:31 +01:00
Oleksii Kriuchykhin 0e192cc830 Ensure that temporary report is always deleted [SCI-2834] 2018-11-06 09:33:18 +01:00
Matej Zrimšek ee611a45d9 Also remove temp file after other types of ZIP export generation [SCI-2646] 2018-11-04 01:39:16 +01:00
Matej Zrimšek 5defbdd76e Remove temp files after export-all ZIP generation [SCI-2646] 2018-11-04 01:33:50 +01:00
mlorb ad5f4c2ebb
Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint 
Remove show protocol api endpoint
 2018-10-30 14:04:17 +01:00
Oleksii Kriuchykhin daaeb385bb Fix permission helpers in delayed export job [SCI-2834] 2018-10-30 14:04:01 +01:00
Alex Kriuchykhin 2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742 
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
 2018-10-29 16:26:58 +01:00
Alex Kriuchykhin 126fa03305
Merge pull request #1349 from okriuchykhin/ok_SCI_2818 
Fix project index endpoint permission bug [SCI-2818]
 2018-10-29 14:59:22 +01:00
Alex Kriuchykhin 1083ce61fb
Merge pull request #1352 from okriuchykhin/ok_SCI_2814 
Rename user_id to sub in JWT [SCI-2814]
 2018-10-29 14:54:00 +01:00
Alex Kriuchykhin d0804c8969
Merge pull request #1350 from okriuchykhin/ok_SCI_2821 
Fix relationships in activities serializer [SCI-2821]
 2018-10-29 14:53:15 +01:00
Alex Kriuchykhin 098b18b405
Merge pull request #1348 from okriuchykhin/ok_SCI_2782 
Fix inventory column creation permission check [SCI-2782]
 2018-10-29 14:52:57 +01:00
Alex Kriuchykhin 4320af794b
Merge pull request #1353 from okriuchykhin/ok_SCI_2771 
Fix API endpoints that return file URLs [SCI-2771]
 2018-10-29 13:44:55 +01:00
Alex Kriuchykhin 2b4ef619c2
Merge pull request #1345 from okriuchykhin/ok_SCI_2785 
Show all experiments and tasks for archived projects [SCI-2785]
 2018-10-29 11:56:38 +01:00
mlorb 0f8c80172e remove show protocol api endpoint 2018-10-29 11:21:48 +01:00
Alex Kriuchykhin c1d853f7bd
Merge pull request #1344 from okriuchykhin/ok_SCI_2783 
Fix issue with project dropdown caching [SCI-2783]
 2018-10-29 10:56:02 +01:00
Oleksii Kriuchykhin 5708e9bbe7 Fix project start day in serializer [SCI-2820] 2018-10-28 19:02:44 +01:00
Oleksii Kriuchykhin d1e6c64d5e Fix API endpoints that return file URLs [SCI-2771] 2018-10-28 18:39:34 +01:00
mz3944 d733f4e357
Merge pull request #1346 from mz3944/mz-SCI-2787 
In project list table table is not updated when archiving/restoring project [SCI-2787]
 2018-10-28 14:36:17 +01:00
Oleksii Kriuchykhin 04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +01:00
Jure Grabnar 0977f5251d
Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export 
Fix zero limit config on export all
 2018-10-28 13:38:21 +01:00
Jure Grabnar cab0b78afa Fix zero limit config on export all 2018-10-28 09:43:34 +01:00
Oleksii Kriuchykhin 012447d762 Fix relationships in activities serializer [SCI-2821] 2018-10-26 17:30:04 +02:00
Oleksii Kriuchykhin 9ad2718f32 Fix project index endpoint permission bug [SCI-2818] 2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin 93e7c3f390 Fix inventory column creation permission check [SCI-2782] 2018-10-26 14:38:47 +02:00
Alex Kriuchykhin 802290df8b
Merge pull request #1343 from okriuchykhin/ok_SCI_2826 
Skip missing files in assets [SCI-2826]
 2018-10-26 14:23:23 +02:00
Alex Kriuchykhin b51f064c28
Merge pull request #1347 from okriuchykhin/ok_SCI_2756 
Remove double initialization of comments on steps [SCI-2756]
 2018-10-26 14:19:58 +02:00
Jure Grabnar 7d2f2c3b5f
Merge pull request #1337 from jbargu/jg_bug_sci_2805 
Add can_export_project? permission to allow archived projects to be exported [SCI-2805]
 2018-10-26 11:23:57 +02:00
mz3944 ee2cc90825
Merge pull request #1324 from mz3944/mz-SCI-2732 
Export all - Projects view - projects endpoints (unit tests) [SCI-2732]
 2018-10-26 11:20:09 +02:00
Jure Grabnar 04b1d0e142 Remove blank line 2018-10-26 11:00:13 +02:00
Jure Grabnar 3903b4a6f2 Refactor read_project/export_project permissions 2018-10-26 10:58:59 +02:00
Alex Kriuchykhin f581829357
Merge pull request #1339 from okriuchykhin/ok_SCI_2804 
Fix relative links to files in export all PDF [SCI-2804]
 2018-10-26 10:57:04 +02:00
Oleksii Kriuchykhin 6e6bb73d2f Remove double initialization of comments on steps [SCI-2756] 2018-10-26 09:29:42 +02:00
Matej Zrimšek 6447750ff7 Fix showing projects in table view when all are archived [SCI-2787] 2018-10-25 22:31:00 +02:00
Alex Kriuchykhin ababa0b157
Merge pull request #1340 from okriuchykhin/ok_SCI_2793 
Fix helpers to use with export all [SCI-2793]
 2018-10-25 16:55:39 +02:00
Oleksii Kriuchykhin e9a8826a1e Show all experiments and tasks for archived projects [SCI-2785] 2018-10-24 18:49:59 +02:00
Oleksii Kriuchykhin 641d74829a Fix issue with project dropdown caching [SCI-2783] 2018-10-24 17:52:40 +02:00
Oleksii Kriuchykhin 744ad5b196 Skip missimg files in assets [SCI-2826] 2018-10-24 14:58:59 +02:00
Luka Murn 42793d25b7 Add bottom padding to sign in/up/forgot password pages 
Closes SCI-2764.
 2018-10-24 13:57:58 +02:00
Luka Murn 95340bcf36 Update team name placeholder & sublabel on sign up pages 2018-10-24 13:43:56 +02:00
Oleksii Kriuchykhin 990d3a34ca Fix link to inventory CSV file [SCI-2804] 2018-10-24 12:59:04 +02:00
Matej Zrimšek c89488e105 Fix displaying projects when all are archived [SCI-2787] 2018-10-24 03:34:13 +02:00
Matej Zrimšek 43fdab561f Fix project archiving and restoring edge case [SCI-2787] 2018-10-24 01:37:57 +02:00
Matej Zrimšek 18e52e2c6f Fix fetching all user projects [SCI-2787] 2018-10-24 00:29:30 +02:00
Matej Zrimšek c8d170f9ec Add default page size when it's not in request params when fetching projects 2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Oleksii Kriuchykhin 81d751974d Fix helpers to use with export all [SCI-2793] 2018-10-22 14:32:10 +02:00
Oleksii Kriuchykhin 83566cc9d5 Fix relative links to files in export all PDF [SCI-2804] 2018-10-19 16:25:43 +02:00
Alex Kriuchykhin e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770 
Add request rate throttling for API [SCI-2770]
 2018-10-19 09:38:31 +02:00
Jure Grabnar bd5a2a43fd Add can_export_project? permission 
Closes [SCI-2805].
 2018-10-19 08:41:39 +02:00
mlorb e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +02:00
Alex Kriuchykhin 18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772 
Implement inventory column data type name mappings [SCI-2772]
 2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Jure Grabnar c13e7531ea Change generate_team method name 2018-10-16 11:13:01 +02:00
Jure Grabnar 447cad083d Fix formatting according to HoundBot 2018-10-16 11:01:58 +02:00
Jure Grabnar d50f56e319 Disable/enable export proejct button 
Fix filesystem saving
 2018-10-16 11:01:58 +02:00
Jure Grabnar ed16e8d479 Fix reviewers errors 2018-10-16 11:00:38 +02:00
Jure Grabnar 6b47165ac1 Fix formatting according to Houndbot 2018-10-16 11:00:38 +02:00
Jure Grabnar 2558b7a313 Fix formatting according to HoundBot 2018-10-16 11:00:38 +02:00
Jure Grabnar 26df1e5a98 Add export project modal 
Closes [SCI-2645]
 2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin 0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +02:00
Luka Murn 1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes 
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
 2018-10-15 15:20:26 +02:00
Jure Grabnar b9bb0db62d
Merge pull request #1314 from mz3944/mz-SCI-2752 
Render SciNote tables within exported PDF as using HTML Tables [SCI-2752]
 2018-10-15 10:03:42 +02:00
Jure Grabnar ab71471a49 Fix inventories attachment/CSV file path 2018-10-15 08:55:00 +02:00
Matej Zrimšek ef5bf42fc2 Refactor table styling for export all PDF; remove 'min-width' from table cells to also display bigger tables nicely 2018-10-15 08:00:04 +02:00
Matej Zrimšek 7fe6837206 Style tables in export all PDF (in same way as in PDF reports) [SCI-2752] 2018-10-15 07:59:28 +02:00
Matej Zrimšek 97e6fe34a1 Add unstyled tables to the export all PDF [SCI-2752] 2018-10-15 07:58:44 +02:00
Matej Zrimšek 46da1e6b7d Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641] 2018-10-15 07:13:41 +02:00
Matej Zrimšek 9fb5520970 Refactor/match exported filenames in export all PDF [SCI-2641] 2018-10-15 05:54:19 +02:00
Matej Zrimšek 17380ba0ca Refactoring rebased code [SCI-2641] 2018-10-15 01:12:25 +02:00
Matej Zrimšek 1bf16537f6 Add PDF content to the export all ZIP [SCI-2641] 2018-10-14 23:56:10 +02:00
Matej Zrimšek 48a6a64502 Move PDF generation and export logic of export all PDF to the model 2018-10-14 22:52:54 +02:00
Oleksii Kriuchykhin 1cafbd8c50 Move generic code to Viewable Concern [SCI-2733] 2018-10-12 16:14:24 +02:00
Oleksii Kriuchykhin f221d71bbc Fix datatables state restore [SCI-2733] 2018-10-12 15:15:43 +02:00
Matej Zrimšek 69f3a919db Some specification and syntax fixes [SCI-2641] 2018-10-12 07:42:17 +02:00
Matej Zrimšek e242e9a516 Refactor export all PDF content generation [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek 67d51a8880 Refactor ReportsHelper#render_report_element 2018-10-12 07:40:22 +02:00
Matej Zrimšek aa30cf6130 Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek 1575da6edb Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek d970576d60 Switch between generating report PDF and export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek a16d16bc5b Move export all report business logic to model [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 5ce94b5ecd Remove dynamically created export all report after it's no longer needed 2018-10-12 07:40:21 +02:00
Matej Zrimšek 476b6d50a2 Create export all PDF when it's needed [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek c0dc4f6951 Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek ed6dfc90b0 Also shorten too long folder names, fix filename shortening [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 7152d2f0f1 Fix/update file naming convection for exported files [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek d598bb8366 Make relative links work in export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 6f77c4772c Minor fix for assets & tables naming in export all PDF 2018-10-12 07:40:21 +02:00
Matej Zrimšek 0ebce8e283 Add relative links (not working) to files and tables into the PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek b15cc66b2f Add export project PDF for dummy project 2018-10-12 07:40:21 +02:00
Luka Murn 1e46631c02
Merge pull request #1316 from czbiohub/mc-SCI-2700 
close sci-2700; add unit tests for inventory column update [SCI-2700]
 2018-10-11 10:20:15 +02:00
Luka Murn c11345d6a1 Minorly update inventory_column_serializer so tests pass 2018-10-11 09:49:54 +02:00
Oleksii Kriuchykhin 8cf59d8d22 Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +02:00
Luka Murn a217b11bba
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539 
Created read endpoint for projects and related models [SCI-2539]
 2018-10-11 09:03:18 +02:00
Luka Murn c0f47f03b7 Hound is love, Hound is life 2018-10-11 08:51:14 +02:00
Luka Murn dd4f7b5d02 Fix project users, activities, comments, reports endpoints 2018-10-10 17:35:09 +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
Oleksii Kriuchykhin bf80aa12a7 Fix failing test [SCI-2765] 2018-10-10 17:00:53 +02:00
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Alex Kriuchykhin 16b29b50a5
Merge pull request #1321 from okriuchykhin/ok_SCI_2731 
Add Projects view - list/table view [SCI-2731]
 2018-10-08 17:53:35 +02:00
Oleksii Kriuchykhin 7a591273a3 Remove unused variables [SCI-2731] 2018-10-08 13:45:26 +02:00
Oleksii Kriuchykhin 77e2371091 Add tests for inventory cell endpoints [SCI-2765] 2018-10-08 13:25:03 +02:00
Luka Murn a8d56d32e2 Hound is love, Hound is life 2018-10-07 13:28:29 +02:00
Luka Murn 7527dc7352 Fix READ index, READ show, POST create /tasks/:id/results endpoints 2018-10-07 12:58:17 +02:00
Luka Murn fc5cf33614 Fix GET /tasks/:id/activities endpoint 2018-10-07 11:54:11 +02:00
Luka Murn fca580face Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints 2018-10-07 11:35:12 +02:00
Luka Murn 239b974fa0 Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts 2018-10-07 11:29:56 +02:00
Luka Murn 24299ef4c0 Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts 2018-10-07 11:10:41 +02:00
Luka Murn 98544f00e8 Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts 2018-10-07 10:20:01 +02:00
Luka Murn 94e80edc9b Minor variable rename in task_groups_controller.rb 2018-10-07 10:16:00 +02:00
Luka Murn f56e5b1e5a Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts 2018-10-07 10:07:37 +02:00
Luka Murn 0de3c7eb4e Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb 2018-10-07 09:45:24 +02:00
Luka Murn 0643ba216e Fix GET /connections, /connections/:id endpoints 2018-10-07 00:53:39 +02:00
Luka Murn c9a15db85f Fix GET /task_groups endpoints 2018-10-06 20:11:01 +02:00
Luka Murn d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn 9e78de6ef2 Update CREATE, PATCH, DELETE inventory_column endpoints 2018-10-06 17:11:59 +02:00
Luka Murn 6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +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 eaa8a627a8 Update GET /inventories, GET /inventories/:inventory_id endpoints 2018-10-06 12:39:44 +02:00
Luka Murn 6faaff550b Update GET /teams, GET teams/:team_id endpoints slightly 2018-10-06 12:18:57 +02:00
Jure Grabnar d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure 
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
 2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin 0c452f519d Add CRUD endpoints for inventory cells [SCI-2765] 2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin 363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00
Oleksii Kriuchykhin ba58eec2e2 Merge latest features/export-all [SCI-2731] 2018-10-03 11:04:44 +02:00
Oleksii Kriuchykhin 53874c4680 Fix Hound config and CSS code styling [SCI-2730] 2018-10-03 10:39:22 +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
Oleksii Kriuchykhin 7d995189bd Fixies after code review [SCI-2730] 2018-10-02 14:24:44 +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
Oleksii Kriuchykhin 492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Jure Grabnar 553ac4c360 Refactor code according to PR review 
PR review: https://github.com/biosistemika/scinote-web/pull/1304

Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
 2018-09-30 16:37:18 +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
Oleksii Kriuchykhin 2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Zanz2 2e0c40ed45 fixed merge 2018-09-26 12:20:13 +02:00
Zanz2 c8ed808920 merged with core-api 2018-09-26 12:17:49 +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
Oleksii Kriuchykhin f8388d4bcd Merge branch 'ok_SCI_2729' into ok_SCI_2730 2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin e06684b7cf Few fixes after review [SCI-2718] 2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin ab3aeac26b Merge latest core-api branch [SCI-2718] 2018-09-24 16:49:27 +02:00
Oleksii Kriuchykhin 80e73bfb97 Implement Projects view - navigation bar (tabs) [SCI-2729] 2018-09-24 16:25:04 +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 8699761389
Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667 
Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]
 2018-09-24 15:31:47 +02:00
Zanz2 e5b7d68031 this should fix travis ci 2018-09-24 13:33:44 +02:00
Zanz2 1e8442e22e fixed pull request review, forgot some small thing 2018-09-24 12:50:11 +02:00
Zanz2 1a9890ee0f fixed pull request review 2018-09-24 12:48:53 +02:00
Alex Kriuchykhin b38e85c282
Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2 
Fix CREATE inventory endpoint [SCI-2693]
 2018-09-24 10:51:13 +02:00
Jure Grabnar 872a1211bb Format according to Houndbot #3 2018-09-23 18:58:56 +02:00
Jure Grabnar d6f7ec2604 Format according to houndbot #2 2018-09-23 18:53:43 +02:00
Jure Grabnar 869967361c Fix according to Houndbot 2018-09-23 18:48:44 +02:00
Jure Grabnar 7877d559a3 Update email/notification, type: deliver 
Closes [SCI-2643], [SCI-2644].
 2018-09-23 18:45:13 +02:00
Jure Grabnar 59169f882d Add permission check for every project 2018-09-23 14:34:21 +02:00
Jure Grabnar 6106904460 Format according to Houndbot #5 2018-09-23 12:07:53 +02:00
Jure Grabnar 90b220ddda Format according to Houndbot #4 2018-09-23 12:06:06 +02:00
Jure Grabnar 970341e7d7 Format according to Houndbot #3 2018-09-23 11:56:23 +02:00
Jure Grabnar a3d7d37081 Format according to Hound bot #2 2018-09-23 11:30:20 +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
Jure Grabnar 64a6ed7ffe Format according to houndbot 2018-09-23 11:14:59 +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
Oleksii Kriuchykhin 84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +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
Jure Grabnar d783c34d33 Clean some minor artefacts 2018-09-16 23:52:36 +02:00
Jure Grabnar d40096f663 Remove typo and add hyperlink to inventories 2018-09-16 23:45:38 +02:00
Jure Grabnar f8b1db7f72 Fix repository export and relative hyperlinks 2018-09-16 23:01:44 +02:00
Zanz2 5b955da74c makes tooltip behaviour more reliable and less erratic 2018-09-16 21:34:36 +02:00
Jure Grabnar 06eaafd118 Suffix should append to basename first and then extension 2018-09-16 20:57:37 +02:00
Jure Grabnar 449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +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
Oleksii Kriuchykhin 49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +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
Oleksii Kriuchykhin acc00ff3b9 Add CREATE Result endpoint: Create Text result [SCI-2718] 2018-09-13 13:38:11 +02:00
Zanz2 e47acfb4a1 Fixed attribute names 2018-09-13 11:57:31 +02:00
Zanz2 81115f411a Renaming my module attribute to tasks 2018-09-13 11:46:25 +02:00
Zanz2 46d33d28a3 standardized serializers by removing specified attributes 2018-09-13 11:38:29 +02:00
Zanz2 8ac1445ace Fixed hound 2018-09-13 11:37:07 +02:00
Zanz2 7f704c07e3 Created base endpoints for projects and related models 2018-09-13 11:37:07 +02:00
Zanz2 dace81f724 created base projects endpoint 2018-09-13 11:37:07 +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
Zanz2 68385b36cc removed attributes 2018-09-13 11:20:30 +02:00
Zanz2 23f74a5b9b standardized serializers by removing specified attributes 2018-09-13 11:19:54 +02:00