scinote-web

mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00

Author	SHA1	Message	Date
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
Zanz2	8a925008f9	fixed hound	2018-09-13 11:18:49 +02:00
Zanz2	bd49ea56c5	Added results endpoint	2018-09-13 11:16:34 +02:00
Zanz2	426bd129cc	Added task inputs and outputs functionality	2018-09-13 11:14:22 +02:00
Oleksii Kriuchykhin	9d9a5d07d8	Fix CREATE inventory endpoint [SCI-2693]	2018-09-13 11:08:58 +02:00
Zanz2	2519a010f6	Created new controllers and serializers for nested task related attributes	2018-09-13 11:04:52 +02:00
Zanz2	765ee25853	Merge pull request #1292 from Zanz2/zz_experiments_api_task_2666 Created API endpoints for experiments and related data [SCI-2666]	2018-09-13 10:49:49 +02:00
Zanz2	1159ce519c	Review changes	2018-09-13 09:25:16 +02:00
Luka Murn	99c156de94	Fix (hopefully) the TinyMCE files from being cached Closes SCI-2717.	2018-09-12 15:28:21 +02:00
Luka Murn	0b68a670c2	Fix the inventory_columns_controller#create action Based on unit tests, fix the create inventory columns endpoint to work as intended. Also add another unit test case.	2018-09-12 13:44:10 +02:00
Zanz2	ae3c19ced5	removing attributes	2018-09-11 15:35:03 +02:00
Zanz2	4c2c92445c	fixed oversight, added paging to connections	2018-09-11 13:07:28 +02:00
Zanz2	34f408b552	refactored serializers, removed attributes	2018-09-11 10:34:05 +02:00
Zanz2	7cb50145a0	Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621 Fixed table add and remove crash [SCI-2621]	2018-09-11 09:37:07 +02:00
Zanz2	0efaf827b8	Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2 Replaced image icon with paperclip on scinote [SCI-2712]	2018-09-11 09:36:47 +02:00
Zanz2	a0c6a0c407	changed name of data attribute	2018-09-07 15:33:38 +02:00
Zanz2	7496e3749b	fixed types to plural for naming convention	2018-09-07 13:39:00 +02:00
Zanz2	e64aee5db0	Completed the functionality for experiments and related endpoints	2018-09-07 11:58:02 +02: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	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
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
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
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	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
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
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	ecde634a2c	Add OAuth2 provider [SCI-2515]	2018-08-17 13:17:59 +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
Zanz2	a09834db6a	testing, made new popover designs	2018-08-16 16:10:19 +02:00
Zanz2	d2373980d4	Testing out new popover	2018-08-16 15:07:59 +02:00
Zanz2	9fd02e71c9	initial popover/tooltip config	2018-08-16 13:04:42 +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
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
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
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	5c999300b5	Fix avatar upload validators [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	812a3dcf7d	Fix user profile edit form [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	10b86a9d05	Add data hook to settings/team page [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	b2bd1cb849	Upgrade to Turbolinks 5 [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin	bc1cd39229	Add team deletion service [SCI-2619]	2018-07-27 13:34:13 +02:00
Oleksii Kriuchykhin	563005cf89	Fix files search results display [SCI-2601]	2018-07-26 09:55:18 +02:00
Oleksii Kriuchykhin	0e372af729	Adds API authentication with Azure AD [SCI-2608]	2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin	3e7fc6720c	Fix team import service	2018-07-20 16:10:45 +02:00
Zanz2	c6ef14290a	Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again	2018-07-17 11:41:42 +02:00
Zanz2	887ddbfce3	Merge pull request #1229 from Zanz2/unify_match_case_sci1324 Fix protocol names are case insensitive unique [SCI-1324]	2018-07-17 08:22:03 +02:00
Luka Murn	f67b8d05c7	Merge pull request #1225 from okriuchykhin/ok_SCI_2534 Fix rendering permissions of inventory annotations [SCI-2534]	2018-07-13 15:18:59 +02:00
Luka Murn	f23cc36803	Merge pull request #1224 from ZmagoD/zd_SCI_2429 fixes setting sidebar teams link[fixes SCI-2429]	2018-07-13 14:55:24 +02:00
Luka Murn	de29ab1b11	Merge pull request #1234 from ZmagoD/zd_SCI_2581 adds missing js in experiment canvas view [fixes SCI-2581]	2018-07-13 14:54:59 +02:00
Luka Murn	752fb8dcd8	Merge pull request #1238 from ZmagoD/zd_SCI_2511 fixes smart annotation serch queries/dropdown item picker [fixes SCI-…	2018-07-13 14:54:42 +02:00
Luka Murn	13aab686b1	Merge pull request #1242 from ZmagoD/zd_SCI_2492 adds the ability to scroll to the active element in the navigation si…	2018-07-13 14:54:30 +02:00
Luka Murn	9b2f00cd5d	Merge pull request #1245 from ZmagoD/zd_SCI_2600 sanitizes the report name on repors index page [fixes SCI-2600]	2018-07-13 14:54:18 +02:00
zmagod	29e0ecbc89	move FirstTimeDataGenerator helper from applictaion controller	2018-07-11 11:19:39 +02:00
Zmago Devetak	5a1615825d	removes unneeded comment	2018-07-11 09:29:10 +02:00
zmagod	8fe1977ca8	adds skip_user_status parameter to popover_for_user_name function in order to keep the functionality more extendable [fixes SCI-1334]	2018-07-10 15:34:07 +02:00
zmagod	a7e47faa61	sanitizes the report name on repors index page [fixes SCI-2600]	2018-07-10 10:58:39 +02:00
zmagod	1491c61d51	trim long file names [fixes SCI-2593]	2018-07-09 17:00:47 +02:00
zmagod	62d4796741	adds the ability to scroll to the active element in the navigation sidebar on page load [fixes SCI-2492]	2018-07-09 15:40:52 +02:00
Zmago Devetak	a6a395e394	Merge pull request #1240 from ZmagoD/zd_SCI_2593 fixes css for new repository item field field [fixes SCI-2593]	2018-07-09 13:15:15 +02:00
zmagod	10d20a6555	fixes datatable header on add new item action	2018-07-09 13:12:48 +02:00
zmagod	6585eaa338	fixes hound	2018-07-09 12:55:25 +02:00
zmagod	14254fbde3	fixes per @mlorb 's request	2018-07-09 12:54:02 +02:00
zmagod	dd00de928c	fixes css for new repository item field field [fixes SCI-2593]	2018-07-09 10:33:19 +02:00
Oleksii Kriuchykhin	3aceb12f03	Fix delete button in inventories [SCI-2594]	2018-07-08 21:59:02 +02:00
zmagod	e654725d9e	fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511]	2018-07-06 14:26:20 +02:00
Zmago Devetak	00ed339520	Merge pull request #1233 from ZmagoD/zd_SCI_2589 fixes bug with xslx files with numeric values [fixes SCI-2589]	2018-07-06 11:08:27 +02:00
Zmago Devetak	db90736c62	Merge pull request #1237 from ZmagoD/zd_SCI_2512 fixes list item height on columns management page [fixes SCI-2512]	2018-07-06 10:47:29 +02:00
Zmago Devetak	6b4d5c1562	Merge pull request #1236 from ZmagoD/zd_SCI_2592 fixes file name label in repository file field [fixes SCI-2592]	2018-07-06 10:47:13 +02:00
Luka Murn	95b832800f	Merge pull request #1228 from okriuchykhin/ok_SCI_2585 Fix inventory cell copy with file attached [SCI-2585]	2018-07-06 10:45:44 +02:00
zmagod	f1833b9bc1	fixes list item height on columns management page [fixes SCI-2512]	2018-07-06 09:28:03 +02:00
zmagod	a55d0b9c85	fixes file name label in repository file field [fixes SCI-2592]	2018-07-05 16:59:59 +02:00
Oleksii Kriuchykhin	a169639b3c	Fix uploaded file max size validation in JS [SCI-2590]	2018-07-05 15:23:26 +02:00
zmagod	185657c626	adds missing js in experiment canvas view [fixes SCI-2581]	2018-07-05 14:36:54 +02:00
zmagod	c0d276ebee	fixes bug with xslx files with numeric values [fixes SCI-2589]	2018-07-05 14:08:03 +02:00
zmagod	fdedfec7d3	fixes bug with bootstrap-select	2018-07-04 17:38:16 +02:00
Zmago Devetak	eb61f728b4	Merge pull request #1227 from ZmagoD/zd_SCI_2546 Refactor inline row editing in repository	2018-07-04 15:28:08 +02:00
zmagod	5b9b86a2d4	fixes per @Ducz0r 's request	2018-07-04 15:23:41 +02:00
zmagod	c9dd8b356a	fixes locale, fixes custom file upload style	2018-07-04 13:43:45 +02:00
zmagod	43903080ce	code style fixes	2018-07-04 12:42:28 +02:00
zmagod	3eef4f87bf	fixes hound alerts	2018-07-03 16:18:44 +02:00
zmagod	8b86891177	fixes file destroy button [fixes SCI-2546]	2018-07-03 15:25:37 +02:00
zmagod	28bac14667	first working version of the edit form object	2018-07-03 12:57:39 +02:00
zmagod	c93e00b8c2	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_2546	2018-07-03 09:13:54 +02:00
Zanz2	8e42dba7de	Found the fix	2018-07-03 08:20:56 +02:00
ZmagoD	1e66d25578	refactor list item dropdown	2018-07-02 17:05:52 +02:00
Oleksii Kriuchykhin	42ce72170c	Fix inventory cell copy with file attached [SCI-2585]	2018-07-02 12:58:49 +02:00
ZmagoD	23de3abd61	Fixes repository items edit action, adds additional event listener for file upload	2018-06-29 16:59:26 +02:00
nbernot	7aacc2b4a2	extract repository_item html form creation in to a separate 'class'	2018-06-29 14:28:06 +02:00
zmagod	0dbd2dc877	fixes typo	2018-06-29 10:29:39 +02:00
zmagod	eb75f6c03d	fixes bug with checkAvailableColumns function [fixes SCI-2578]	2018-06-29 10:28:46 +02:00
Oleksii Kriuchykhin	6660b240c8	Fix rendering permissions of inventory annotations [SCI-2534]	2018-06-28 15:30:32 +02:00
okriuchykhin	10554fecb4	Merge pull request #1223 from ZmagoD/zd_SCI_2566 fixes tagsinput text-area on long input [fixes SCI-2566]	2018-06-28 10:50:12 +02:00
Zmago Devetak	54a17e0574	Merge pull request #1209 from ZmagoD/zd_SCI_2165 Update team migration script to support "list of values" and "file" repository columns/cells [fixes SCI-2165]	2018-06-27 15:31:27 +02:00
Zmago Devetak	29c379dbae	add rep_item to update_annotation function	2018-06-27 15:17:02 +02:00
Zmago Devetak	7fd3eec195	Merge pull request #1219 from ZmagoD/zd_SCI_2415 move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-26 18:43:16 +02:00
Luka Murn	9637af51e6	Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout Fix the sign in halt layout	2018-06-26 17:51:18 +02:00
zmagod	1a15ac7acf	fixes setting sidebar teams link[fixes SCI-2429]	2018-06-26 13:09:56 +02:00
zmagod	4b81c2c4db	fixes tagsinput text-area on long input [fixes SCI-2566]	2018-06-26 09:52:07 +02:00
mlorb	52f7d4075d	Merge pull request #1218 from mlorb/ml-sci-2406 Fix firefox bug with browse buttons position [SCI-2406]	2018-06-19 14:58:46 +02:00
Oleksii Kriuchykhin	c0232d9eb2	Add extend for task child elements in reports [SCI-2377]	2018-06-19 14:34:36 +02:00
zmagod	db1944cc90	move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-19 14:15:14 +02:00
mlorb	0792ce46af	fix firefox bug with browse buttons position	2018-06-19 13:39:03 +02:00
zmagod	d68ae63c40	adds repository_items to smart annotation import	2018-06-19 11:58:22 +02:00
Zmago Devetak	16bce8de60	Merge pull request #1215 from ZmagoD/zd_SCI_2294 removes duplicated keywords [fixes SCI-2294]	2018-06-18 16:36:09 +02:00
zmagod	fbcc788597	fixes per @duczOr request	2018-06-18 14:00:49 +02:00
zmagod	5f1489a100	fix columns check [fixes SCI-2408]	2018-06-18 13:36:56 +02:00
Zmago Devetak	cb7023c18e	Merge pull request #1214 from ZmagoD/zd_SCI_2410 disable buttons on new/edit repository_item action [fixes SCI-2410]	2018-06-18 13:03:11 +02:00
zmagod	ed39294733	removes duplicated keywords [fixes SCI-2294]	2018-06-18 12:15:52 +02:00
zmagod	2f141e9217	disable buttons on new/edit repository_item action [fixes SCI-2410]	2018-06-15 11:37:01 +02:00
zmagod	6a6ff534c0	fixes import flash message [fixes SCI-2398]	2018-06-15 11:12:11 +02:00
okriuchykhin	801d0a4a22	Merge pull request #1212 from okriuchykhin/ok_SCI_2377 Add hooks to new report modal [SCI-2377]	2018-06-14 15:48:43 +02:00
Oleksii Kriuchykhin	13c374d9b3	Add hooks to new report modal [SCI-2377]	2018-06-14 15:26:06 +02:00
zmagod	3d7591100a	adds repository row assets to team import/export [fixes SCI-2165]	2018-06-14 15:20:57 +02:00
zmagod	4a82d1e7ac	fixes repository items import	2018-06-14 14:40:43 +02:00
zmagod	bb62fc3715	adds data-hook	2018-06-14 12:42:49 +02:00
Oleksii Kriuchykhin	e10ed86fa1	Remove result validation [SCI-2376]	2018-06-13 14:06:55 +02:00
zmagod	f2c0b3aa92	removes samples, adds list_items	2018-06-13 12:45:48 +02:00
Zmago Devetak	29fe58de80	Merge pull request #1208 from ZmagoD/zd_SCI_2408 adds an additional check if some other user has added/removed reposit…	2018-06-13 11:30:43 +02:00
Zmago Devetak	2eb6613c6a	Merge pull request #1206 from ZmagoD/zd_SCI_2442 make manage columns page more responsive [fixes SCI-2442]	2018-06-13 11:14:35 +02:00
Zmago Devetak	d457a66996	Merge pull request #1205 from ZmagoD/zd_SCI_2427 enables tooltip on long column names [fixes SCI-2427]	2018-06-13 11:14:29 +02:00
Zmago Devetak	a8981d7039	Merge pull request #1201 from ZmagoD/zd_SCI_2421 fixes bug with tinymce/at.js [fixes SCI-2421]	2018-06-13 11:14:17 +02:00
Zmago Devetak	673410251d	Merge pull request #1197 from ZmagoD/zd_SCI_2384 fixes repository table on sidebar toggle [fixes SCI-2384]	2018-06-13 09:57:27 +02:00
Zmago Devetak	50c1a712d8	Merge pull request #1204 from ZmagoD/zd_SCI_2434 fixes bug with repository items dropdown [fixes SCI-2434]	2018-06-13 08:42:13 +02:00
Zmago Devetak	6cab1746cd	Merge pull request #1202 from ZmagoD/zd_SCI_2392 prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-13 08:41:41 +02:00
Zmago Devetak	e06ab02f68	Merge pull request #1192 from ZmagoD/zd_SCI_2435 removes visibility toggle from Name column [fixes SCI-2435]	2018-06-13 08:41:25 +02:00
Luka Murn	9a4fdd166e	Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix Conflicts: app/views/projects/index.html.erb	2018-06-12 17:44:42 +02:00
zmagod	f8ac083d39	adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]	2018-06-12 15:28:03 +02:00
Luka Murn	a66d65fb28	Fix the sign in halt layout ... so it's not dependant on common addon any more.	2018-06-12 14:47:15 +02:00
zmagod	1cff4a5060	make manage columns page more responsive [fixes SCI-2442]	2018-06-12 10:22:48 +02:00
zmagod	a8971b4e20	enables tooltip on long column names [fixes SCI-2427]	2018-06-11 15:22:56 +02:00
Zmago Devetak	a174e186bb	removes unneeded code	2018-06-11 15:00:13 +02:00
zmagod	256e502982	fixes bug with repository items dropdown [fixes SCI-2434]	2018-06-11 14:57:27 +02:00
mlorb	1e1330847f	remove unused code	2018-06-11 14:49:03 +02:00
mlorb	40f3365596	fix bug with truncating string	2018-06-11 14:47:25 +02:00
zmagod	32a09f9780	prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-11 13:03:11 +02:00
zmagod	374a16abad	fixes bug with tinymce/at.js [fixes SCI-2421]	2018-06-11 10:18:35 +02:00
okriuchykhin	acd6efae57	Merge pull request #1200 from okriuchykhin/ok_SCI_2212 Add result content hook [SCI-2212]	2018-06-11 09:28:30 +02:00
Zmago Devetak	6ba5c587f7	Merge pull request #1189 from ZmagoD/zd_SCI_2211 add data-hook, refactor add user to project modal to support addons	2018-06-08 15:23:26 +02:00
Zmago Devetak	a7dc4f8933	Merge pull request #1194 from ZmagoD/add_data_hook adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]	2018-06-08 14:49:48 +02:00
Zmago Devetak	0b5c1e3ecc	Merge pull request #1195 from ZmagoD/zd_SCI_2487 fixes assign items flash message [fixes SCI-2487]	2018-06-08 14:40:48 +02:00
Zmago Devetak	eff68aead8	Merge pull request #1193 from ZmagoD/zd_SCI_2481_ fixes project validation message [fixes SCI-2481]	2018-06-08 14:40:27 +02:00
Zmago Devetak	74ccaf06b9	Merge pull request #1184 from ZmagoD/zd_SCI_2417 adds asset_text_data to global search options	2018-06-08 14:30:52 +02:00
Oleksii Kriuchykhin	87925271e8	Add result content hook [SCI-2212]	2018-06-08 14:22:03 +02:00
Luka Murn	bfaedab4b4	Fix buttons style on tags modal Closes SCI-2397.	2018-06-08 13:43:23 +02:00
zmagod	b7ecf09963	fixes repository table on sidebar toggle [fixes SCI-2384]	2018-06-08 10:58:28 +02:00
zmagod	f769215468	fixes assign items flash message [fixes SCI-2487]	2018-06-08 10:02:57 +02:00
zmagod	86c4093bf2	adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]	2018-06-08 09:41:04 +02:00
Luka Murn	eb29c50379	Fix asset link preview, fix inventory item modal window styling	2018-06-08 09:01:59 +02:00
Luka Murn	dbceac7aa4	Style inventories secondary navigation section	2018-06-08 08:31:22 +02:00
zmagod	11ebea573a	fixes project validation message [fixes SCI-2481]	2018-06-07 16:42:11 +02:00
Luka Murn	4cdfe67115	Fix protocol management filter display (css)	2018-06-07 15:57:59 +02:00
zmagod	51e024e3d7	adds data-hooks to reports and search results [fixes SCI-2374]	2018-06-07 14:29:40 +02:00
zmagod	c0b659a252	adds data-hook to repositories/show page	2018-06-07 10:50:48 +02:00
Luka Murn	b324a2dab3	Restyle activities page	2018-06-07 09:29:47 +02:00
Luka Murn	0417af716b	Remove new experiment button from canvas, change edit canvas btn	2018-06-06 17:41:07 +02:00
zmagod	43a60b632a	adds datahook to experiment card [fixes SCI-2373]	2018-06-06 17:28:04 +02:00
Luka Murn	c07fa5adc2	Update blank page for projects	2018-06-06 17:23:22 +02:00
Luka Murn	e0a3b5a941	Fix Save PDF to repository modal window	2018-06-06 16:29:07 +02:00
zmagod	a51ea399f4	removes unneeded empty lines	2018-06-05 16:39:22 +02:00
zmagod	66cac0b676	removes visibility toggle from Name column [fixes SCI-2435]	2018-06-05 16:36:36 +02:00
Luka Murn	3823eb8c74	Merge pull request #1191 from ZmagoD/zd_SCI_2486 fixes project duplication [fixes SCI-2486]	2018-06-05 09:49:34 +02:00
zmagod	2def874ffd	fixes project duplication [fixes SCI-2486]	2018-06-05 09:44:03 +02:00
Zmago Devetak	fad67d7730	Merge pull request #1185 from ZmagoD/zd_SCI_2468 Limits the max. amount of rows when importing into inventories [fixes…	2018-06-04 16:29:33 +02:00
zmagod	9b9143f145	add hook to tab pane	2018-06-01 16:46:27 +02:00
okriuchykhin	04accc8fc8	Merge pull request #1190 from okriuchykhin/ok_SCI_2478 Fix project_tree for non admin users [SCI-2478]	2018-06-01 16:40:05 +02:00
Oleksii Kriuchykhin	8de0e282e3	Fix project_tree for non admin users [SCI-2478]	2018-06-01 16:38:49 +02:00
zmagod	997748561b	adds missing js changes	2018-06-01 16:14:50 +02:00
zmagod	84170f6de0	add data-hook, refactor add user to project modal to support addons	2018-06-01 16:13:22 +02:00
okriuchykhin	5ba60d9f8f	Merge pull request #1188 from okriuchykhin/ok_SCI_2478 Improve sidebar rendering performance [SCI-2478]	2018-06-01 15:17:34 +02:00
Luka Murn	4ba07fb082	Merge pull request #1186 from Ducz0r/lm-sci-2477-fix Move sign-in flow layout to core [SCI-2477]	2018-06-01 15:08:44 +02:00
Oleksii Kriuchykhin	58d8414f92	Code fixes for sidebar [SCI-2478]	2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin	2ddc0fb561	Improve sidebar rendering performance [SCI-2478]	2018-06-01 13:49:02 +02:00
mlorb	0a8bfdb860	Reposition the arrow for opening/closing of Navigation	2018-06-01 13:18:49 +02:00
Luka Murn	20ffa57583	Move sign-in flow layout to core Closes SCI-2477.	2018-06-01 09:11:48 +02:00
zmagod	9abf50e7c5	Limits the max. amount of rows when importing into inventories [fixes SCI-2468]	2018-05-31 10:45:31 +02:00
zmagod	3da098cb60	fixes the issue with extraction of text from file [fixes SCI-2417]	2018-05-31 09:42:57 +02:00
Luka Murn	58e6701b0a	Merge pull request #1181 from Ducz0r/lm-sci-2471-fix Fix inventory rows without files not being saved bug [SCI-2471]	2018-05-30 18:33:50 +02:00
Zmago Devetak	28abdf285e	Merge pull request #1183 from ZmagoD/zd_SCI_2451_v2 fixes sidebar [fixes SCI-2451]	2018-05-30 18:21:03 +02:00
mlorb	c17a947969	Merge pull request #1182 from mlorb/ml-sci-2459 Fix position of navigation bar is not saved [SCI-2459]	2018-05-30 18:10:01 +02:00
mlorb	35badd8bb8	move variable declaration	2018-05-30 17:58:18 +02:00
zmagod	e06ae9b543	fixes sidebar [fixes SCI-2451]	2018-05-30 16:53:08 +02:00
mlorb	100ddf127d	fix position of navigation bar is not saved	2018-05-30 16:46:27 +02:00
Luka Murn	68f5a6bebd	Fix inventory rows without files not being saved bug Closes SCI-2471.	2018-05-30 14:41:20 +02:00
mlorb	858b95d851	fix align bullet with a file name	2018-05-30 13:58:16 +02:00
okriuchykhin	3253cac86f	Merge pull request #1178 from okriuchykhin/ok_SCI_2462 Add user id tracking when discarding repository [SCI-2462]	2018-05-30 10:23:17 +02:00
Zmago Devetak	332ddd9c10	Merge pull request #1177 from ZmagoD/zd_SCI_2420 fixes bug with empty submit of repository row [fixes SCI-2420]	2018-05-29 15:38:45 +02:00
Oleksii Kriuchykhin	6cf9149baa	Add user id tracking when discarding repository [SCI-2462]	2018-05-29 15:33:02 +02:00
zmagod	b74598a748	fixes bug with empty submit of repository row [fixes SCI-2420]	2018-05-29 14:47:40 +02:00
zmagod	89046e9787	fixes items assign flash message [fixes SCI-2395]	2018-05-29 12:54:41 +02:00
okriuchykhin	6deaa7235b	Merge pull request #1136 from okriuchykhin/ok_SCI_2396 Handle situation with smart annotations and zero inventories [SCI-2396]	2018-05-28 17:23:29 +02:00
Zmago Devetak	147e74b4a5	Merge pull request #1164 from ZmagoD/zd_SCI_2448 adds discard gem, move deletion of repositories in a rake task to run…	2018-05-28 15:04:54 +02:00
Zmago Devetak	ad5114090f	Merge pull request #1165 from ZmagoD/zd_SCI_2433 fixes tast description/due-date modal [fixes SCI-2433]	2018-05-28 13:10:15 +02:00
okriuchykhin	0e6c89c3de	Merge pull request #1166 from okriuchykhin/ok_SCI_2342 Fix WOPI controller to support repositories [SCI-2342]	2018-05-28 13:07:17 +02:00
okriuchykhin	2e79af3412	Merge pull request #1174 from okriuchykhin/ok_SCI_2458 Fix left menu word breaking [SCI-2458]	2018-05-28 13:06:26 +02:00
Luka Murn	80323eaf67	Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle Conflicts: app/assets/javascripts/sidebar_toggle.js.erb	2018-05-28 12:39:24 +02:00
Luka Murn	e611e76fae	Fix Hound errors	2018-05-28 11:53:49 +02:00
mlorb	2bce62cab8	Merge branch 'ux-release-1' into ml-sci-2405	2018-05-28 11:43:14 +02:00
mlorb	f791234ec7	changes on Zmago's request	2018-05-28 11:36:37 +02:00
Zmago Devetak	9513efa3f3	Merge pull request #1173 from ZmagoD/zd_SCI_2451 fixes sidebar animation [fixes SCI-2451]	2018-05-28 11:18:07 +02:00
Oleksii Kriuchykhin	f0362a0c02	Fix left menu word breaking [SCI-2458]	2018-05-28 10:42:07 +02:00
Zmago Devetak	792b134737	Merge pull request #1170 from ZmagoD/zd_SCI_2437 adds flash_message div in manage repository column page	2018-05-28 10:32:06 +02:00
zmagod	485993f2f6	fixes sidebar animation [fixes SCI-2451]	2018-05-28 10:28:35 +02:00
mlorb	099cc29abb	fix tests	2018-05-28 09:29:46 +02:00
Luka Murn	b3ae1d8fa6	Remove some dead code, make sidebar toggle animated	2018-05-27 16:24:47 +02:00
Luka Murn	b86edf20a5	Remove auto-toggling of navigation sidebar depending on width	2018-05-27 15:44:15 +02:00
Luka Murn	8b527d8a5b	Restyle left side menu bar so it also works with lower heights	2018-05-27 15:24:49 +02:00
Luka Murn	6e6b6803e6	Remove session-stored toggle state of navigation bar	2018-05-27 15:24:11 +02:00
Luka Murn	ce4883522a	Merge pull request #1171 from biosistemika/lm-change-login-btn-to-primary Change login button color to green	2018-05-25 17:15:57 +02:00
Luka Murn	0fc278a74c	Merge pull request #1169 from biosistemika/lm-remove-report-sidebar-file Delete _report_sidebar.html.erb	2018-05-25 17:15:27 +02:00
mlorb	f02363dfce	fix error if user is not assigned to any teams	2018-05-25 17:14:22 +02:00
Luka Murn	23d8dc0b31	Change login button color to green What it says, change it to `btn-primary`.	2018-05-25 17:05:00 +02:00
zmagod	6512970b9c	adds flash_message div in manage repository column page	2018-05-25 14:36:15 +02:00
zmagod	c683cfdbd7	triggers the delayed job in the controller action, fixes smart annotations	2018-05-25 11:41:43 +02:00
Luka Murn	c76b926387	Delete _report_sidebar.html.erb This file is no longer needed from my research.	2018-05-25 11:04:05 +02:00
Luka Murn	fe3ddb7c65	Update code so it works	2018-05-25 08:50:27 +02:00
Oleksii Kriuchykhin	46d6accf78	Fix search in repositories [SCI-2428]	2018-05-24 17:14:40 +02:00
Oleksii Kriuchykhin	b019ab8f61	Fix WOPI controller to support repositories [SCI-2342]	2018-05-24 16:51:25 +02:00
zmagod	10351bbf83	fixes tast description/due-date modal [fixes SCI-2433]	2018-05-24 16:44:10 +02:00
Zmago Devetak	280a926554	Merge pull request #1159 from ZmagoD/zd_SCI_2372 adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]	2018-05-24 16:05:56 +02:00
zmagod	06f1daf7a9	rename data-hook	2018-05-24 16:02:56 +02:00
zmagod	bbbe06e491	fixes reports index for guest users	2018-05-24 15:28:54 +02:00
zmagod	1f8db7bc49	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2340	2018-05-24 15:00:59 +02:00
zmagod	b13e39a0d9	adds discard gem, move deletion of repositories in a rake task to run in background worker [fixes SCI-2448]	2018-05-24 14:39:25 +02:00
Luka Murn	c9f3de9f27	Improve toggle	2018-05-24 13:39:04 +02:00
mlorb	c5e62207eb	fix bug with protocol preview does not open on protocols containing files	2018-05-24 11:51:27 +02:00
mlorb	f972676f8d	Merge pull request #1158 from Ducz0r/lm-sci-2416-fix Update software with new logo & new brand [SCI-2416]	2018-05-23 15:47:17 +02:00
mlorb	3368e3b963	Merge branch 'ux-release-1' into ml-sci-2271	2018-05-23 14:06:54 +02:00
mlorb	2bb2f8d193	Merge pull request #1161 from mlorb/ml-sci-2350 move the open/close arrow to the bottom of left menu [SCI-2350]	2018-05-23 14:01:12 +02:00
mlorb	00657a78a5	Merge pull request #1162 from mlorb/ml-sci-2440-v2 fix toggle button on inventory page [SCI-2440]	2018-05-23 14:01:02 +02:00
okriuchykhin	7b08529e39	Merge pull request #1156 from okriuchykhin/ok_SCI_2342 Enable editing office online files in inventories [SCI-2342]	2018-05-23 12:59:12 +02:00
okriuchykhin	f61f069c95	Merge pull request #1157 from okriuchykhin/ok_SCI_2432 Init selectpicker for move workflow to another experiment modal [SCI-2432]	2018-05-23 12:58:58 +02:00
mlorb	5e689f6b4d	fix toggle button on inventory page	2018-05-23 11:20:42 +02:00
mlorb	79f1a1c0ad	fix padding and change label colors	2018-05-23 11:13:28 +02:00
mlorb	7b5ec4ae3f	move the open/close arrow to the bottom of left menu	2018-05-23 09:44:46 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
zmagod	e97a98f189	adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]	2018-05-22 14:18:40 +02:00
Luka Murn	31a1641b42	Merge pull request #1155 from Ducz0r/lm-sci-2436-fix Update new repository row code so file columns work again [SCI-2436]	2018-05-22 09:27:32 +02:00
mlorb	e3fc0237c1	Merge pull request #1153 from mlorb/ml-sci-2440 Final button colour changes [SCI-2440]	2018-05-21 16:29:04 +02:00
Oleksii Kriuchykhin	39b74d6f8a	Init selectpicker for move workflow to another experiment modal [SCI-2432]	2018-05-21 16:12:39 +02:00
Oleksii Kriuchykhin	5c41527b92	Enable editing office online files in inventories [SCI-2342]	2018-05-21 15:48:48 +02:00
Luka Murn	69d1f0511f	Rename sciNote -> SciNote (app/ folder)	2018-05-21 15:19:11 +02:00
Luka Murn	cea18a44d5	Rename sciNote -> SciNote (app/javascript folder)	2018-05-21 15:18:30 +02:00
Luka Murn	6135081a71	Update new repository row code so file columns work again Also fix backend code a bit (so update & create of repository rows are more similar in their behavior), and fix line in JS: _initSelectPicker() was called a reduntant amount of times when editing repository row. Closes SCI-2436.	2018-05-21 14:46:30 +02:00
zmagod	ba2aafae39	fix access to public reports [fixes SCI-2340]	2018-05-21 14:45:18 +02:00
Zmago Devetak	2ac04ee476	Merge pull request #1150 from ZmagoD/zd_SCI_2426 migrations that fixes the bug with smart annotations [fixes SCI-2426]	2018-05-21 14:15:47 +02:00
Zmago Devetak	67127b4d89	Merge pull request #1151 from ZmagoD/zd_SCI_2344_v2 shorten project name [fixes SCI-2344]	2018-05-21 14:15:24 +02:00
Luka Murn	91673afbf3	Merge pull request #1149 from Ducz0r/lm-remove-unnecessary-save-on-notifications Remove unnecessary save on notifications	2018-05-21 13:53:23 +02:00
okriuchykhin	6dbb5bc583	Merge pull request #1152 from okriuchykhin/ok_SCI_2403 Change remove file button appearence [SCI-2403]	2018-05-18 17:34:56 +02:00
mlorb	0fccc71fc3	fix load protocol wording and UI-style	2018-05-18 16:57:18 +02:00
mlorb	c2cf52bb34	add another toggle button	2018-05-18 16:34:01 +02:00
mlorb	81392362ac	Final button colour changes	2018-05-18 16:24:24 +02:00
Oleksii Kriuchykhin	b79b0b79cf	Change remove file button appearence [SCI-2403]	2018-05-18 14:51:45 +02:00
zmagod	5514683f96	shorten project name [fixes SCI-2344]	2018-05-18 14:12:12 +02:00
zmagod	b8098093ee	migrations that fixes the bug with smart annotations [fixes SCI-2426]	2018-05-18 13:57:52 +02:00
Luka Murn	5e90ae7383	Remove uneccesary save when setting notification settings on user These methods should behave as the rest of setters on ActiveRecords, ergo setting the model state, but not saving it. The save is called at the end of the action inside the controller anyway, so this save is redundant.	2018-05-18 13:43:04 +02:00
mlorb	876717e355	add pointer cursor to arrow	2018-05-18 13:34:52 +02:00
mlorb	64cbddb9a0	UI/UX restyle - update colours for navigation	2018-05-18 10:41:32 +02:00
Zmago Devetak	c3d247faae	Merge pull request #1128 from ZmagoD/zd_SCI_2331 adds deface hook in support dropdown [fixes SCI-2331]	2018-05-18 09:31:02 +02:00
zmagod	8a99d35a8d	removes datatables.noSearchHidden plugin	2018-05-18 09:24:36 +02:00
zmagod	cf4c33bf92	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371	2018-05-17 15:22:43 +02:00
zmagod	38b0cb742c	removes empty space	2018-05-17 15:21:45 +02:00
mlorb	7bda68b9f4	Merge pull request #1146 from mlorb/ml-sci-2336-v3 Add locales [SCI-2336]	2018-05-17 13:29:47 +02:00
zmagod	e019767e90	refactor save_pdf_to_inventory_item service	2018-05-17 13:17:19 +02:00
zmagod	b125863baf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371	2018-05-17 11:25:33 +02:00
zmagod	ca0c8cbb71	fixes typos, fixes pdf rendering	2018-05-17 11:21:34 +02:00
mlorb	933a98c1f6	fix smart anotation color	2018-05-17 11:01:15 +02:00
Zmago Devetak	5184170a90	Merge pull request #1147 from ZmagoD/zd_SCI_2399 fixes ajax error in repositories [fixes SCI-2399]	2018-05-16 20:34:56 +02:00
Zmago Devetak	f73bd18989	Merge pull request #1145 from ZmagoD/zd_SCI_2407 fixes column name in columns visibility dropdown tooltip [fixes SCI-2…	2018-05-16 20:34:40 +02:00
zmagod	87369ae16b	fixes ajax error in repositories [fixes SCI-2399]	2018-05-16 15:08:50 +02:00
okriuchykhin	e9d6b26ec6	Merge pull request #1141 from okriuchykhin/ok_SCI_2403 Add clear file selector button to repository edit [SCI-2403]	2018-05-16 14:55:53 +02:00
zmagod	b1b259fdbe	fixes column name in columns visibility dropdown tooltip [fixes SCI-2407]	2018-05-16 14:37:58 +02:00
mlorb	06ce285ae2	add locales	2018-05-16 14:32:15 +02:00
Zmago Devetak	8a92f1a499	Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3 Adds custom method that generates smart annotations name for repository	2018-05-16 13:23:25 +02:00
Zmago Devetak	9d2303c777	Merge pull request #1115 from ZmagoD/zd_SCI_2321 fixes images preview in repository/library [fixes SCI-2321]	2018-05-16 12:05:33 +02:00
zmagod	98baa77846	fixes cursor icon	2018-05-16 12:02:46 +02:00
mlorb	f59ea8c7a6	Merge pull request #1137 from mlorb/ml-sci-2336-v2 UI/UX restyle - fixes throughout application - part 2 [SCI-2336]	2018-05-16 11:30:54 +02:00
Oleksii Kriuchykhin	c8094f196c	Add margin to clear button and fix case with new file in the cell [SCI-2403]	2018-05-16 11:25:43 +02:00
zmagod	7e3dbcd92f	hound	2018-05-16 10:43:25 +02:00
zmagod	712a3c7ff6	fixes css, changes spinner in preview modal	2018-05-16 10:40:49 +02:00
Oleksii Kriuchykhin	be5d481cdc	Add clear file selector button to repository edit [SCI-2403]	2018-05-16 10:32:50 +02:00
okriuchykhin	19ed711ce2	Merge pull request #1142 from okriuchykhin/ok_SCI_2411 Fix pagination in global search inside repositories [SCI-2411]	2018-05-16 10:19:05 +02:00
okriuchykhin	62f0c21a79	Merge pull request #1140 from okriuchykhin/ok_SCI_2391 Re-init file preview modal after inventory row editing [SCI-2391]	2018-05-16 10:18:13 +02:00
okriuchykhin	3e2b455d2c	Merge pull request #1139 from okriuchykhin/ok_SCI_2385 Fix task resore permissions [SCI-2385]	2018-05-16 10:17:51 +02:00
okriuchykhin	a7547b9775	Merge pull request #1138 from okriuchykhin/ok_SCI_2404 Disable some validations in repository import to improve speed [SCI-2404]	2018-05-16 10:17:10 +02:00
okriuchykhin	ffddf3fd94	Merge pull request #1135 from okriuchykhin/ok_SCI_2394 Fix editing of inventory rows with existing files [SCI-2394]	2018-05-16 10:16:26 +02:00
Luka Murn	19e30b4e95	Merge pull request #1143 from Ducz0r/lm-sci-2320-fix Write tests for repository table state [SCI-2320]	2018-05-16 09:49:00 +02:00
zmagod	4573655ec8	adds save PDF report to inventory feature [fixes SCI-2371]	2018-05-16 09:31:19 +02:00
Zmago Devetak	b771149477	Merge pull request #1133 from ZmagoD/zd_SCI_2337 fixes error message for invalid file type [fixes SCI-2337]	2018-05-16 08:26:11 +02:00
Luka Murn	63b7b937bb	Fix a bug with table order not updating properly with col deletion	2018-05-15 20:44:15 +02:00
Oleksii Kriuchykhin	0ca0884937	Fix pagination in global search inside repositories [SCI-2411]	2018-05-15 17:48:48 +02:00
mlorb	cea7f5a3f7	some extra style unification	2018-05-15 17:10:31 +02:00
mlorb	5f462165b5	change font and alerts colors	2018-05-15 14:16:34 +02:00
Oleksii Kriuchykhin	95b8821cc9	Re-init file preview modal after inventory row editing [SCI-2391]	2018-05-15 12:57:36 +02:00
Oleksii Kriuchykhin	1d0536b064	Fix task resore permissions [SCI-2385]	2018-05-15 11:51:53 +02:00
Oleksii Kriuchykhin	39d594b0da	Disable some validations in repository import to improve speed [SCI-2404]	2018-05-15 11:14:43 +02:00
mlorb	dfe65ccaed	UI/UX restyle - fixes throughout application - part 2	2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin	addf4cfe5e	Handle situation with smart annotations and zero inventories [SCI-2396]	2018-05-14 15:34:23 +02:00
Oleksii Kriuchykhin	a92abc5995	Fix editing of inventory rows with existing files [SCI-2394]	2018-05-14 14:26:01 +02:00
mlorb	f01cfc2968	fix hound	2018-05-14 12:08:45 +02:00
mlorb	ed27a7a62a	some extra restyling/unifying off app	2018-05-11 18:02:17 +02:00
mlorb	b5649f0574	Merge branch 'ux-release-1' into ml-sci-2336-v1	2018-05-10 13:59:57 +02:00
zmagod	3db7cc437b	fixes error message for invalid file type [fixes SCI-2337]	2018-05-10 13:52:01 +02:00
Luka Murn	8650edbbb9	Merge pull request #1129 from Ducz0r/lm-fix-repositories-index Fix merge conflict introduced in when merging master->ux-release-1	2018-05-10 11:19:38 +02:00
okriuchykhin	3b4d9fe744	Merge pull request #1132 from okriuchykhin/ok_SCI_2301 Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]	2018-05-10 10:46:25 +02:00
okriuchykhin	ed8237484b	Merge pull request #1131 from okriuchykhin/ok_SCI_2379 Re-init file preview modal after column visability change [SCI-2379]	2018-05-10 10:45:56 +02:00
zmagod	e5c3fb6af2	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-05-10 10:38:56 +02:00
zmagod	4bc01c44e9	add file name to loading image	2018-05-10 10:37:48 +02:00
Zmago Devetak	0a4deeaa35	Merge pull request #1112 from ZmagoD/zd_SCI_2261 propagate assigned repository items in workflow [fixes SCI-2261]	2018-05-10 09:57:49 +02:00
zmagod	38869ec037	adds title on disabled download file link	2018-05-10 09:47:10 +02:00
zmagod	0fe499d4a1	adds the update action to repository records last_modified_by field when downstreaming assigned records	2018-05-10 09:04:12 +02:00
Oleksii Kriuchykhin	8ec643c54b	Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]	2018-05-09 18:03:16 +02:00
Oleksii Kriuchykhin	fa1fea634c	Re-init file preview modal after column visability change [SCI-2379]	2018-05-09 17:41:52 +02:00
mlorb	13f9ec30b8	fix hound	2018-05-09 13:56:32 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
Luka Murn	f8295b60c9	Fix merge conflict introduced in when merging master->ux-release-1 Bug was introduced in merge commit `cb6fe50832` and resulted in import into inventories not working.	2018-05-08 09:41:40 +02:00
Zmago Devetak	a6275062b7	Merge pull request #1126 from ZmagoD/zd_SCI_2344 adds new string truncation method [fixes SCI-2344]	2018-05-07 16:30:12 +02:00
zmagod	ed6098ece6	adds deface hook in support dropdown [fixes SCI-2331]	2018-05-07 13:09:33 +02:00
zmagod	3e10ff7fc5	add custom method that generates smart annotations name from repository name [fixes SCI-2307]	2018-05-04 10:44:23 +02:00
Zmago Devetak	ee307886df	Merge pull request #1124 from ZmagoD/zd_SCI_2347 fix the missing icons on task card [fixes SCI-2347]	2018-05-04 09:34:49 +02:00
zmagod	fa30278153	change dropdown lenght	2018-05-03 16:25:59 +02:00
zmagod	0177dc811b	fixes per @mojca 's request	2018-05-03 16:21:29 +02:00
zmagod	abbc0995f2	fix css	2018-05-03 14:51:49 +02:00
zmagod	60e5aa8716	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2	2018-05-03 14:49:06 +02:00
Zmago Devetak	d744f24b85	Merge pull request #1118 from ZmagoD/zd_SCI_2323 sign_out user after 7 days [fixes SCI-2323]	2018-05-03 14:36:44 +02:00
Zmago Devetak	19d5c687ef	remove unneeded :rememberable module	2018-05-03 14:35:59 +02:00
Zmago Devetak	9ce071693d	Merge pull request #1116 from ZmagoD/zd_SCI_2310 parse smart annotations in repository export [fixes SCI-2310]	2018-05-03 14:34:29 +02:00
zmagod	0b721d86b1	adds new string truncation method [fixes SCI-2344]	2018-05-03 14:24:23 +02:00
Zmago Devetak	4fe4fea4fc	Merge pull request #1122 from ZmagoD/zd_SCI_2339 repository when sorting/searching bug fix [SCI-2339]	2018-05-03 12:05:39 +02:00
mlorb	d2c0ae241e	Merge pull request #1121 from mlorb/ml-sci-2244 Update buttons positions and wording throughout app [SCI-2244]	2018-05-03 11:05:15 +02:00
mlorb	ca022fead7	rename inventories buttons	2018-05-03 10:39:50 +02:00
zmagod	f04677600b	fix the missing icons on task card [fixes SCI-2347]	2018-05-03 10:05:40 +02:00
zmagod	0584453575	fixes per @okriuchykhin 's request	2018-04-26 17:18:03 +02:00
zmagod	66b676b5ce	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-04-26 17:04:36 +02:00
zmagod	0afe461962	fixes download link	2018-04-26 17:00:51 +02:00
mlorb	f97477f3f0	some extra button styling	2018-04-26 15:19:05 +02:00
mlorb	763d934aa7	fix buttons again	2018-04-26 15:02:24 +02:00
zmagod	e9642cadad	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304	2018-04-26 14:26:30 +02:00
zmagod	ca539cdce8	remove samples from search	2018-04-26 14:25:02 +02:00
zmagod	8dac887f10	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261	2018-04-26 14:18:41 +02:00
zmagod	24acd5c779	fixes per @duco 's request	2018-04-26 14:13:46 +02:00
mlorb	88d5ba369d	Merge branch 'ux-release-1' into ml-sci-2244	2018-04-26 14:07:03 +02:00
Luka Murn	cb6fe50832	Merge branch 'master' into ux-release-1 Conflicts: app/assets/javascripts/repositories/index.js	2018-04-26 11:38:54 +02:00
zmagod	23f8f35a2c	a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339]	2018-04-26 11:05:02 +02:00
Zmago Devetak	ac10f9fdb1	Merge pull request #1117 from ZmagoD/zd_SCI_2187 remove task description info from canvas task card [fixes SCI-2187]	2018-04-26 09:42:47 +02:00
Zmago Devetak	a6b2bb0228	Merge pull request #1120 from ZmagoD/zd_SCI_2338 add permission check to repostiory show action [fixes SCI-2338]	2018-04-26 09:41:43 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
Luka Murn	cd04596c62	Merge pull request #1111 from Ducz0r/lm-sci-2276-fix Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]	2018-04-25 12:37:27 +02:00
zmagod	12365b3f0f	add permission check to repostiory show action [fixes SCI-2338]	2018-04-25 11:56:30 +02:00
Luka Murn	bd6f97fabc	Add initializer to include helpers in all assets (including .js)	2018-04-25 10:51:19 +02:00
zmagod	4d6e995481	add dismiss buttons back	2018-04-25 10:43:16 +02:00
zmagod	c026044322	fixes flash message [fixes SCI-2142]	2018-04-25 07:32:49 +02:00
zmagod	796e7c9822	sign_out user after 7 days [fixes SCI-2323]	2018-04-24 15:42:31 +02:00
zmagod	3a4df069d7	remove task description info from canvas task card [fixes SCI-2187]	2018-04-24 15:11:48 +02:00
zmagod	7d26ce561c	parse smart annotations in repository export [fixes SCI-2310]	2018-04-24 14:53:49 +02:00
zmagod	c2d19fee52	fixes images preview in repository/library [fixes SCI-2321]	2018-04-24 13:11:55 +02:00
Zmago Devetak	1e4a975304	Merge pull request #1113 from ZmagoD/zd_SCI_2307_v2 rename smart annotations icons [fixes SCI-2307]	2018-04-24 10:11:30 +02:00
zmagod	503ad1ba20	removes samples from views [fixes SCI-2304]	2018-04-24 08:26:55 +02:00
Zmago Devetak	096167c125	Merge pull request #1101 from ZmagoD/zd_SCI_2124 adds new reports index page [fixes SCI-2124]	2018-04-23 12:42:24 +02:00
zmagod	efd1e470f6	rename smart annotations icons [fixes SCI-2307]	2018-04-23 12:38:54 +02:00
zmagod	199a2a23bf	fixes per @mlorb 's request	2018-04-23 12:26:21 +02:00
zmagod	824962c084	propagate assigned repository items in workflow [fixes SCI-2261]	2018-04-23 11:33:16 +02:00
Luka Murn	c0da83c5de	Add some additional nil guards	2018-04-20 12:31:22 +02:00
Luka Murn	d023db16af	Update the destroy_column action so it properly updates all states	2018-04-20 12:31:22 +02:00
Luka Murn	caab0cf55c	Update the ordering upon table load	2018-04-20 12:31:22 +02:00
Luka Murn	21e7e7057e	Refactor all the methods into two new services	2018-04-20 12:31:22 +02:00
Luka Murn	d8ca42aa0c	Refactor repository_table_state and its class methods	2018-04-20 12:31:22 +02:00
Luka Murn	5e2622ecfc	Change default repository state to Ruby representation Also remove some dead code from repositories datatables	2018-04-20 12:31:22 +02:00
zmagod	e96b690a5b	removes reports link from secondary navigation, fix bug with turbolinks	2018-04-20 11:57:52 +02:00
Zmago Devetak	645e9a19d8	Merge pull request #1108 from ZmagoD/zd_SCI_2313 fix file preview [SCI-2313]	2018-04-20 10:38:23 +02:00
Zmago Devetak	76c4202664	Merge pull request #1110 from ZmagoD/zd_SCI_2311 fixes controller action in manage_columns	2018-04-20 10:36:31 +02:00
zmagod	dafa29d4bf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124	2018-04-20 10:33:15 +02:00
Zmago Devetak	e94f1ad6aa	Merge pull request #1109 from ZmagoD/zd_SCI_2297_v3 add permission to column management [fixes SCI-2297]	2018-04-20 09:57:30 +02:00
zmagod	74f23ee461	fixes controller action in manage_columns	2018-04-20 09:53:15 +02:00
mlorb	3249d5db0d	Merge pull request #1100 from mlorb/ml-sci-2303 Update reports show page to work with new navigation [SCI-2303]	2018-04-20 09:50:35 +02:00
zmagod	078645332b	add permission to column management [fixes SCI-2297]	2018-04-20 09:34:12 +02:00
zmagod	2a5c4daa9d	fix file preview [SCI-2313]	2018-04-20 09:29:08 +02:00
Zmago Devetak	487fb1fb48	Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2 Zd sci 2239 v2	2018-04-19 18:00:19 +02:00
mlorb	ab4a66756e	Merge pull request #1107 from mlorb/ml-sci-2314 Fix file preview background [SCI-2314]	2018-04-19 17:59:01 +02:00
Zmago Devetak	6b4d786acc	Merge pull request #1105 from ZmagoD/zd_SCI_2307 change repository icon	2018-04-19 17:58:48 +02:00
mlorb	72c79013de	fix file preview background	2018-04-19 17:40:24 +02:00
Zmago Devetak	93fc1af12d	Merge pull request #1083 from ZmagoD/zd_SCI_2259 set limit on maximum number of dropdown list items [fixes SCI-2259]	2018-04-19 17:17:54 +02:00
Zmago Devetak	1290435372	Merge pull request #1086 from ZmagoD/zd_SCI_2207 enables copying of repository items [fixes SCI-2207]	2018-04-19 17:13:43 +02:00
mlorb	ea4d3f815b	add back needed code	2018-04-19 16:51:37 +02:00
mlorb	d7eccac289	Merge pull request #1099 from mlorb/ml-sci-2167 Remove breadcrumbs throughout application [SCI-2167]	2018-04-19 16:11:37 +02:00
zmagod	a948710576	fixes alert label [fixes SCI-2239]	2018-04-19 15:51:36 +02:00
zmagod	bb3e1b4dcf	change repository icon	2018-04-19 15:39:24 +02:00
zmagod	f555e8cea4	fix error message	2018-04-19 15:32:14 +02:00
mlorb	8753df7ce3	Merge pull request #1103 from mlorb/ml-sci-2309 Fix top navigation style [SCI-2309]	2018-04-19 15:16:27 +02:00
mlorb	50a4ae6163	Merge pull request #1104 from mlorb/ml-sci-2312 Fix blocked buttons edit and eye icon [SCI-2312]	2018-04-19 15:15:25 +02:00
mlorb	c149b3cc2a	refactoring	2018-04-19 15:12:26 +02:00
mlorb	5f93da27f2	Merge pull request #1102 from mlorb/ml-sci-2308 Fix screen responsiveness [SCI-2308]	2018-04-19 14:55:49 +02:00
mlorb	56e00740c1	fix blocked buttons edit and eye icon	2018-04-19 14:40:46 +02:00
mlorb	58bdce557d	Merge pull request #1098 from mlorb/ml-sci-2306 Fix project navigation to work with archived pages and… [SCI-2306]	2018-04-19 14:17:32 +02:00
Zmago Devetak	540dff25e7	Merge pull request #1091 from ZmagoD/zd_SCI_2254 adds correct preview images to files [fixes SCI-2254]	2018-04-19 14:04:24 +02:00
zmagod	ce52eb851b	add validation to dropdown items	2018-04-19 14:02:42 +02:00
mlorb	c1832969b4	fix top navigation style	2018-04-19 13:26:10 +02:00
zmagod	f3af8f4524	switch current_team to repository.team	2018-04-19 13:04:16 +02:00
zmagod	66cc76f640	add view label in locales	2018-04-19 12:49:32 +02:00
zmagod	c23eacfe13	fixes for_admin action/ test visible_by functlion	2018-04-19 12:41:00 +02:00
mlorb	4f0c2a8122	fix screen responsiveness	2018-04-18 17:06:47 +02:00
zmagod	9d282d1800	adds new reports index page [fixes SCI-2124]	2018-04-18 16:47:52 +02:00
mlorb	57f09029f5	return needed code	2018-04-18 16:22:36 +02:00
mlorb	cc34376253	update reports show page to work with new navigation	2018-04-18 14:40:53 +02:00
mlorb	c08d72be36	remove breadcrumbs throughout application	2018-04-17 17:00:04 +02:00
mlorb	600ec99c82	fix project navigation to work with archived pages and correct current team	2018-04-17 13:52:43 +02:00
mlorb	04a20ab7ec	change links	2018-04-16 17:05:22 +02:00
Zmago Devetak	f90589d714	Merge pull request #1095 from ZmagoD/zd_SCI_2300 fixes archive button [fixes SCI-2300]	2018-04-16 16:19:21 +02:00
Zmago Devetak	a0f549e935	Merge pull request #1093 from ZmagoD/zd_SCI_2296 hides the create new inventory button for non admin users [fixes SCI-…	2018-04-16 16:18:15 +02:00
Zmago Devetak	8803a7ca15	Merge pull request #1092 from ZmagoD/zd_SCI_2297 adds edit repository item permission to normal user [fixes SCI-2297]	2018-04-16 16:18:05 +02:00
mlorb	dceef349a4	fix bug and some refectoring	2018-04-16 14:10:49 +02:00
zmagod	9baaad25b6	add current_user to cloned created_by, last_modified_by field	2018-04-16 12:38:25 +02:00
zmagod	a2d8285f35	fixes archive button but [fixes SCI-2300]	2018-04-16 09:22:10 +02:00
mlorb	2627efe402	implement file column type when editing & creating new rows in inventories DataTables	2018-04-13 17:21:17 +02:00
zmagod	bef166ff30	hides the create new inventory button for non admin users [fixes SCI-2296]	2018-04-13 13:39:58 +02:00
zmagod	0adc06b1a1	adds edit repository item permission to normal user [fixes SCI-2297]	2018-04-13 13:11:29 +02:00
zmagod	4f21833373	changes per @duco 's request	2018-04-13 11:47:33 +02:00
Zmago Devetak	0815111cae	Merge pull request #1090 from ZmagoD/zd_SCI_2293 fixes edin/destory button on repository page after redirected from co…	2018-04-13 09:58:01 +02:00
zmagod	9812a9f160	adds correct preview images to files [fixes SCI-2254]	2018-04-13 09:43:14 +02:00
Zmago Devetak	f5127bad99	Merge pull request #1088 from ZmagoD/zd_SCI_2290 remove catched views [fixes SCI-2290]	2018-04-13 08:24:28 +02:00
zmagod	f2c314cc85	fix indentation	2018-04-12 17:12:45 +02:00
zmagod	3c5ce09bcd	fixes edin/destory button on repository page after redirected from columns_management page [fixes SCI-2293]	2018-04-12 17:09:53 +02:00
Zmago Devetak	478115bbb0	Merge pull request #1082 from ZmagoD/zd_SCI_2257 refactor update protocol keywords action [fixes SCI-2257]	2018-04-12 16:52:04 +02:00
zmagod	d084998906	remove unneeded label in destroy repository record modal [fixes SCI-2292]	2018-04-12 15:00:41 +02:00
zmagod	5f5829bbe4	fix indentation	2018-04-12 14:49:51 +02:00
zmagod	123f3b796b	remove catched views [fixes SCI-2290]	2018-04-12 14:48:14 +02:00
Luka Murn	fa603b54b8	Merge pull request #930 from okriuchykhin/ok_SCI_1860 Remove tutorial [SCI-1860]	2018-04-12 14:46:20 +02:00
Luka Murn	09c60d2468	Fixes per @Ducz0r's request	2018-04-12 14:38:22 +02:00
zmagod	b4deb232c0	rename variable: not_in_repository => display_image_tag	2018-04-12 13:40:17 +02:00
Luka Murn	9bf8b5d864	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml	2018-04-12 13:16:46 +02:00
zmagod	6291857bbf	enables copying of repository items [fixes SCI-2207]	2018-04-11 17:17:19 +02:00
zmagod	23653d1d95	refactor	2018-04-11 09:29:08 +02:00
zmagod	233e73c709	adds asset preview link to repository row modal and to table row item [fixes SCI-2110]	2018-04-10 17:06:53 +02:00
zmagod	e4b49e62a3	fixes import limit	2018-04-10 15:45:51 +02:00
zmagod	ea4bd8831f	fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]	2018-04-10 13:19:53 +02:00
Zmago Devetak	eca69cfc75	Merge pull request #1080 from ZmagoD/zd_SCI_2076 add asset field preview/sort/search in repository table [fixes SCI-2076]	2018-04-09 14:29:45 +02:00
mlorb	a10f671184	Merge pull request #1081 from mlorb/ml-sci-2123 Refactor settings into the new navigation bar [SCI-2123]	2018-04-09 13:21:16 +02:00
zmagod	b12f6f1b92	set limit on maximum number of dropdown list items [fixes SCI-2259]	2018-04-09 12:50:25 +02:00
mlorb	8a35ce5c58	add locales	2018-04-09 10:53:03 +02:00
mlorb	80fe1dd73b	fix travis	2018-04-06 17:16:04 +02:00
Zmago Devetak	bdb6554870	Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219 adds manage columns page	2018-04-06 17:06:28 +02:00
zmagod	58b6eb908e	fix duplications	2018-04-06 17:02:10 +02:00
zmagod	024032faff	refactor update protocol keywords action [fixes SCI-2257]	2018-04-06 15:41:50 +02:00
mlorb	70dfe66b2d	refactoring	2018-04-06 14:20:40 +02:00
zmagod	cf7761daaa	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223	2018-04-06 12:56:39 +02:00
zmagod	b51ad84ee5	add asset field preview/sort/search in repository table [fixes SCI-2076]	2018-04-06 12:03:39 +02:00
Zmago Devetak	e30b2261a8	Merge pull request #1077 from ZmagoD/zd_SCI_2279 fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]	2018-04-05 16:52:16 +02:00
Zmago Devetak	71531ebf12	refactor	2018-04-05 16:46:09 +02:00
mlorb	b8e91e91a1	refactor settings into the new navigation bar	2018-04-05 16:30:02 +02:00
Zmago Devetak	cafe042494	Merge pull request #1079 from ZmagoD/zd_SCI_2282 fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]	2018-04-05 16:12:23 +02:00
zmagod	218f421dff	fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]	2018-04-05 15:31:25 +02:00
Luka Murn	386ede0400	Add special middleware for handling of Rails 5.1 WOPI errors Closes SCI-2266.	2018-04-05 13:26:08 +02:00
zmagod	c0cc6c293a	fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]	2018-04-05 13:15:32 +02:00
zmagod	030ce271be	fixes name validations	2018-04-05 10:47:47 +02:00
zmagod	515c95061c	fixes delete column action	2018-04-05 09:56:09 +02:00
zmagod	afc2a35557	move import export to dropdown	2018-04-05 09:32:34 +02:00
zmagod	a8a19df06d	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219	2018-04-05 08:51:58 +02:00
zmagod	d47337fbf3	remove destroy column modal	2018-04-05 08:51:21 +02:00
okriuchykhin	e608d629c7	Merge pull request #1068 from okriuchykhin/ok_SCI_2217 Refactor file preview modal [SCI-2217]	2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin	9720063fb3	Fix tests [SCI-2217]	2018-04-05 00:06:11 +02:00
zmagod	525a1c15ca	fixes hound	2018-04-04 16:40:07 +02:00
mlorb	58433f4218	fix merge bananas	2018-04-04 16:36:26 +02:00
zmagod	0c05c60ebf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219	2018-04-04 16:06:38 +02:00
Zmago Devetak	ab48e4f527	Merge pull request #1072 from ZmagoD/zd_SCI_2239 change export model wording [fixes SCI-2239]	2018-04-04 15:40:18 +02:00
Zmago Devetak	d1f3a65279	Merge pull request #1073 from ZmagoD/zd_SCI_2206 add ID column to repository [fixes SCI-2206]	2018-04-04 15:39:59 +02:00
Zanz2	cff2f933a0	removed byebug :D	2018-04-04 15:19:00 +02:00
Zanz2	ec743a7420	fixed the issue	2018-04-04 15:16:31 +02:00
zmagod	6e255a4657	fixes failing specs	2018-04-04 14:44:32 +02:00
Oleksii Kriuchykhin	3b7977ee3b	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin	8ee98b7cf0	Update Capybara and dependencies [SCI-2217]	2018-04-04 14:13:37 +02:00
zmagod	5eb007f4d2	fixes per @mlorb 's request	2018-04-04 13:22:14 +02:00
zmagod	38b84edfb0	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-04-04 12:59:41 +02:00
zmagod	e630d3113f	add ID column to repository [fixes SCI-2206]	2018-04-04 11:55:11 +02:00
Zanz2	4259fa44f9	Merge pull request #1069 from Zanz2/remotipart_workaround Remotipart workaround [SCI-2270]	2018-04-04 11:27:30 +02:00
Zanz2	7f36ab3e5e	deleted require and gemfile entry for remotipart	2018-04-04 11:12:39 +02:00
Zmago Devetak	685255afbc	Merge pull request #1065 from ZmagoD/zd_SCI_2222 refactor smart annotation parser, adds repository item to smart annot…	2018-04-04 11:07:29 +02:00
zmagod	8a156ad91e	change method name	2018-04-03 13:05:25 +02:00
mlorb	11c0f5e5a1	Merge pull request #1067 from mlorb/ml-sci-2243 Style Guide - refactor colors, typography and buttons [SCI-2243]	2018-04-03 11:30:02 +02:00
zmagod	3d5137b56f	change export model wording [fixes SCI-2239]	2018-04-03 11:22:23 +02:00
mlorb	e5e92eb215	fix the rest of the constants	2018-04-03 10:28:39 +02:00
zmagod	7dfec94ffc	remove samples from smart annotations	2018-04-03 09:43:12 +02:00
Oleksii Kriuchykhin	d8d2d75631	Fix repository rows permissions [SCI-2265]	2018-04-02 20:48:44 +02:00
Oleksii Kriuchykhin	51860652c1	Refactor smart annotations modal [SCI-2223]	2018-04-02 20:38:56 +02:00
Zanz2	2fab3e4caa	Overlooked a small change #2	2018-04-02 20:05:06 +02:00
Zanz2	25619e5e01	Overlooked a small change	2018-04-02 20:02:59 +02:00
Zanz2	1606982966	found a hackish fix by doing a manual ajax call and some other things with jquery	2018-04-02 19:56:25 +02:00
Oleksii Kriuchykhin	b7c31d704f	Merge branch 'zd_SCI_2222' of git://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_2222	2018-04-01 11:10:18 +02:00
mlorb	6a20c37449	fix travis againnnnn	2018-03-30 17:16:18 +02:00
Oleksii Kriuchykhin	f656ad1561	Fix fa icons [SCI-2217]	2018-03-30 17:03:44 +02:00
mlorb	5f0d33d75e	fix travis again	2018-03-30 16:47:23 +02:00
Zmago Devetak	f5f6fa4a4f	Merge pull request #1066 from ZmagoD/zd_SCI_2235 updated repository import modal html [fixes SCI-2235]	2018-03-30 14:32:53 +02:00
okriuchykhin	a6d45fea0a	Merge pull request #1059 from okriuchykhin/ok_SCI_2205 Add repository name to record info modal [SCI-2205]	2018-03-30 14:02:53 +02:00
Oleksii Kriuchykhin	cc855cda86	Fix translations [SCI-2205]	2018-03-30 12:48:34 +02:00
okriuchykhin	5e0cf58bc5	Merge pull request #1058 from okriuchykhin/ok_SCI_2111 Implement search in file repository cells and improve performance [SCI-2111]	2018-03-30 12:39:47 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
mlorb	10b5e1de84	refactor typography	2018-03-30 09:54:57 +02:00
zmagod	802e917e69	updated repository import modal html [fixes SCI-2235]	2018-03-30 09:47:27 +02:00
zmagod	fd88104fe2	adds manage repository link in repository actions dropdown	2018-03-29 17:10:57 +02:00
zmagod	56b0900619	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219	2018-03-29 16:42:10 +02:00
zmagod	01a548e8b3	fix hound	2018-03-29 16:11:21 +02:00
zmagod	659a088058	refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]	2018-03-29 15:55:26 +02:00
mlorb	4bf9369bc5	refactor buttons	2018-03-29 13:58:14 +02:00
okriuchykhin	31c68ab4bc	Merge pull request #1062 from okriuchykhin/ok_SCI_2201 Rescale Linkedin buttons [SCI-2201]	2018-03-28 15:23:05 +02:00
zmagod	7c1390ece2	implement sidebar toggle [fixes SCI-2232]	2018-03-28 14:12:11 +02:00
mlorb	22afa61b11	refactor colors	2018-03-28 13:54:01 +02:00
Luka Murn	c07dc98cc8	Fix Office Online editing of files [SCI-2264] Office Online files could not be edited. I believe the reason was that in Rails 5.1, `render nothing: true` was removed. So I replaced this in `wopi_controller` with `render body: nil`. Hopefully this will do the trick. Closes SCI-2264.	2018-03-28 13:22:30 +02:00
okriuchykhin	13fed0411b	Merge pull request #1063 from biosistemika/release-1.12.11 merge release 1.12.11 branch to master	2018-03-27 16:19:57 +02:00
Oleksii Kriuchykhin	1ed0b16d12	Rescale Linkedin buttons [SCI-2201]	2018-03-27 15:00:28 +02:00
Oleksii Kriuchykhin	31aed55ffc	Disable turbolinks on tasks navigation [SCI-2251]	2018-03-26 17:55:51 +02:00
okriuchykhin	145f49de2d	Revert "Update turbolinks and fix repository table init [SCI-2251]"	2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin	fac5875cfd	Add repository name to record info modal [SCI-2205]	2018-03-26 16:18:09 +02:00
okriuchykhin	784a4723cc	Merge pull request #1056 from okriuchykhin/ok_SCI_2251 Update turbolinks and fix repository table init [SCI-2251]	2018-03-26 14:23:30 +02:00
okriuchykhin	fc06f8c60b	Merge pull request #1055 from okriuchykhin/ok_SCI_2250 Skip asset if file is missing in protocol export [SCI-2250]	2018-03-26 14:19:49 +02:00
Oleksii Kriuchykhin	5dc01a3d42	Fix code style [SCI-2251]	2018-03-26 13:59:45 +02:00
Oleksii Kriuchykhin	07070df1b4	Fix users profile edit form [SCI-2251]	2018-03-26 13:47:12 +02:00
okriuchykhin	b1fcdb7474	Merge pull request #1057 from okriuchykhin/ok_SCI_2249 Fix sample assign permissions [SCI-2249]	2018-03-26 13:24:38 +02:00
Oleksii Kriuchykhin	e42fc3117b	Implement search in file repository cells and improve performance [SCI-2111]	2018-03-26 13:19:09 +02:00
zmagod	8f09e1f7a4	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-03-26 13:08:31 +02:00
Zmago Devetak	2310439088	Merge pull request #1045 from ZmagoD/zd_SCI_2197 fixes import protocol bug for guest user [fixes SCI-2197]	2018-03-26 13:08:01 +02:00
zmagod	c61efb0624	rename before_acton hook	2018-03-26 13:07:00 +02:00
mlorb	b7a14215bc	Merge pull request #1050 from mlorb/ml-sci-2120-v2 Refactor project navigation [SCI-2120]	2018-03-26 12:56:19 +02:00
mlorb	0092be08cc	refactor links	2018-03-26 12:11:59 +02:00
zmagod	3efe06a410	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-03-26 12:02:24 +02:00
zmagod	9e1f285c9e	adds missing labels [fixes SCI-2219]	2018-03-26 11:28:14 +02:00
mlorb	1797afa718	Merge branch 'ux-release-1' into ml-sci-2238	2018-03-26 10:44:43 +02:00
mlorb	70e0d8bd1d	Merge pull request #1052 from mlorb/ml-sci-2125 Implement new Help dropup in navigation [SCI-2125]	2018-03-26 09:22:39 +02:00
Oleksii Kriuchykhin	aa69624f9f	Fix sample assign permissions [SCI-2249]	2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin	83c7539156	Update turbolinks and fix repository table init [SCI-2251]	2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin	ecd3c73772	Skip asset if file is missing in protocol export [SCI-2250]	2018-03-25 13:36:24 +02:00
mlorb	83741358d1	fix locales	2018-03-23 16:19:06 +01:00
zmagod	baf69461f5	adds edit/create modal and related actions	2018-03-23 16:00:33 +01:00
mlorb	eee597b315	fix naming	2018-03-23 15:56:38 +01:00
mlorb	2e81359ebb	re-implement About sciNote modal	2018-03-23 15:14:49 +01:00
mlorb	5589b27883	improve message for deleting sample/report items	2018-03-23 14:39:09 +01:00
mlorb	9aa87a17e5	remove help helper	2018-03-23 14:26:53 +01:00
mlorb	faaecec2ff	implement new Help dropup in navigation	2018-03-23 14:08:27 +01:00
mlorb	bc06542ed7	refactor project navigation	2018-03-22 11:41:33 +01:00
zmagod	3be3c00574	adds manage columns page [fixes SCI-2218]	2018-03-22 09:35:36 +01:00
Oleksii Kriuchykhin	36302ad6e8	Refactor existing columns management to control only Column visibility and order [SCI-2220]	2018-03-21 16:56:36 +01:00
zmagod	81df97f008	add library sidebar and create new library button [fixes SCI-2121]	2018-03-21 09:22:55 +01:00
zmagod	62858bc14f	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-03-20 14:46:11 +01:00
zmagod	1ad8c259d1	add blank page for repositories [fixes SCI-2139]	2018-03-20 14:45:57 +01:00
mlorb	35afc06cbd	Merge pull request #1038 from mlorb/ml-sci-2118 Code left-side menu bar [SCI-2118]	2018-03-20 14:40:55 +01:00
Zmago Devetak	75d7ace8c7	Merge pull request #1017 from ZmagoD/zd_SCI_2068 Write server-side endpoints for custom repositories [SCI-2068]	2018-03-20 14:30:47 +01:00
mlorb	9cf9bf94c0	fix merge conflict	2018-03-20 14:30:07 +01:00
mlorb	884eef9d07	Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118	2018-03-20 14:25:59 +01:00
mlorb	e0926ddc3c	code refactoring	2018-03-20 13:53:11 +01:00
okriuchykhin	5b1951e01e	Merge pull request #1044 from okriuchykhin/ok_SCI_2117 Remove Power Up button [SCI-2117]	2018-03-20 09:53:17 +01:00
zmagod	064bd88584	fix assigned query	2018-03-19 17:49:09 +01:00
okriuchykhin	d906baff61	Merge pull request #1039 from okriuchykhin/ok_SCI_1697 Improve connections between repository models [SCI-1697]	2018-03-19 16:42:55 +01:00
Zmago Devetak	8349b08575	Merge pull request #1012 from ZmagoD/zd_SCI_2024_fix_custom_repositores_import Fix custom repositories import so it supports "list of values" custom column types [fixes SCI-2024]	2018-03-19 16:41:11 +01:00
okriuchykhin	2356b78044	Merge pull request #1042 from okriuchykhin/ok_SCI_2201 Use larger LinkedIn sign-in button [SCI-2201]	2018-03-19 16:23:22 +01:00
zmagod	c46da5cc67	fixes import protocol bug for guest user [fixes SCI-2197]	2018-03-19 16:10:28 +01:00
Oleksii Kriuchykhin	acbd40e0d1	Remove Power Up button [SCI-2117]	2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin	a105e61d48	Remove tutorial [SCI-1860]	2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin	37f675b32a	Use larger LinkedIn sign-in button [SCI-2201]	2018-03-18 12:18:33 +01:00
zmagod	3131ed0948	adds permission check to archived project actions dropdown [fixes SCI-2194]	2018-03-16 17:30:49 +01:00
zmagod	a9dfcd9681	refactor	2018-03-16 16:38:59 +01:00
zmagod	311b2dac5a	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142	2018-03-16 16:21:47 +01:00
zmagod	86a8afd907	refactor	2018-03-16 15:56:12 +01:00
zmagod	ee03115361	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095	2018-03-16 15:32:40 +01:00
Oleksii Kriuchykhin	9371d77762	Improve connections between repository models [SCI-1697]	2018-03-16 13:12:33 +01:00
zmagod	fad4001273	fix edit row action	2018-03-16 12:27:19 +01:00
Oleksii Kriuchykhin	27a605d974	Fix failing test [SCI-2148][SCI-2149]	2018-03-16 11:05:38 +01:00
zmagod	1cdba5e0d3	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068	2018-03-16 11:05:16 +01:00
zmagod	c2eb6d6900	fixes hound adds specs to repository_list_items controller	2018-03-16 10:53:05 +01:00
Oleksii Kriuchykhin	f3385adb06	Merge branch 'master' into ok_SCI_2148	2018-03-16 10:21:02 +01:00
zmagod	d69754af04	implement search on list items dropdown, update, create actions [fixes SCI-2070]	2018-03-15 15:43:16 +01:00
mlorb	9fd845c478	fix failing cucumber tests	2018-03-14 17:55:04 +01:00
mlorb	9de998e85c	code left-side menu bar	2018-03-14 14:33:34 +01:00
Zanz2	bf34d82791	refactored to PR	2018-03-13 17:42:26 +01:00
zmagod	a6a25bbe08	add floating alert message	2018-03-13 16:33:48 +01:00
zmagod	b67a54e2d1	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import	2018-03-13 15:25:57 +01:00
Zmago Devetak	f778415321	Merge pull request #1014 from ZmagoD/zd_SCI_2025 Fix custom repositories export so it supports "list of values" custom column types [fixes SCI-2025]	2018-03-13 15:20:46 +01:00
Zmago Devetak	d7679dcb99	Merge pull request #1032 from ZmagoD/zd_SCI_2141 refactor global activities in separate page [fixes SCI-2141]	2018-03-13 15:20:14 +01:00
zmagod	5b56f3dbd6	fix hound	2018-03-13 14:47:35 +01:00
okriuchykhin	503617b42c	Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025	2018-03-13 14:44:20 +01:00
okriuchykhin	f14931f6a8	Update with latest changes on branch	2018-03-13 14:37:12 +01:00
zmagod	dd2f7dd417	Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration	2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin	269f7d74fa	Add explicit ordering to samples_tables [SCI-2148][SCI-2149]	2018-03-13 13:16:34 +01:00
okriuchykhin	262c21d145	Merge pull request #1036 from okriuchykhin/ok_SCI_2078 Implement importable selector for repository columns [SCI-2078]	2018-03-13 13:14:53 +01:00
okriuchykhin	dfb0d923b5	Merge pull request #1030 from okriuchykhin/ok_SCI_2016 Add annotations migrations and optimize queries [SCI-2016]	2018-03-13 13:07:31 +01:00
Oleksii Kriuchykhin	be1ead22e0	Implement importable selector for repository columns [SCI-2078]	2018-03-13 11:36:05 +01:00
zmagod	51af74071c	remove comments and activity modal	2018-03-13 10:52:53 +01:00
Oleksii Kriuchykhin	21c07371c9	Fix repository export to support file columns [SCI-2079]	2018-03-13 10:40:27 +01:00
Oleksii Kriuchykhin	f5ecbecaf3	Fix bugs [SCI-1849]	2018-03-12 17:00:44 +01:00
zmagod	8fe173e831	re-structure top navigation bar	2018-03-12 16:27:35 +01:00
mlorb	3b9ad2f86f	Merge pull request #1028 from mlorb/ml-sci-2144 Add file custom column type to db [SCI-2144]	2018-03-12 15:18:02 +01:00
zmagod	e218cae453	refactor global activities in separate page [fixes SCI-2141]	2018-03-12 11:01:23 +01:00
mlorb	34f5c2c7ac	fix validation in asset model and change formatted method in repository_asset_value model	2018-03-12 10:50:45 +01:00
Oleksii Kriuchykhin	60e3a836be	Fix typo in regex [SCI-1849]	2018-03-11 22:11:12 +01:00
Oleksii Kriuchykhin	ac009a29cb	Add annotations migrations and optimize queries [SCI-2016]	2018-03-11 22:06:44 +01:00
Zanz2	97c01c386b	pushing fix	2018-03-10 22:48:25 +01:00
Zmago Devetak	d50bc5fde9	Merge pull request #998 from ZmagoD/zd_SCI_2014 migration script for migrating samples -> custom repositories [SCI-2014]	2018-03-09 17:19:12 +01:00
okriuchykhin	e0834a57cf	Merge pull request #1027 from okriuchykhin/ok_SCI_2163 Hide delete button for guest users in repository [SCI-2163]	2018-03-09 17:16:58 +01:00
mlorb	64e26e1c60	add file custom column type to db	2018-03-09 17:04:54 +01:00
okriuchykhin	707d2a048f	Merge pull request #1024 from okriuchykhin/ok_SCI_2145 Fix sample record creation [SCI-2145]	2018-03-09 16:52:38 +01:00
okriuchykhin	7cbfa5936a	Merge pull request #1026 from okriuchykhin/ok_SCI_2148 Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]	2018-03-09 16:42:33 +01:00
Oleksii Kriuchykhin	853e1f7657	Fix nil case [SCI-2145]	2018-03-09 16:41:23 +01:00
Oleksii Kriuchykhin	cd9260f439	Hide delete button for guest users in repository [SCI-2163]	2018-03-09 16:19:36 +01:00
zmagod	22eb4121f0	follow @okriuchykhin 's suggestions	2018-03-09 15:44:42 +01:00
Oleksii Kriuchykhin	e4d974aa58	Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]	2018-03-09 15:34:06 +01:00
zmagod	0baa7a1f99	fix hound	2018-03-09 14:43:12 +01:00
zmagod	4f951f6679	adds unit specs for datatable service [fixes SCI-2068]	2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin	940469e41b	Fix user management on project [SCI-2146]	2018-03-09 12:08:34 +01:00
Oleksii Kriuchykhin	804d313f90	Fix sample record creation [SCI-2145]	2018-03-09 11:52:28 +01:00
Oleksii Kriuchykhin	1765d83cd1	Refactor search to support repository list items [SCI-2108]	2018-03-09 11:05:43 +01:00
okriuchykhin	160935cde0	Merge pull request #1022 from okriuchykhin/ok_SCI_2136 Fix manage repository permissions [SCI-2136]	2018-03-09 10:15:24 +01:00
okriuchykhin	d0d5481a29	Merge pull request #1021 from okriuchykhin/ok_SCI_2131 Fix notification for user removal from a team [SCI-2131]	2018-03-09 10:15:09 +01:00
zmagod	26883af386	fix assigned ordering	2018-03-08 17:36:10 +01:00
okriuchykhin	a306e65093	Merge pull request #1016 from okriuchykhin/ok_SCI_2130 Fix edit project's users modal [SCI-2130]	2018-03-07 14:04:26 +01:00
Oleksii Kriuchykhin	bd9f5c1cda	Fix manage repository permissions [SCI-2136]	2018-03-07 13:41:57 +01:00
Oleksii Kriuchykhin	1082f7f93c	Fix notification for user removal from a team [SCI-2131]	2018-03-07 13:20:17 +01:00
okriuchykhin	cae726f5c3	Merge pull request #1020 from okriuchykhin/ok_SCI_2055 Fix invite users link on task card [SCI-2055]	2018-03-07 09:41:23 +01:00
okriuchykhin	c0cfa6e7fe	Merge pull request #1019 from okriuchykhin/ok_SCI_2134 Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]	2018-03-06 18:10:05 +01:00
Oleksii Kriuchykhin	186780e68f	Fix invite users link on task card [SCI-2055]	2018-03-06 17:56:01 +01:00
Oleksii Kriuchykhin	156a639e4c	Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]	2018-03-06 17:36:40 +01:00
Oleksii Kriuchykhin	b5eb821cfa	Fix sample's custom column permissions [SCI-2135]	2018-03-06 16:40:25 +01:00
zmagod	fb66131e29	setup endpoint for repository_rows paging/search	2018-03-06 16:32:39 +01:00
Oleksii Kriuchykhin	ca66858063	Fix edit project's users modal [SCI-2130]	2018-03-06 15:49:30 +01:00
Oleksii Kriuchykhin	c933030b94	Add team export/import scripts [SCI-1849]	2018-03-06 11:26:30 +01:00
mz3944	bb21f6543c	Merge pull request #1004 from mz3944/mz-SCI-2011 Wrapping up the permissions [SCI-2011]	2018-03-06 07:10:40 +01:00
Matej Zrimšek	c5b0a6525b	Some additional permission calls fixes, minor refactoring.	2018-03-06 06:56:35 +01:00
Zanz2	8f5dd3df38	Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818 Table missing scrollbar [SCI-1818]	2018-03-05 17:13:06 +01:00
Zanz2	1e6f1acef5	fixed according to pr	2018-03-05 17:02:37 +01:00
Zanz2	451d14c2e9	Added 4 to constants too, then fixed line too long error	2018-03-05 16:48:18 +01:00
Zanz2	c5728c4018	Merge branch 'master' into null_step_crash_sci2043	2018-03-05 16:37:24 +01:00
Zanz2	e3e7514049	removed redundant return	2018-03-05 16:15:33 +01:00
Zanz2	554b31e0aa	Added constants	2018-03-05 16:09:06 +01:00
Zanz2	bd19c89212	Merge pull request #1013 from Zanz2/step_reorder_fix quick fix for if previous guid is unknown format [Protocols.io import]	2018-03-05 15:59:46 +01:00
zmagod	fca01bd54f	refactor repository export [fixes SCI-2025]	2018-03-05 15:54:04 +01:00
mlorb	5e44859ce0	Merge pull request #1010 from mlorb/ml-sci-1826 Sign up with linkedIn account [SCI-1826]	2018-03-05 13:24:36 +01:00
mlorb	a19b672a83	change validation again	2018-03-05 13:12:44 +01:00
Zmago Devetak	50ccec5007	Merge pull request #1009 from ZmagoD/zd_SCI_2066 add info modal for repository items [fixes SCI-2066]	2018-03-05 12:49:29 +01:00
Matej Zrimšek	61d1f5374d	Additionaly removed some unneeded code, related to the previous commit.	2018-03-04 15:24:43 +01:00
Matej Zrimšek	fa7710fb80	Forgot to remove unneeded code form permissions after the previous refactoring.	2018-03-04 15:17:46 +01:00
Matej Zrimšek	53f75f3cd6	Minor permissions and their calls refactoring and fixing.	2018-03-04 14:49:41 +01:00
Matej Zrimšek	5724f8ed4d	Minor permissions refactoring, including putting the same checks for multiple permissions before the specific ones, hence preventing further evaluation if those permissions are not met.	2018-03-04 14:19:17 +01:00
mz3944	c04a153652	Merge pull request #1005 from mz3944/mz-SCI-2064 At adding file to task, cancel button does not respond [SCI-2064]	2018-03-04 13:34:50 +01:00
Zanz2	ba67446eee	quick fix for if previous guid is unknown format	2018-03-03 22:26:00 +01:00
Zanz2	5bcda7f6de	fixed pr	2018-03-02 23:02:35 +01:00
Zanz2	350f12bdbc	using dig method now	2018-03-02 22:29:51 +01:00
mlorb	d19ca7fbdc	change validation	2018-03-02 16:32:46 +01:00
zmagod	4642d049fa	fix hound	2018-03-02 14:16:31 +01:00
zmagod	2b55cd7090	rename variables	2018-03-02 14:14:27 +01:00
zmagod	0996745781	refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024]	2018-03-02 13:39:22 +01:00
mlorb	f5949e9d10	refactor	2018-03-01 17:52:24 +01:00
Luka Murn	070450f813	Merge branch 'release-1.12.11' Conflicts: config/initializers/extends.rb	2018-03-01 14:04:57 +01:00
zmagod	83ba412c48	remove unneeded comment	2018-03-01 11:51:39 +01:00
mlorb	08439e7f58	sign up with linkedIn account	2018-02-28 18:12:21 +01:00
zmagod	29a1073a50	refactor queries	2018-02-27 16:34:51 +01:00
zmagod	e3ca782996	add info modal for repository items [fixes SCI-2066]	2018-02-27 16:21:46 +01:00
zmagod	6908368506	refactor	2018-02-27 10:43:57 +01:00
zmagod	3aa28f6d11	assign repository row to task	2018-02-27 10:40:52 +01:00
zmagod	83db7ed01d	adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014]	2018-02-26 17:21:58 +01:00
Oleksii Kriuchykhin	aa933ad1f4	Add extendable file types mappings for icons [PIP-46]	2018-02-26 14:23:02 +01:00
Matej Zrimšek	96a6779d55	Fixed misspelled permission call.	2018-02-22 14:08:12 +01:00
Matej Zrimšek	ff9dff5c10	Fixed reports permissions check calls. Fixed Hound warnings.	2018-02-22 13:51:22 +01:00
Matej Zrimšek	1904099954	Put permissions helper methods inside utility module.	2018-02-21 20:22:13 +01:00
Zanz2	29aea1ebd2	refactored according to PR	2018-02-21 16:17:53 +01:00
mlorb	4d69636dbe	Merge pull request #1002 from mlorb/ml-sci-2031_v2 Fix bug with load older activities button not working [SCI-2031]	2018-02-20 13:19:20 +01:00
Zanz2	9c2a2956e3	Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818 Merging Biosis master with branch that resizes small tables to atleast 5x5	2018-02-19 17:40:13 +01:00
Matej Zrimšek	b8b9707c06	Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.	2018-02-19 14:51:14 +01:00
mlorb	d2dcb765b4	fix bug with load older activities button not working	2018-02-16 15:42:10 +01:00
Zanz2	5c93bd9676	Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom	2018-02-16 14:14:51 +01:00
Zanz2	673901fb01	Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 Fixed tables getting cut when certain attributes are at max length [SCI-1834]	2018-02-16 12:52:51 +01:00
Matej Zrimšek	7b07e7b347	Fixed protocol in repository permissions, and refactored it a bit.	2018-02-16 12:04:11 +01:00
Matej Zrimšek	6ba226d514	Added missing '?' to the canaid permission calls that were missing it.	2018-02-16 11:12:30 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Matej Zrimšek	4fe669ca9a	Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions.	2018-02-16 10:53:22 +01:00
Zanz2	b9db39f87d	removing last commit	2018-02-16 00:00:53 +01:00
Zanz2	fab9180b7b	fixed small oversight	2018-02-15 23:40:09 +01:00
Zanz2	c963c948a1	Fixed main issue, bad step structure now gets fixed to empty template	2018-02-15 23:28:20 +01:00
Zanz2	95501eb046	saving work for later	2018-02-15 20:01:36 +01:00
zmagod	5922aa21a8	adds fetch_all_team_samples method/spec	2018-02-15 17:38:45 +01:00
zmagod	c53df21946	adds specs for sample_to_repository migration service	2018-02-15 16:56:38 +01:00
Zanz2	ad8f93b57f	Merge pull request #991 from Zanz2/missplaced_authors_sci1808 protocols io authors are now real authors, not user that added the protocol [SCI-1808]	2018-02-15 16:53:39 +01:00
mlorb	9797712561	Merge pull request #997 from mlorb/ml-sci-2045 Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]	2018-02-15 14:51:40 +01:00
Zmago Devetak	e0510ab448	Merge pull request #995 from ZmagoD/zd_SCI_2040 fixed bug with assigned repository items [fixes SCI-2040]	2018-02-15 13:05:30 +01:00
Zmago Devetak	0583979cf9	Merge pull request #993 from ZmagoD/zd_SCI_2039 fixes errors with form id duplicates [fixes SCI-2039]	2018-02-15 11:10:43 +01:00
zmagod	78e902f316	fixes few Hound alerts	2018-02-15 11:06:59 +01:00
zmagod	e0ac8e8f91	extract helper methods in service	2018-02-15 09:36:09 +01:00
Matej Zrimšek	ac5b65b121	Added some additional comments for checking if project is active in permissions.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	09c5e23adf	Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	d571ab2ed8	Fixed comments permissions for experiment level.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	6b1fee4d30	Added/joined repository record assignment to task with sample assignmment to task.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	f21c794a95	Fixed permission error when accessing samples page.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	4c87fb4a55	Fixed permission error when restoring task.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	946f516171	Fixed permission error when moving a freshly cloned task.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	68206cb591	Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling.	2018-02-14 14:39:08 +01:00
Matej Zrimšek	d55734e501	Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view.	2018-02-14 14:39:07 +01:00
Matej Zrimšek	d7108f5a35	Fixed Hound warnings.	2018-02-14 14:39:07 +01:00
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
Matej Zrimšek	879eda2d8f	Minor experiment level permissions refactoring.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	0706d16020	Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	1182ce5da1	Fixed experiment level permission checks in the controllers.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	7938c2e036	Minor code style changes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	c5b798017e	Minor Hound warning fixes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	d6e7ef465c	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
Matej Zrimšek	854333b0e6	Grouped permissions for experiment with canaid gem (WIP).	2018-02-14 14:19:00 +01:00
Matej Zrimšek	70fdae567c	Forgot to add check whether project is active for archive project permission. Added some additional comments for checking if project is active in permissions.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	c09ffa4043	Project permissions comments change.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d058c371d4	Readded project archive permission.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	900446557b	Fixed mistyped permission checker.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e36ec69ca9	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
Matej Zrimšek	93536afcd5	Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	13e9a2a132	Corrected some project level permissions; minor refactoring.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e5799ee6dc	Some permission fixes.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	a21343a819	Fixing and refactoring project permissions in controllers.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	279da20060	Fixed Hound warnings.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d423700e84	Used permissions where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
mlorb	8d0ac93c80	add check to start work on next task notification if recent changes notification is switched off	2018-02-13 11:01:45 +01:00
zmagod	18eab358c7	generate custom repository when user is created [fixes SCI-2020]	2018-02-13 10:44:50 +01:00
Zmago Devetak	027297d46a	Merge pull request #985 from ZmagoD/zd_SCI_2008 fixes bug with assets upload on task result page,	2018-02-12 11:40:44 +01:00
okriuchykhin	e7fb1bc716	Merge pull request #967 from okriuchykhin/ok_SCI_1966 Merge gilson-iot-rails4 to master [SCI-1966]	2018-02-12 11:02:17 +01:00
okriuchykhin	5a94b40d9c	Merge pull request #978 from okriuchykhin/ok_SCI_2003 Improve files handling in protocol cloning [SCI-2003]	2018-02-12 11:01:59 +01:00
Zmago Devetak	ccba5d3eb3	Merge pull request #992 from ZmagoD/zd_SCI_2015 setup models for repository list column [fixes SCI-2015]	2018-02-12 10:59:20 +01:00
zmagod	27b7aff3ea	fixed bug with assigned repository items [fixes SCI-2040]	2018-02-12 10:49:35 +01:00
zmagod	36595d33f4	fix name scope	2018-02-12 09:09:56 +01:00
zmagod	d12f8403e4	add reference to repository column	2018-02-12 09:05:41 +01:00
zmagod	ae99c92516	follow @okriuchykhin 's suggestions	2018-02-09 16:28:21 +01:00
zmagod	ace78cfb58	fixes errors with form id duplicates [fixes SCI-2039]	2018-02-09 14:54:16 +01:00
zmagod	557aeca049	refactor relations	2018-02-09 14:11:56 +01:00
zmagod	7c13c5a1f4	fixes typo, follows @okriuchykhin 's suggestions	2018-02-09 11:38:52 +01:00
Zanz2	128f15f984	Merge pull request #990 from Zanz2/code_formatting_sci1822 Commands in protocols io steps are now properly formatted like code [SCI-1822]	2018-02-08 08:52:44 +01:00
Zanz2	49a4d9cf23	Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar	2018-02-07 15:50:42 +01:00
zmagod	6b7ff11bcf	setup models for repository list column [fixes SCI-2015]	2018-02-07 15:28:28 +01:00
Zanz2	60aa1a0953	Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before	2018-02-07 15:12:03 +01:00
Zanz2	a6356d2420	Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines	2018-02-07 14:46:25 +01:00
Zmago Devetak	e400514020	Merge pull request #981 from ZmagoD/zd_SCI_2026 fixes bug with step table update [fixes SCI-2026]	2018-02-07 14:35:15 +01:00
Zmago Devetak	b33d09536e	Merge pull request #987 from ZmagoD/zd_SCI_2033 fixes user dropdown [fixes SCI-2033]	2018-02-07 14:34:37 +01:00
Zanz2	efaf5ad721	Commands now get styled like code	2018-02-07 13:51:22 +01:00
Zanz2	ef0733b886	Merge pull request #988 from Zanz2/red_error_msg_sci1993 Accidentally deleted this off master, identical to the branch before [SCI-1993]	2018-02-07 13:08:45 +01:00
Zanz2	a6e93b8e35	Fixed hound line too long	2018-02-07 13:04:02 +01:00
mlorb	edbcdc6bf4	Merge pull request #986 from mlorb/ml-sci-2031 Fix error on task activity [SCI-2031]	2018-02-07 11:39:14 +01:00
Zanz2	367eff6401	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00
Zanz2	e56c0bb100	Tables are now always atleast 5x5, like in scinote when creating new table	2018-02-07 10:55:44 +01:00
Zanz2	f7f46a094e	Fixed PR and a mistake i made	2018-02-07 09:53:49 +01:00
Zanz2	167cbc98e5	Merge branch 'master' into yellow_flashv3_SCI1834	2018-02-07 09:42:56 +01:00
Zanz2	80735f2412	Fixed the bug with big text difference in preview and imported protocol	2018-02-07 09:26:45 +01:00
zmagod	695e9d90d2	fixes user dropdown [fixes SCI-2033]	2018-02-07 08:43:42 +01:00
Luka Murn	4389c110cf	Merge pull request #982 from biosistemika/lm-remove-component-loader Remove component loader (so builds pass)	2018-02-06 17:02:08 +01:00
mlorb	e151c963e1	fix error on task activity	2018-02-06 16:34:16 +01:00
zmagod	2ad4eb3488	fix bug with checklists	2018-02-06 16:15:10 +01:00
zmagod	75cc9d11df	fix error on checklists	2018-02-06 16:06:15 +01:00
Zanz2	a37d4f3cde	there are always now atleast 5 rows, like in edit table in repository, so it adds empty rows if there are not atleast 5 originally	2018-02-06 15:46:03 +01:00
Zmago Devetak	25a42658c8	Merge pull request #980 from ZmagoD/zd_SCI_2009 adds nil check in step_table_element for table name [fixes SCI-2009]	2018-02-06 15:44:56 +01:00
zmagod	bd1345d560	fixes bug with assets upload on task result page, adds ctrl+v listener to upload images from clipboard, adds image preview modal	2018-02-06 15:39:19 +01:00
Zanz2	a2df9777f6	Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000 fixed empty table name unable to generate reports bug [SCI-2000]	2018-02-06 14:34:31 +01:00
Zanz2	83e9550feb	Merge pull request #966 from Zanz2/images_not_imported_SCI1807 Images not imported [SCI-1807]	2018-02-06 14:33:35 +01:00
Zanz2	f9c6eafe49	most protocol attributes, and step description and step expected result now dont get cut tables when they are at max character limit	2018-02-06 12:04:24 +01:00
Zanz2	9b5ddc6789	moved code from older branch to new master	2018-02-06 11:03:17 +01:00
Zanz2	748af2cbf7	Fixed the issue, table name defaults to empty string space now	2018-02-06 10:29:49 +01:00
Zanz2	dac59cf4d0	Refactored to PR, deleted unrelated things	2018-02-06 09:06:33 +01:00
Luka Murn	4ddc7dfa85	Comment react-hijack code	2018-02-06 08:00:29 +01:00
zmagod	b48fa3f231	fixes bug with step table update [fixes SCI-2026]	2018-02-05 17:32:38 +01:00
zmagod	ad742ac2d1	adds nil check in ste_table_element for table name [fixes SCI-2009]	2018-02-05 16:27:04 +01:00
zmagod	25dcfe66ae	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960	2018-02-01 16:04:05 +01:00
Oleksii Kriuchykhin	16e1d072b9	Improve files handling in protocol clonning [SCI-2003]	2018-02-01 15:44:08 +01:00
okriuchykhin	def08a3faa	Merge pull request #971 from okriuchykhin/ok_SCI_1968 Update notification settings accessor names and update Rubocop config [SCI-1968]	2018-01-31 15:40:09 +01:00
zmagod	366b67ca1c	fixes per @mojca 's request	2018-01-31 15:18:18 +01:00
mlorb	39fc52ddf4	Merge pull request #972 from mlorb/ml-sci-1997 Fix type error at changing task at navigation bar after setting due date [SCI-1997]	2018-01-31 15:13:28 +01:00
Zmago Devetak	ccab688728	Merge pull request #975 from ZmagoD/zd_SCI_2001 Zd sci 2001	2018-01-31 14:42:41 +01:00
zmagod	b1684dbd5b	removed unneeded hook	2018-01-31 14:40:19 +01:00
zmagod	34f5076b04	fixes failin specs [fixes SCI-2001]	2018-01-31 12:05:45 +01:00
mlorb	553039b7b4	fix type error at changing task at navigation bar after seting due date	2018-01-30 13:29:54 +01:00
Oleksii Kriuchykhin	7a769bbfde	Update notification settings accessor names and update Rubocop config [SCI-1968]	2018-01-29 16:15:12 +01:00
mlorb	775b8b3201	fix bug with ajax error caused to the other user when deleting column in custom repository	2018-01-29 16:01:33 +01:00
zmagod	029d69b033	revert to old setting [fixes SCI-1967]	2018-01-29 15:42:22 +01:00
Zanz2	0607579d06	Fixes the database error i was having on home machine too, wasnt exclusive to me	2018-01-27 14:57:07 +01:00
Zanz2	70a972c264	Fixed pr and small oversight	2018-01-27 14:33:01 +01:00
Zanz2	2a287193b7	Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix	2018-01-27 13:50:35 +01:00
Zanz2	e8f6dc0d24	Merge pull request #962 from Zanz2/missing_error_SCI1993 A red error messagge is now displayed when not selecting protocol [SCI-1993]	2018-01-26 16:00:15 +01:00
Zanz2	1d4ce42f23	fixed according to PR	2018-01-26 15:29:13 +01:00
Zanz2	98b3ddbdb0	Merge branch 'master' into images_not_imported_SCI1807	2018-01-26 15:13:40 +01:00
Zanz2	a15e624b06	Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995 Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]	2018-01-26 15:08:03 +01:00
Oleksii Kriuchykhin	7c14800570	Change base class for API controller [SCI-1966]	2018-01-26 13:34:38 +01:00
Zanz2	e041426a09	Merge pull request #964 from Zanz2/steps_order_SCI1816 Steps order fix [SCI-1816]	2018-01-26 11:32:28 +01:00
Zanz2	48b48c945c	Refactored hound errors, now that rubocop works	2018-01-26 11:17:49 +01:00
okriuchykhin	94f604ae17	Merge pull request #961 from okriuchykhin/ok_SCI_1994 Actually return 404 when requested asset doesn't exist [SCI-1994]	2018-01-26 11:14:59 +01:00
Zanz2	020e9ddc16	Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807	2018-01-26 11:08:47 +01:00
Zanz2	a48fc168a9	deleted un needed function	2018-01-26 11:05:19 +01:00
Zanz2	6f56f829da	Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title	2018-01-26 10:49:38 +01:00
Zanz2	4ee51959eb	fixed hound	2018-01-26 09:56:59 +01:00
Zanz2	4ed1555ebb	small fix, ordering	2018-01-26 09:45:41 +01:00
Zanz2	346f9feaef	Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html	2018-01-26 09:34:58 +01:00
Zanz2	24e772d7e5	Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816	2018-01-26 08:26:38 +01:00
Zanz2	e484f0569b	Merge pull request #960 from Zanz2/fixed_styling_after_merge Fixed some styling bugs that happened after the merge	2018-01-26 08:19:29 +01:00
Zanz2	fc541147c8	A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone	2018-01-25 15:54:38 +01:00
okriuchykhin	0b1f43c1c5	Merge pull request #954 from okriuchykhin/ok_SCI_1970 Add health check endpoint to API controller [SCI-1970]	2018-01-25 14:33:37 +01:00
Oleksii Kriuchykhin	7dd9121072	Actually return 404 when requested asset doesn't exist [SCI-1994]	2018-01-25 14:30:04 +01:00
zanzdebian	8bd8c34c4d	Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)	2018-01-25 13:45:35 +01:00
mlorb	ab2955c9bb	Merge pull request #956 from mlorb/ml-sci-1491 Add notification for previous task has been completed [SCI-1491]	2018-01-25 11:35:19 +01:00
Zmago Devetak	4716fc7752	Merge pull request #955 from biosistemika/decoupling Decoupling	2018-01-25 11:33:06 +01:00
Zmago Devetak	1e407bd9c5	removes unneeded classes	2018-01-25 11:00:48 +01:00
Zmago Devetak	4b2098c0c4	removes unneeded permissions	2018-01-24 16:34:48 +01:00
zmagod	76b08e6ac9	add permissions in views	2018-01-24 13:59:57 +01:00
Zanz2	00ac774fde	Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result	2018-01-24 13:40:13 +01:00
zmagod	9b836d04fa	fixes per @mlorb 's request	2018-01-24 13:21:53 +01:00
Zanz2	7fe1c20ebe	Finished the protocol reorder functions and implemented them	2018-01-24 09:31:43 +01:00
Zanz2	96253c1089	Made some functions to help solve reordering of the protocols io steps	2018-01-23 18:40:23 +01:00
Mojca Lorber	ac8b1769be	add notification for previous task has been completed	2018-01-23 15:53:33 +01:00
zmagod	88d7429041	1. fixes failing unit and integration tests 2. fixes gem dependencies issues 3. fixes failing migrations 4. updates depricated factory_girl => factory_bot and fixes related issues Signed-off-by: zmagod <zmago_devetak@yahoo.com>	2018-01-23 14:54:15 +01:00
okriuchykhin	a2896031ab	Merge pull request #951 from okriuchykhin/ok_SCI_1949 Allow first user seeding from env variables [SCI-1949]	2018-01-23 14:02:54 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
zmagod	259880c441	add permission helpers for view project and experiment	2018-01-23 08:52:10 +01:00
Oleksii Kriuchykhin	28be7c4fc4	Add health check endpoint to API controller [SCI-1970]	2018-01-22 16:52:48 +01:00
zmagod	ee7c646b1d	update user settings controllers to new permission system [fixes SCI-1960]	2018-01-22 16:42:26 +01:00
okriuchykhin	73b56beae9	Merge pull request #950 from okriuchykhin/ok_SCI_1329 Clear selected rows when changing pages on samples table[SCI-1329]	2018-01-22 15:07:38 +01:00
Oleksii Kriuchykhin	959eddacda	Clear selected rows when changing pages on samples table[SCI-1329]	2018-01-18 17:41:35 +01:00
Oleksii Kriuchykhin	df28503ec1	Fix fetching protocol name in protocol import [SCI-1951]	2018-01-18 17:25:20 +01:00
Oleksii Kriuchykhin	d1a515da90	Allow first user seeding from env variables [SCI-1949]	2018-01-18 16:23:33 +01:00
zmagod	2857857c24	fixes bug with navbar[SCI-1950]	2018-01-18 13:29:47 +01:00
Zmago Devetak	7b28bfa6d4	Merge pull request #937 from ZmagoD/feat/external-components-loader Enable loading of external React components	2018-01-18 11:13:40 +01:00
okriuchykhin	aef80f86b5	Merge pull request #934 from okriuchykhin/ok_SCI_1931 Fix protocol import button [SCI-1931]	2018-01-18 10:30:19 +01:00
Adrian Oprea	f2f624cfa6	Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader * 'decoupling' of github.com:biosistemika/scinote-web: fix(AboutScinoteModal): Enable react optimizations Fix addons display in info modal [SCI-1875] Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version.	2018-01-18 10:24:36 +02:00
Adrian Oprea	12fd630d0c	fix(AboutScinoteModal): Enable react optimizations Children generated within a loop or by an iterator need to be passed a unique `key` property so React can properly watch their updates and perform the necessary actions. Signed-off-by: Adrian Oprea <adrian@oprea.rocks>	2018-01-18 09:59:37 +02:00
Oleksii Kriuchykhin	91468faaf9	Fix addons display in info modal [SCI-1875]	2018-01-17 18:30:55 +01:00
Adrian Oprea	6d84790bdb	Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader * 'decoupling' of github.com:biosistemika/scinote-web: (21 commits) fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944] Remove Addons info test from core [SCI-1875] Remove skip_on_import from repository_cell [SCI-1939] fixes bug with comment actions dropdown [fixes SCI-1938] fixes first element in global activities logs[fixes SCI-1866] Fix task repository row selector [SCI-1940] Fix repository item export [SCI-1945] Fix samples import [SCI-1946] adds first date to _list.html.erb view Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] Fix repository records import [SCI-1939] Fix export samples button [SCI-1936] refactor adds additional tests for permissions controller fix HOC to recive objects fixes flow, and before_action in permissions_controller fixes per @duco 's request remove unneeded import add permissions endpoint on the API fix request ...	2018-01-17 18:14:41 +02:00
Zmago Devetak	b4b6fddca3	Merge pull request #945 from ZmagoD/zd_SCI_1944 fixes bug in the invitation_controller with full_name sanitization [f…	2018-01-17 17:02:34 +01:00
Adrian Oprea	157969aa5e	HACK: Comment out code which returns invalid data It seems like the backend is returning a weird response when queried for addons. Once the backend issue is identified and fixed this should be uncommented. Signed-off-by: Adrian Oprea <adrian@oprea.rocks>	2018-01-17 17:54:35 +02:00
okriuchykhin	8394055fba	Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2 Remove Addons caption if no addons in info modal and fix linter packages	2018-01-17 15:33:43 +01:00
zmagod	488dba378e	fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]	2018-01-17 15:06:43 +01:00
Zmago Devetak	26f7a94392	Merge pull request #943 from ZmagoD/zd_SCI_1866_v2 fixes first element both in Rails part an React part off the application	2018-01-17 14:12:52 +01:00
Zmago Devetak	b9e56c49ef	Merge pull request #944 from ZmagoD/zd_SCI_1938 fixes bug with comment actions dropdown [fixes SCI-1938]	2018-01-17 13:42:36 +01:00
Adrian Oprea	b559f3cbd4	refactor(Navigation): Use identifier instead of screenName Signed-off-by: Adrian Oprea <adrian@oprea.rocks>	2018-01-17 14:40:33 +02:00
Adrian Oprea	4b9013bcab	refactor(massageConfiguration): Create response only when we have addons Signed-off-by: Adrian Oprea <adrian@oprea.rocks>	2018-01-17 14:39:42 +02:00
okriuchykhin	38aaaa011c	Merge pull request #936 from okriuchykhin/ok_SCI_1939 Fix repository records import [SCI-1939]	2018-01-17 12:55:11 +01:00
Oleksii Kriuchykhin	819febb05b	Remove skip_on_import from repository_cell [SCI-1939]	2018-01-17 12:54:32 +01:00
zmagod	5371f5a139	fixes bug with comment actions dropdown [fixes SCI-1938]	2018-01-17 12:54:21 +01:00
okriuchykhin	8ccb361525	Merge pull request #940 from okriuchykhin/ok_SCI_1946 Fix samples import [SCI-1946]	2018-01-17 12:51:35 +01:00
okriuchykhin	1692bdade7	Merge pull request #941 from okriuchykhin/ok_SCI_1945 Fix repository item export [SCI-1945]	2018-01-17 12:50:22 +01:00
okriuchykhin	2c2914f691	Merge pull request #942 from okriuchykhin/ok_SCI_1940 Fix task repository row selector [SCI-1940]	2018-01-17 12:50:11 +01:00
zmagod	0922ee21a7	fixes first element in global activities logs[fixes SCI-1866]	2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin	74a62c41eb	Fix task repository row selector [SCI-1940]	2018-01-17 11:21:41 +01:00
Oleksii Kriuchykhin	86853e8fc1	Fix repository item export [SCI-1945]	2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin	3c8d8e2fbb	Fix samples import [SCI-1946]	2018-01-16 17:50:33 +01:00
Adrian Oprea	d71f6161e4	feat(Navigation): Enhance navigation with addons Use the withExtras HOC to add external functionality without embedding that knowledge in the core.	2018-01-16 17:24:11 +02:00
Adrian Oprea	d7b63f5941	feat(massageConfiguration): Add data-transformation function The meta-configuration structure imposes we change the way `react-hijack` parses and pulls its data. Because that work is both error-prone and also time-consuming, we chose to implement a function that would "massage" the data so it fits the current way react-hijack expects it.	2018-01-16 17:23:15 +02:00
Adrian Oprea	583efbc9c4	refactor(componentLoader): Add component path at module level Instead of forcing this knowledge on the add-on, we inserted it here. The benefit is that we are able to point the core to whatever directory we choose, without modifying each addon in turn.	2018-01-16 17:19:56 +02:00
Adrian Oprea	350862b0cc	feat: Re-export `availableAddons` This will probably be removed and the config will be exported through the main entrypoint.	2018-01-16 17:18:46 +02:00
Adrian Oprea	f6f2bc4c3d	feat: Create availableAddons empty config This configuration is populated on build-time with the available extras which expose a `client/` directory containing React code.	2018-01-16 17:17:39 +02:00
zmagod	a931a1bc15	adds first date to _list.html.erb view	2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin	b59815c611	Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]	2018-01-16 11:11:50 +01:00
Adrian Oprea	894e0afd0a	feat(componentLoader): Add external component loader module For render hijacking to work, imports need to be peformed at core level. This loader ensures that Webpack is able to resolve the paths to the external components' code, without the need for extra loaders or custom built plugins. Signed-off-by: Adrian Oprea <adrian@oprea.rocks>	2018-01-16 10:14:35 +02:00
Oleksii Kriuchykhin	a64012237e	Fix repository records import [SCI-1939]	2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin	79e1eaf145	Fix export samples button [SCI-1936]	2018-01-15 13:54:08 +01:00
Oleksii Kriuchykhin	deabd39a98	Fix protocol import button [SCI-1931]	2018-01-15 13:43:09 +01:00
okriuchykhin	00927be287	Merge pull request #932 from okriuchykhin/ok_SCI_1915 Improve XLSX parsing with Roo [SCI-1915]	2018-01-12 14:57:17 +01:00
Zmago Devetak	ebd354e4d5	Merge pull request #900 from ZmagoD/zd_SCI_1854 adds premissions service to FE	2018-01-12 14:24:28 +01:00
Zanz2	b105920d4e	Merge pull request #901 from Zanz2/code_refactor Protocols.io code beautification and refactoring [SCI-1929]	2018-01-12 12:34:00 +01:00
zmagod	371491c259	refactor	2018-01-12 11:38:52 +01:00
Zanz2	3c6d37ce64	Fixed according to PR review	2018-01-11 18:37:36 +01:00
Oleksii Kriuchykhin	2ddb0ea009	Improve XLSX parsing with Roo [SCI-1915]	2018-01-11 17:52:57 +01:00
mlorb	aba426091c	add render 403 for create team permission	2018-01-10 10:47:45 +01:00
mlorb	6c4514f550	add create_teams permission checks	2018-01-09 15:28:27 +01:00
zmagod	0d7c116de1	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854	2018-01-09 10:03:02 +01:00
zmagod	c5379896c0	fix HOC to recive objects	2018-01-08 16:28:20 +01:00
Zmago Devetak	4e4cae9a48	Merge pull request #927 from ZmagoD/zd_SCI_1867 fix import protocol preview [fixes SCI-1867]	2018-01-08 14:21:44 +01:00
Zmago Devetak	0e6931b1f3	Merge pull request #908 from ZmagoD/zd_SCI_1866 Wrong date at activity	2018-01-08 14:20:26 +01:00
zmagod	c07f54a0c7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854	2018-01-08 08:38:14 +01:00
zmagod	7af4816ce8	removes js brakepoint	2018-01-05 17:13:39 +01:00
zmagod	455534ef9a	fixes list keys	2018-01-05 17:11:38 +01:00
zmagod	eb8124ea5a	follow @duco 's suggestions	2018-01-05 17:08:00 +01:00
mlorb	fd6dfbd561	rename create_teams	2018-01-05 16:47:48 +01:00
mlorb	e76ec7f4a4	Merge pull request #911 from mlorb/ml-sci-1797 Permissions - refactor organization & team level permissions (core) [SCI-1797]	2018-01-05 16:03:55 +01:00
mlorb	efb4ce289c	fix and/or use	2018-01-05 15:52:41 +01:00
zmagod	3fae267547	fix import protocol preview [fixes SCI-1867]	2018-01-05 15:30:11 +01:00
mlorb	99185871c4	fix naming things	2018-01-05 15:15:50 +01:00
mlorb	70ae14a9b8	refactor manage repository permissions again because of addons	2018-01-05 11:17:01 +01:00
mlorb	ec851caa80	refactor manage repository column permissions again because of addons	2018-01-05 10:43:59 +01:00
zmagod	be014000ab	fixes flow-types	2018-01-05 09:59:08 +01:00
zmagod	862b73cae7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866	2018-01-05 09:13:43 +01:00
zmagod	0d72851bb5	fixes bug with displaying assign/unassign button [fixes SCI-1870]	2018-01-04 17:20:17 +01:00
okriuchykhin	4cdbecc3bc	Merge pull request #923 from okriuchykhin/ok_SCI_1869 Add project/task path with tooltips to activities [SCI-1869]	2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin	53f4db9352	Code refactoring [SCI-1869]	2018-01-04 14:56:16 +01:00
okriuchykhin	b0f8c36677	Merge pull request #917 from okriuchykhin/ok_SCI_1870 Fix adding users to a task [SCI-1870]	2018-01-04 14:14:05 +01:00
okriuchykhin	e49ffb61d4	Merge pull request #914 from okriuchykhin/ok_SCI_1873 Fix repositories [SCI-1873]	2018-01-04 13:33:30 +01:00
mlorb	abced181d5	refactor manage repository rows permissions again because of addons	2018-01-04 11:53:58 +01:00
Oleksii Kriuchykhin	070711917e	Code fixes [SCI-1873]	2018-01-04 11:25:34 +01:00
zmagod	e0e3ef9359	fixes flow, and before_action in permissions_controller	2018-01-03 17:23:50 +01:00
okriuchykhin	d149facd50	Merge pull request #922 from okriuchykhin/ok_SCI_1875 Fix about modal [SCI-1875]	2018-01-03 17:00:29 +01:00
mlorb	0c519b8f03	refactor manage sample elements permissions again because of addons	2018-01-03 16:37:02 +01:00
okriuchykhin	3d3b1d3a44	Merge pull request #921 from okriuchykhin/ok_SCI_1648 Fix assign repository record button in tasks when one record is selected [SCI-1648]	2018-01-03 16:28:34 +01:00
okriuchykhin	ac7746ae91	Merge pull request #916 from okriuchykhin/ok_SCI_1871 Fix canvas update [SCI-1871]	2018-01-03 15:47:10 +01:00
okriuchykhin	ff62a36788	Merge pull request #910 from okriuchykhin/ok_SCI_1838 Change invite users to project link to new settings page [SCI-1838]	2018-01-03 14:47:26 +01:00
okriuchykhin	b8fa3c4d51	Merge pull request #905 from okriuchykhin/ok_SCI_1865 Add icons for different notification types in recent notification dropdown [SCI-1865]	2018-01-03 14:23:53 +01:00
zmagod	1d3881b649	fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]	2018-01-03 13:48:59 +01:00
mlorb	dc68b3068b	fix Rails 5.1 bug with params	2018-01-03 13:19:56 +01:00
Oleksii Kriuchykhin	2e275d6d67	Add project/task path with tooltips to activities [SCI-1869]	2017-12-28 15:13:39 +01:00
Zanz2	7bad722553	Made small oversight and fixed it	2017-12-24 02:06:14 +01:00
Zanz2	83e1b04c7a	Fixed pull request	2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin	89230bd730	Fix about modal [SCI-1875]	2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin	27008be50e	Fix assign repository record button in tasks when one record is selected [SCI-1648]	2017-12-22 18:05:22 +01:00
okriuchykhin	0a6d0d1a47	Merge pull request #918 from okriuchykhin/ok_SCI_1893 Fix invite users dropdown [SCI-1893]	2017-12-22 16:58:49 +01:00
Oleksii Kriuchykhin	917c2cf28e	Fix experiment workflow image update indicator [SCI-1872]	2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin	afb579bef1	Fix invite users dropdown [SCI-1893]	2017-12-21 16:49:10 +01:00
mlorb	0774b6f7e6	refactor manage samples permissions again, so that addons permissions can be added	2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin	49ae9bcd55	Fix adding users to a task [SCI-1870]	2017-12-20 13:44:21 +01:00
Oleksii Kriuchykhin	66869fe4cf	Fix canvas update [SCI-1871]	2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin	512ee07bde	Fix repositories [SCI-1873]	2017-12-19 17:53:45 +01:00
Oleksii Kriuchykhin	1a81a99ff0	Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]	2017-12-19 16:17:11 +01:00
Luka Murn	cf291bf887	Merge branch 'gilson-iot-rails4' Conflicts: Gemfile.lock	2017-12-19 10:56:39 +01:00
Zanz2	53561ffd84	Refactored according to PR	2017-12-15 20:39:15 +01:00
mlorb	bd7eda1506	fix failing tests	2017-12-14 14:18:18 +01:00
mlorb	2936770c01	refactor can view team users ATWHO permission	2017-12-14 14:18:18 +01:00
mlorb	5c790287ec	refactor again manage user team permissions	2017-12-14 14:18:18 +01:00
mlorb	7c1ae6bc82	refactor manage repository permissions	2017-12-14 14:18:18 +01:00
mlorb	2918a9833d	refactor manage repository column permissions	2017-12-14 14:18:18 +01:00
mlorb	3f5e9e60b7	refactor view repository permission	2017-12-14 14:18:18 +01:00
mlorb	079ac7a4d3	refactor manage repository row permissions	2017-12-14 14:18:18 +01:00
mlorb	740ecc674b	refactor view repositories permission	2017-12-14 14:18:18 +01:00
mlorb	3ca51f097f	refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions	2017-12-14 14:18:17 +01:00
mlorb	e577b363b2	byTheWay fix of Rails 5.1 bug	2017-12-14 14:18:17 +01:00
mlorb	29f9414839	refactor create project permission	2017-12-14 14:18:17 +01:00
mlorb	72023c7dfe	refactor update/delete sample permissions	2017-12-14 14:18:17 +01:00
mlorb	b09377cd8d	refactor update sample permission	2017-12-14 14:18:17 +01:00
mlorb	f801ed8eb6	refactor view/export samples permission	2017-12-14 14:18:16 +01:00
mlorb	0d37f9c85a	refactor clone protocol permission	2017-12-14 14:18:16 +01:00
mlorb	f6d36ae6a2	refactor update protocol type in repository	2017-12-14 14:18:16 +01:00
mlorb	806fcbce36	refactor update protocol in repository permission	2017-12-14 14:18:16 +01:00
mlorb	e0d1ae174e	refactor read protocol in repository permission	2017-12-14 14:18:15 +01:00
mlorb	a3a494c3a2	fix banana: remove dead code which strangely reappeared, probably with some rebasing	2017-12-14 14:18:15 +01:00
mlorb	ccc2451494	refactor create sample permissions	2017-12-14 14:18:15 +01:00
mlorb	43c01b74b1	refactor create protocol permission	2017-12-14 14:18:14 +01:00
mlorb	11a3cd196c	add create, update team permission and refactor 422 respond handling in controllers	2017-12-14 14:18:14 +01:00
mlorb	8893fd668d	add create, update, delete user_team permission	2017-12-14 14:18:14 +01:00
mlorb	a0b2d3f5ef	refactor read_team permission	2017-12-14 14:18:14 +01:00
zmagod	219ef3baf6	setup new pagination for activities	2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin	4ff6e87fed	Change invite users to project link to new settings page [SCI-1838]	2017-12-14 11:22:28 +01:00
Oleksii Kriuchykhin	7bdc22ee80	Remove default property [SCI-1865]	2017-12-13 17:28:05 +01:00
Oleksii Kriuchykhin	6986d11cfe	Add Flow types for notifications [SCI-1865]	2017-12-13 17:25:25 +01:00
zmagod	249d3d7698	fixes current timezone setup for activities	2017-12-13 16:48:31 +01:00
okriuchykhin	2fa7591f36	Merge pull request #903 from okriuchykhin/ok_SCI_1864 Rename notifications settings accessor [SCI-1864]	2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin	baf3151bb0	Fix notification settings accessors [SCI-1864]	2017-12-13 11:59:53 +01:00
zmagod	b106545d31	fixes per @duco 's request	2017-12-13 08:57:50 +01:00
Oleksii Kriuchykhin	ea63864b33	Add icons for different notification types in recent notification dropdown [SCI-1865]	2017-12-12 17:05:08 +01:00
Zmago Devetak	00be4460cc	Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step Fixes bug with embedded images [SCI-1624]	2017-12-12 09:53:24 +01:00
Zanz2	1fc8b2a2b2	quick fix un-needed styling	2017-12-10 01:45:47 +01:00
Zanz2	11dc3be9d4	It is now possible to scroll down preview modal	2017-12-10 01:41:21 +01:00

... 21 22 23 24 25 ...

4681 commits