4777 commits

Author	SHA1	Message	Date
Urban Rotnik	c8ab9f8ff8	Fix tests	2019-02-26 08:04:05 +01:00
Urban Rotnik	5a123d26ac	Activity model update	2019-02-26 07:15:05 +01:00
Anton Ignatov	a4cabb203b	Task info section improvements	2019-02-25 16:55:09 +01:00
Urban Rotnik	3ad6cee766	Fix tests, remove nullable field	2019-02-25 16:50:38 +01:00
Miha Mencin	76c3db0b11	added layout, added css, added select2 lib, WIP	2019-02-25 16:50:38 +01:00
Urban Rotnik	5b5c6c7122	Changes to Activity model	2019-02-25 16:49:55 +01:00
aignatov-bio	0bf7cb4c59	Merge pull request #1519 from biosistemika/ai-adding-multiple-select-plugin ... Adding new Select2 library with customizations	2019-02-25 16:46:07 +01:00
Jure Grabnar	4edab957a4	Merge pull request #1516 from jbargu/jg_sci_3069_due_date_red ... Due date is not red for today anymore [SCI-3069]	2019-02-25 13:20:50 +01:00
Jure Grabnar	d7e91676c3	Rename initial experiment back to the old one	2019-02-24 08:13:57 +01:00
Jure Grabnar	b4199b28e4	Remove turbolinks:load from the project show page ... Also rename Demo project experiment back to PCR. Closes SCI-3081.	2019-02-22 19:46:42 +01:00
Anton Ignatov	6971d1a55d	Adding new Select2 library with customization	2019-02-22 16:40:33 +01:00
aignatov-bio	aa8a2b040a	Merge pull request #1518 from biosistemika/features/system-notifications ... Notification changes on settings page [SCI 3084] (#1517)	2019-02-22 14:01:38 +01:00
aignatov-bio	606708987f	Notification changes on settings page [SCI 3084] (#1517) ... * Fix css and update text settings	2019-02-22 13:20:51 +01:00
Jure Grabnar	f98d6fbd4d	Remove archived task in Demo project ... Closes SCI-3082.	2019-02-22 11:58:32 +01:00
Jure Grabnar	f9cb8c8803	Add utc conversion to due_date	2019-02-22 10:47:39 +01:00
Jure Grabnar	87dcf301fb	Change due_date calculation to DateTime#end_of_day	2019-02-22 10:23:12 +01:00
Jure Grabnar	fb533eb9d3	Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed ... Add action_name to sidebar cache as dependency [SCI-2930]	2019-02-22 10:04:57 +01:00
Jure Grabnar	7f0ea48dff	Merge pull request #1515 from jbargu/jg_sci_3080_demo_project_rename ... Rename Demo project and create rake task to create it on existing users [SCI-3080]	2019-02-22 10:01:39 +01:00
Jure Grabnar	96f2da1e8b	Shift due day calculations for 1 day ... Closes SCI-3069.	2019-02-22 08:01:15 +01:00
Jure Grabnar	ffe0493013	Rename Demo project and create rake task to create it on existing users ... Closes SCI-3080.	2019-02-21 23:31:55 +01:00
Miha Mencin	bcd0b433b6	Merge pull request #1514 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-21 16:38:58 +01:00
aignatov-bio	5f78d83f9c	Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513) ... * fix dropdown apperance * Remove search and fix duplicate bug * Fix specs for new method	2019-02-21 16:15:13 +01:00
Urban Rotnik	b50320a4bc	Add margin for system notification modal	2019-02-21 15:15:33 +01:00
Oleksii Kriuchykhin	db18f88807	Update templates to final version [SCI-3053]	2019-02-21 15:06:34 +01:00
Jure Grabnar	0fa06ea9fc	Merge pull request #1505 from jbargu/jg_sci_2928_few_turbolinks_bugs ... Check for recaptcha enabled boolean value	2019-02-20 18:29:40 +01:00
aignatov-bio	5fdba554d2	Merge pull request #1510 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-20 17:22:57 +01:00
Urban Rotnik	82ea31e275	Add validation limits for system notification fields	2019-02-20 16:05:15 +01:00
Jure Grabnar	61f9df0656	Add action_name to sidebar cache as dependency ... Closes SCI-2930.	2019-02-20 14:13:51 +01:00
aignatov-bio	35268252c8	After reading What’s new notification and reloading the page, gift status is unseen again [SCI 3051] (#1504) ... * Change relative path to absolute to mark_as_read and make clickable whole system notification with hover effecr	2019-02-20 13:15:16 +01:00
Jure Grabnar	e392f9e61f	Check for recaptcha enabled boolean value ... Closes SCI-2928.	2019-02-20 10:14:37 +01:00
Jure Grabnar	27ed8e781e	Merge pull request #1501 from jbargu/jg_sci_2985_recaptcha_invite_not_working ... Recaptcha input field now addressed with jQuery	2019-02-20 08:44:23 +01:00
Alex Kriuchykhin	0a54eb8ebe	Merge pull request #1503 from biosistemika/features/templates ... Merge features/templates to master	2019-02-19 15:07:42 +01:00
Urban Rotnik	7b6c6c414d	Merge branch 'master' into features/templates	2019-02-19 14:46:15 +01:00
Mojca Lorber	ebfacdd62c	change experiments title color	2019-02-19 14:24:23 +01:00
aignatov-bio	fcdb4e7a92	Merge pull request #1500 from biosistemika/features/system-notifications ... Features/system notifications	2019-02-19 13:51:18 +01:00
Jure Grabnar	ebdf9adab0	Recaptcha input field now addressed with jQuery ... Fix SCI-2985	2019-02-19 13:05:33 +01:00
Urban Rotnik	d3d9868ba4	Set version for HTTParty dependency, add opts in mailer	2019-02-19 11:23:01 +01:00
Urban Rotnik	f63eaaefe7	Add user_system_notification records when syncing notifications, update email sending	2019-02-19 11:22:58 +01:00
Urban Rotnik	29d77ca81d	Add system_notification sending email feature	2019-02-19 11:20:25 +01:00
aignatov-bio	8e905b67b2	System notification navbar menu drop down [SCI 2955] (#1498) ... * Add dropdown menu and icon for system notifications * Finish system notification dropdown menu and add tests	2019-02-19 11:08:59 +01:00
aignatov-bio	c598541e09	System notification modal window [SCI-2957 and SCI-2958] (#1484) ... * Added new system notification modal * Adding loading system notification on sign in	2019-02-15 13:07:29 +01:00
Oleksii Kriuchykhin	c186498a5e	Merge branch 'features/templates' into ok_SCI_3037	2019-02-15 10:47:38 +01:00
Alex Kriuchykhin	185e3b4832	Merge pull request #1495 from okriuchykhin/ok_SCI_3039 ... Create templates project when syncing templates if team doesn't have it [SCI-3039]	2019-02-14 17:40:01 +01:00
Mojca Lorber	343a46584f	Rename scope	2019-02-14 14:54:04 +01:00
Mojca Lorber	0e14c126e5	Add scope instead of method for active my_module_group	2019-02-14 10:53:48 +01:00
Urban Rotnik	5b55860dea	Add scheduler	2019-02-13 15:48:15 +01:00
Urban Rotnik	9f3187abdf	Add service for sync system notifications	2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin	da30d187a6	Create templates project when syncing templates if team doesn't have it [SCI-3039]	2019-02-13 15:17:33 +01:00
mlorb	71e4cc4dbd	Merge branch 'master' into ml-sci-2940	2019-02-13 14:35:03 +01:00
Mojca Lorber	0adb8b2b61	Fix failing tests	2019-02-13 14:31:26 +01:00
aignatov-bio	5c85595ab4	System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) ... * System notification view and notification partial (SCI 2956 and SCI 3001)	2019-02-13 13:06:14 +01:00
Mojca Lorber	16f99afbc0	Minor fixes	2019-02-13 12:20:14 +01:00
Oleksii Kriuchykhin	f3ad4f7fc9	Fix failing test [SCI-3037]	2019-02-12 13:39:38 +01:00
Mojca Lorber	d706a18e2d	Add flag for archived tasks to experiment exporter	2019-02-12 13:29:48 +01:00
mlorb	8bad68c854	Merge pull request #1457 from mlorb/ml-sci-2933 ... Change experiment cards look and feel [SCI-2933]	2019-02-12 11:49:24 +01:00
Mojca Lorber	3b4a894124	fix hound	2019-02-12 11:24:44 +01:00
Oleksii Kriuchykhin	7854b9d281	Merge branch 'features/templates' into ok_SCI_3037	2019-02-12 11:18:31 +01:00
Oleksii Kriuchykhin	445098fe45	Fix protocols in team export service [SCI-3037]	2019-02-12 10:56:15 +01:00
Alex Kriuchykhin	b71c9d96a2	Merge pull request #1476 from okriuchykhin/ok_SCI_2944 ... Add test for templates service [SCI-2944]	2019-02-12 09:39:03 +01:00
Mojca Lorber	d8cc482cbf	remove electronic signatures from templates	2019-02-11 17:51:48 +01:00
Mojca Lorber	78a29c4141	add templates after protocol_keyword_team rake task was run	2019-02-11 16:15:56 +01:00
Mojca Lorber	087832c29d	add templates	2019-02-11 14:02:49 +01:00
aignatov-bio	de75ec4600	Merge pull request #1485 from biosistemika/ai-sci-3006-inventory-order-bug ... [SCI-3006] After changing order of inventory columns item can not be edited, deleted, copied	2019-02-11 13:50:13 +01:00
aignatov-bio	16164477ac	Merge pull request #1487 from biosistemika/ai-sci-3005-user-counter-card-not-updated ... User counter on task card is not updated [SCI-3005]	2019-02-11 13:49:49 +01:00
Alex Kriuchykhin	b7d7e4bf10	Merge pull request #1488 from okriuchykhin/ok_SCI_3030 ... Fix TinyMCE images in protocol import [SCI-3030]	2019-02-11 13:41:01 +01:00
Alex Kriuchykhin	11e0ccc24a	Merge pull request #1479 from okriuchykhin/ok_SCI_2967 ... Optionally disable Tika background mode through env variable [SCI-2967]	2019-02-11 12:56:31 +01:00
Oleksii Kriuchykhin	2ff5199be0	Fix TinyMCE images in protocol import [SCI-3030]	2019-02-07 16:58:38 +01:00
Anton Ignatov	c389b7ab06	remove console.log from js	2019-02-07 14:26:15 +01:00
Anton Ignatov	c6ab6da381	Fixed counter bug SCI-3005	2019-02-07 14:23:37 +01:00
Oleksii Kriuchykhin	3376fd012c	Improve error loggin in protocol import [SCI-3023]	2019-02-07 14:00:24 +01:00
Anton Ignatov	4145b2565c	Fixed bug with order in inventories SCI-3006	2019-02-07 11:34:04 +01:00
Oleksii Kriuchykhin	fdff69f22e	Add comment for Tika start up code [SCI-2967]	2019-02-07 11:06:25 +01:00
Jure Grabnar	0fa403d6b0	Refactor tests fro experiment import ... Closes [SCI-2946]	2019-02-06 14:27:43 +01:00
Matej Zrimšek	f68adf1e5e	Fix workflow image loading for moved experiments [SCI-3003]	2019-02-06 07:51:43 +01:00
Mojca Lorber	227aeb284c	change mydemo projects data	2019-02-05 11:15:16 +01:00
Oleksii Kriuchykhin	13c4bd25af	Optionally disable Tika background mode through env variable [SCI-2967]	2019-02-04 16:47:29 +01:00
Oleksii Kriuchykhin	a033e9b207	Fix Lato font loading [SCI-2969]	2019-02-04 15:36:17 +01:00
Oleksii Kriuchykhin	19f1585352	Add test for templates service [SCI-2944]	2019-02-01 18:06:36 +01:00
Miha Mencin	e84ab5b550	Merge pull request #1475 from biosistemika/mm-sci-2982-user-variables-bug ... SciNoteSCI-2982 Investigate (plus, fix) the User.variables on my.scinote.net	2019-02-01 09:46:19 +01:00
mz3944	a315808d58	Merge pull request #1473 from mz3944/mz-SCI-2918 ... In html project export there is formula instead of result in table [SCI-2918]	2019-02-01 04:49:14 +01:00
Urban Rotnik	8ebb7561d9	Add last_time_changed_at columnd to SystemNotifications	2019-01-31 16:44:20 +01:00
Miha Mencin	d2dfe68e46	Changing double quotes to single quotes	2019-01-31 10:31:03 +01:00
Miha Mencin	3ec62758fe	SCI-2982, handle the empty json condition	2019-01-31 09:43:41 +01:00
Matej Zrimšek	ac78c7d21b	Process Handsontable formulas in project HTML files in team export [SCI-2918]	2019-01-31 07:39:17 +01:00
Urban Rotnik	6f7fcb0831	Refactor method clone_experiment_as_template into service object ... [SCI-2925]	2019-01-31 07:13:40 +01:00
mz3944	2ae56eb13f	Merge pull request #1448 from mz3944/mz-SCI-2929 ... Can not switch team [SCI-2929]	2019-01-31 04:43:39 +01:00
Oleksii Kriuchykhin	cc57a8d4ef	Fix template project name generation [SCI-2939]	2019-01-30 10:56:22 +01:00
Oleksii Kriuchykhin	cc92de3726	Merge latest features/templates [SCI-2939]	2019-01-30 10:43:54 +01:00
Urban Rotnik	3e2c9934d0	Add SystemNotification model ... - SystemNotifiction model with spec - UserSystemNotification model for many-many association	2019-01-29 11:40:26 +01:00
Luka Murn	1f7bca485a	Merge pull request #1471 from biosistemika/master ... Merge master into features/templates	2019-01-29 10:14:09 +01:00
Mojca Lorber	089ec64398	fix experiment card look on Matejs request	2019-01-28 16:59:40 +01:00
Oleksii Kriuchykhin	f7b73c617a	Fix code styling [SCI-2939]	2019-01-28 15:37:24 +01:00
Urban Rotnik	4cf12d12d1	Refactor 'move_experiment' method into service object ... Jira Ticket: SCI-2926	2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin	05edfae766	Fix failing tests [SCI-2939]	2019-01-25 14:13:00 +01:00
Miha Mencin	b67cee2e65	Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug ... SCI-2928 moving team modal js file to application.js.erb in order to …	2019-01-25 11:54:14 +01:00
Urban Rotnik	16e9a56874	Add recaptcha to invitation modal ... SCI-2935	2019-01-25 11:27:01 +01:00
Urban Rotnik	247bae8a9f	Refactor export_all_counter increasing/reseting logic ... - Remove daily task - Add method to user Model	2019-01-25 11:16:31 +01:00
Oleksii Kriuchykhin	bd2efa55ac	Add templates business logic [SCI-2939]	2019-01-25 10:55:08 +01:00
mlorb	a297ef2094	Merge pull request #1443 from mlorb/ml-sci-2914 ... Allow org. administrators to invite them onto all projects [SCI-2914]	2019-01-24 16:24:57 +01:00
Mojca Lorber	fa1dff6352	refactor Demo project generation	2019-01-24 13:40:53 +01:00
mz3944	79d35de794	Merge pull request #1435 from mz3944/mz-SCI-2912 ... An error at archiving experiment with locked task [SCI-2912]	2019-01-24 05:27:58 +01:00
Miha Mencin	126a031498	SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded	2019-01-23 15:30:23 +01:00
mz3944	f6c8af105d	Merge pull request #1434 from mz3944/mz-SCI-2903 ... Fix (unite) Date and Time display formats [SCI-2903]	2019-01-21 09:50:34 +01:00
Urban Rotnik	f1d59e65f3	Add module and rename service object	2019-01-18 16:56:33 +01:00
Urban Rotnik	47cc6a9d10	Refactor workflow_image_generation and move to service class	2019-01-18 16:56:33 +01:00
Urban Rotnik	686f10cbd0	Refactor instance method 'ordered_modules' to scope	2019-01-18 16:56:33 +01:00
Urban Rotnik	1b70f42817	Refactor 'Experiment.modules_without_group' to Module's scope	2019-01-18 16:54:00 +01:00
mlorb	d2108ac3ea	fix hound	2019-01-18 16:16:00 +01:00
mlorb	7fdef4d3ec	Change experiment cards look and feel	2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin	fdf7db425b	Merge branch 'master' into features/templates	2019-01-18 14:41:21 +01:00
Oleksii Kriuchykhin	1861f86b2c	Improve export all modal messages in case of unlimited exports [SCI-2965]	2019-01-17 17:27:32 +01:00
Oleksii Kriuchykhin	e62e1873b0	Fix issue with caching in inventories dropdown [SCI-2776]	2019-01-17 15:04:20 +01:00
Alex Kriuchykhin	88cea198f0	Merge pull request #1452 from okriuchykhin/ok_SCI_2950 ... Fix binary files in Export All archive [SCI-2950]	2019-01-16 17:29:48 +01:00
Oleksii Kriuchykhin	4f9eb7e165	Fix binary files in Export All archive [SCI2950]	2019-01-16 17:07:05 +01:00
Jure Grabnar	761932282b	Fix Hound formatting ... Closes SCI-2937	2019-01-16 16:11:38 +01:00
Jure Grabnar	d1f966ee05	Add importing of the experiment templates	2019-01-16 15:54:03 +01:00
Miha Mencin	0766ee96a7	Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2 ... Fix task tags update on canvas cards [SCI-2875]	2019-01-16 12:44:50 +01:00
Jure Grabnar	5b496a85d3	Experiment exporting works	2019-01-16 08:37:05 +01:00
Jure Grabnar	0184c97c61	Refactor TeamExporter into ModelExporter	2019-01-16 08:00:01 +01:00
Jure Grabnar	ff17a7e367	Fix S3_BUCKET not being defined	2019-01-14 16:49:08 +01:00
Oleksii Kriuchykhin	3a4b992f4e	Code style fixies []SCI-2875]	2019-01-14 16:31:23 +01:00
Matej Zrimšek	a5c1cf4450	Switch user's team if he's no longer a member of the currently selected one	2019-01-12 23:39:31 +01:00
Matej Zrimšek	838455af0d	Fix protocols.io Date handling at import	2019-01-12 19:28:45 +01:00
Oleksii Kriuchykhin	89240659a7	Fix task tags update on canvas cards [SCI-2875]	2019-01-11 17:20:39 +01:00
Alex Kriuchykhin	b530cea771	Merge pull request #1438 from okriuchykhin/ok_SCI_2776 ... Add counters to task inventories dropdown [SCI-2776]	2019-01-11 16:27:22 +01:00
Alex Kriuchykhin	be514fd62d	Merge pull request #1445 from okriuchykhin/ok_SCI_2931 ... Fix image URLs in export all document [SCI-2931]	2019-01-11 12:03:06 +01:00
Oleksii Kriuchykhin	132f46b136	Improve error handling in task inventories dropdown [SCI-2776]	2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin	ec28db6f4f	Fix image URLs in export all document [SCI-2931]	2019-01-10 14:19:40 +01:00
Alex Kriuchykhin	c2b38af91e	Merge pull request #1439 from okriuchykhin/ok_SCI_2888 ... Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]	2019-01-10 11:05:07 +01:00
Alex Kriuchykhin	8ea37c541b	Merge pull request #1436 from okriuchykhin/ok_SCI_2904 ... Disable edit button for unsupported WOPI formats [SCI-2904]	2019-01-10 11:04:26 +01:00
mlorb	06b1e5cf20	Allow org. administrators to invite them onto all projects	2019-01-08 16:30:52 +01:00
Jure Grabnar	fe46f9c9fe	Reinit tooltips after cancel/save step ... Closes SCI-2891.	2019-01-08 15:36:44 +01:00
Matej Zrimšek	8070b7f8b5	Fix Date and Time display formats on JS side	2019-01-08 08:07:24 +01:00
Matej Zrimšek	b64df7d8cc	Fix additional Date and Time display formats	2019-01-08 06:29:37 +01:00
Oleksii Kriuchykhin	6a64b23f90	Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]	2019-01-04 10:44:38 +01:00
Alex Kriuchykhin	8ffe5dafee	Merge pull request #1437 from okriuchykhin/ok_SCI_2907 ... Change sample date in date format settings [SCI-2907]	2019-01-03 16:10:19 +01:00
Oleksii Kriuchykhin	5ea5b76d39	Change sample date in date format settings [SCI-2907]	2019-01-03 14:15:41 +01:00
Oleksii Kriuchykhin	534866467b	Add counters to task inventories dropdown [SCI-2776]	2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin	2769add4d9	Disable edit button for unsupported WOPI formats [SCI-2904]	2018-12-31 18:10:12 +01:00
Matej Zrimšek	c84457e1ed	Prevent archiving of experiments with at least one locked task	2018-12-23 21:17:51 +01:00
Matej Zrimšek	b74105abc2	Fix Date and Time display formats	2018-12-23 20:30:09 +01:00
Luka Murn	1c8407e4f4	Merge pull request #1433 from okriuchykhin/ok_SCI_2864 ... Additional fix for export all S3 path [SCI-2864]	2018-12-20 13:27:50 +01:00
Oleksii Kriuchykhin	2fa4f42883	Additional fix for export all S3 path [SCI-2864]	2018-12-20 13:22:56 +01:00
Luka Murn	faf6601962	Merge pull request #1432 from okriuchykhin/ok_SCI_2864 ... Fix S3 zip exports path [SCI-2864]	2018-12-20 11:08:48 +01:00
Oleksii Kriuchykhin	c880f3fd84	Fix S3 zip exports path [SCI-2864]	2018-12-20 11:07:19 +01:00
Luka Murn	ac5c809d20	Add force_encoding to export all report view template	2018-12-18 21:03:10 +01:00
Luka Murn	cb1cfe2ef3	Merge pull request #1429 from Ducz0r/lm-sci-2902-fix-2 ... Fix assets include in export all report to work on production env [SCI-2902]	2018-12-18 09:14:44 +01:00
Luka Murn	097e871228	Fix assets include in export all report to work on production env ... Closes SCI-2902.	2018-12-18 09:10:55 +01:00
Oleksii Kriuchykhin	3610960ee3	Fix ajax calls duplication [SCI-2916]	2018-12-17 20:59:22 +01:00
mlorb	5ebcd1dfe1	Merge pull request #1423 from mlorb/ml-sci-2911 ... Fix export projects getting fired multiple times [SCI-2911]	2018-12-17 11:26:40 +01:00
mlorb	37f1d66268	Merge pull request #1421 from mlorb/ml-sci-2800-v2 ... Fix tooltip style [SCI-2800]	2018-12-17 11:25:31 +01:00
Luka Murn	8935e4c7c1	Merge pull request #1426 from Ducz0r/lm-add-queue-to-export-all-jobs ... Add team_zip_export job queue to export all delayed jobs	2018-12-16 22:16:10 +01:00
Alex Kriuchykhin	94e6143ac0	Merge pull request #1425 from okriuchykhin/ok_SCI_2907 ... Use fixed date example in date format drop down [SCI-2907]	2018-12-16 20:11:58 +01:00
Alex Kriuchykhin	a6bfa38ceb	Merge pull request #1424 from okriuchykhin/ok_SCI_2909 ... Change color of the selected element in the side navigation [SCI-2909]	2018-12-16 20:11:41 +01:00
Alex Kriuchykhin	ab0924c8e6	Merge pull request #1415 from okriuchykhin/ok_SCI_2864 ... Use built-in methods for Postgres extensions enabling [SCI-2864]	2018-12-16 19:45:56 +01:00
Alex Kriuchykhin	8a348b8504	Merge pull request #1422 from okriuchykhin/ok_SCI_2910 ... Improve rendering speed of inventory table [SCI-2910]	2018-12-16 19:45:29 +01:00
Alex Kriuchykhin	abdf64a8c7	Merge pull request #1420 from okriuchykhin/ok_SCI_2894 ... Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]	2018-12-16 19:44:50 +01:00
Luka Murn	7ba9628cfb	Add team_zip_export job queue to export all delayed jobs	2018-12-13 18:40:56 +01:00
Oleksii Kriuchykhin	23f8602872	Use fixed date example in date format dropdown [SCI-2907]	2018-12-13 17:53:04 +01:00
Oleksii Kriuchykhin	97bde075b2	Change color of the selected element in the side navigation [SCI-2909]	2018-12-13 16:50:22 +01:00
mlorb	55cab34eb4	fix export projects getting fired miltiple times	2018-12-13 16:46:08 +01:00
Oleksii Kriuchykhin	d5c07fd22a	Improve rendering speed of inventory table [SCI-2910]	2018-12-13 16:17:22 +01:00
Luka Murn	022d0d9512	Merge pull request #1419 from Ducz0r/lm-sci-2902-fix ... Change export all to use HTML instead of PDF [SCI-2902]	2018-12-13 15:19:37 +01:00
mlorb	b7efce579b	fix tooltip style	2018-12-13 12:43:12 +01:00
Oleksii Kriuchykhin	311189a2e9	Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]	2018-12-13 11:18:09 +01:00
Luka Murn	3d7b633c25	Hound is love, Hound is life	2018-12-12 14:03:16 +01:00
Alex Kriuchykhin	4e416fe81b	Merge pull request #1404 from okriuchykhin/ok_SCI_2822 ... Return task inputs/outputs as references [SCI-2822]	2018-12-12 11:36:39 +01:00
mlorb	3f79cc5f93	Merge pull request #1418 from mlorb/ml-sci-2905 ... Fix due date can not be set [SCI-2905]	2018-12-12 11:27:57 +01:00
mlorb	cfd5156c09	Merge pull request #1416 from mlorb/ml-sci-2871 ... Fix behavior when user has no teams [SCI-2871]	2018-12-12 11:27:28 +01:00
mlorb	8170e1b367	Merge pull request #1414 from mlorb/ml-sci-2899 ... Fix invited member is added multiple times to team [SCI-2899]	2018-12-12 11:26:41 +01:00
Luka Murn	65adc7a556	Fix 2 minor visual bugs in reports	2018-12-12 11:15:32 +01:00
Luka Murn	24af108e98	Change PDF in export all to HTML	2018-12-12 11:15:16 +01:00
mlorb	426fadc10a	Fix due date can not be set	2018-12-11 10:31:13 +01:00
mlorb	4040b31143	Fix behavior when user has no teams	2018-12-10 15:42:05 +01:00
Oleksii Kriuchykhin	7cd1c12a4f	Use built-in methods for Postgres extensions enabling [SCI-2864]	2018-12-10 14:14:49 +01:00
Alex Kriuchykhin	37db41e18e	Merge pull request #1405 from okriuchykhin/ok_SCI_2881 ... Refresh sidebar when project is archived/restored [SCI-2881]	2018-12-10 14:11:34 +01:00
Alex Kriuchykhin	51ba74cbab	Merge pull request #1403 from okriuchykhin/ok_SCI_2757 ... Enable caching for navigation sidebar [SCI-2757]	2018-12-10 14:11:05 +01:00
mlorb	33d5d2a1cc	Merge pull request #1412 from mlorb/ml-sci-2893 ... Fix download exported project from email link [SCI-2893]	2018-12-10 09:48:00 +01:00
mlorb	7c3bad1e86	Merge pull request #1410 from mlorb/ml-sci-2789 ... Fix missing protocols link tooltip [SCI-2789]	2018-12-10 09:15:31 +01:00
Luka Murn	3663320cf1	Merge pull request #1411 from Ducz0r/lm-fix-team-importer ... Refactor team importer to use closed File.open blocks	2018-12-10 08:52:26 +01:00
Matej Zrimšek	9480234682	Show all smart annotations when they contain special characters [SCI-2816]	2018-12-09 11:15:31 +01:00
mlorb	d761a81b26	fix download link in email again	2018-12-07 15:02:45 +01:00
mlorb	2246166107	fix protocol link tooltip again	2018-12-07 12:00:42 +01:00
mlorb	d37f3a3c09	fix invited member is added multiple times to team	2018-12-07 11:36:26 +01:00
mlorb	5dee804006	fix download exported project from email link	2018-12-06 09:42:58 +01:00
mlorb	3031fb7a4b	Merge pull request #1398 from mlorb/ml-sci-2786 ... Fix projects table css [SCI-2786]	2018-12-06 09:15:51 +01:00
Luka Murn	f56847e44a	Refactor team importer to use closed File.open blocks	2018-12-05 18:34:32 +01:00
mlorb	c7f5c17e7e	change css again	2018-12-04 11:21:54 +01:00
mlorb	7d1817350a	fix missing protocols link tooltip	2018-12-04 10:45:16 +01:00
Oleksii Kriuchykhin	d2b1fd8ef2	Remove unneeded check [SCI-2757]	2018-12-03 13:03:22 +01:00
Alex Kriuchykhin	9621f0b372	Merge pull request #1408 from okriuchykhin/ok_SCI_2802 ... Search for IDs on inventory table as text [SCI-2802]	2018-12-03 11:39:57 +01:00
Oleksii Kriuchykhin	2c0927b254	Search for IDs on inventory table as text [SCI-2802]	2018-11-30 15:32:01 +01:00
Oleksii Kriuchykhin	bf3c7e7840	Fix search across reports, search all readable projects [SCI-2823]	2018-11-30 11:46:13 +01:00
Oleksii Kriuchykhin	e43b366cdb	Disable fragment caching	2018-11-29 18:07:31 +01:00
Oleksii Kriuchykhin	2c96f08b98	Refresh sidebar when project is archived/restored [SCI-2881]	2018-11-29 14:20:20 +01:00
Oleksii Kriuchykhin	60a19734b2	Enable caching for navigation sidebar [SCI-2757]	2018-11-29 11:28:36 +01:00
Luka Murn	8b1449b5a2	Add bottom margin to OAuth authorize page, for better mobile xp	2018-11-28 21:46:33 +01:00
Oleksii Kriuchykhin	5b566b48ae	Improve error messages and fix task users/items endpoints [SCI-2886]	2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin	b3a377f949	Return task inputs/outputs as references [SCI-2822]	2018-11-28 11:33:00 +01:00
Alex Kriuchykhin	20e2cbf0ca	Merge pull request #1391 from okriuchykhin/ok_SCI_2880 ... Fix smart annotations rendering issues [SCI-2880]	2018-11-28 09:47:20 +01:00
mlorb	15ddd0ab91	fix projects table css	2018-11-27 12:37:10 +01:00
Alex Kriuchykhin	676d4da7d2	Merge pull request #1397 from okriuchykhin/ok_SCI_2885 ... Fix support menu for Safari [SCI-2885]	2018-11-27 11:21:29 +01:00
mlorb	398c2f0576	Merge pull request #1392 from mlorb/ml-sci-2676 ... Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]	2018-11-27 11:06:45 +01:00
mlorb	0b6b3b3609	code simplify	2018-11-27 10:58:51 +01:00
Oleksii Kriuchykhin	79544e789d	Fix support menu for Safari [SCI-2885]	2018-11-26 18:47:21 +01:00
Alex Kriuchykhin	d475197e65	Merge pull request #1396 from okriuchykhin/ok_SCI_2882 ... Fix handsontable initialization [SCI-2882]	2018-11-26 15:19:23 +01:00
Oleksii Kriuchykhin	d67abfda2c	Additional fixies for smart annotations [SCI-2880]	2018-11-26 15:17:18 +01:00
Jure Grabnar	7812f70c2f	Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix ... Protocols - import from protocols.io doesn't work	2018-11-26 14:56:25 +01:00
mlorb	18d9ab5888	fixes upon @Ducz0r request	2018-11-26 14:23:26 +01:00
Oleksii Kriuchykhin	2e00f1546a	Fix handsontable initialization [SCI-2882]	2018-11-26 14:11:46 +01:00
Jure Grabnar	6ec2c99a28	Hound styling	2018-11-26 13:52:01 +01:00
Jure Grabnar	0086e4dcf3	Catch some of templates error when import protocols.io	2018-11-26 13:43:05 +01:00
Luka Murn	eb2bf184b2	Merge pull request #1394 from Ducz0r/lm-sci-2884-fix ... Update export email's look & feel [SCI-2884]	2018-11-26 11:50:31 +01:00
Jure Grabnar	c7d108ec16	Update according to Hound ... Closes [SCI-2790]	2018-11-23 20:52:07 +01:00
Jure Grabnar	1c7a051551	Catch all errors on PIO import and show message	2018-11-23 20:47:48 +01:00
Jure Grabnar	2834edb286	Add command/subprotocol/safety for PIO	2018-11-23 20:13:34 +01:00
Jure Grabnar	c00b08b101	Add sw_package and dataset component for PIO	2018-11-23 19:44:10 +01:00
Jure Grabnar	5ab2556632	Importing of protocols now works	2018-11-23 18:54:37 +01:00
Jure Grabnar	2c8a7f8eca	Add last_modified evaluation for PIO import	2018-11-23 17:51:47 +01:00
Jure Grabnar	87d5e5029a	Fix publish_date in PIO import	2018-11-23 17:37:26 +01:00
Luka Murn	87ff7c71e3	Update the delivery email look & feel ... Closes SCI-2884.	2018-11-23 17:24:10 +01:00
Jure Grabnar	76c2da4bae	Add uniq tables	2018-11-23 16:30:29 +01:00
mlorb	f61187dd18	Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows	2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin	b926cadba4	Fix smartannotations rendering issues [SCI-2880]	2018-11-23 15:07:08 +01:00
Luka Murn	af307eae73	Move some text into localization file	2018-11-23 11:12:10 +01:00
Luka Murn	d071454fc8	Remove byebug from HTML template ... Closes SCI-2883.	2018-11-23 10:31:41 +01:00
Alex Kriuchykhin	95e19e1229	Merge pull request #1381 from okriuchykhin/ok_SCI_2859 ... Refactor & restyle the API authorization screen [SCI-2859]	2018-11-22 13:06:13 +01:00
mlorb	de803e70a8	Merge pull request #1385 from mlorb/ml-sci-2866 ... Fix in app help window does not close in some cases [SCI-2866]	2018-11-22 10:48:52 +01:00
mlorb	4ace5bf49f	Merge pull request #1384 from mlorb/ml-sci-2846 ... Fix teams switch not working at navigating from task [SCI-2846]	2018-11-22 10:48:33 +01:00
Alex Kriuchykhin	f811afc7e2	Merge pull request #1387 from okriuchykhin/ok_SCI_2877 ... Fix comments form for new results [SCI-2877]	2018-11-22 10:28:09 +01:00
Oleksii Kriuchykhin	6cd033767c	Fix comments form for new results [SCI-2877]	2018-11-21 23:48:43 +01:00
Oleksii Kriuchykhin	df938a8ba5	Fix task tags modal [SCI-2875]	2018-11-21 22:24:12 +01:00
Alex Kriuchykhin	afe5db5cf3	Merge pull request #1382 from okriuchykhin/ok_SCI_2872 ... Change text color on project cards tabs [SCI-2872]	2018-11-21 10:59:03 +01:00
mlorb	39b01bc8ed	fix in app help window does not close in some cases	2018-11-21 10:19:41 +01:00
mlorb	8bf1056bf5	fix teams switch not working at navigating from task	2018-11-21 10:12:21 +01:00
Alex Kriuchykhin	c3ef391641	Merge pull request #1380 from okriuchykhin/ok_SCI_2869 ... Prevent user being added to project/task multiple times [SCI-2869]	2018-11-20 22:38:38 +01:00
mz3944	6b996fc000	Merge pull request #1362 from mz3944/mz-SCI-2817 ... Export - various small changes/fixes [SCI-2817]	2018-11-20 21:32:47 +01:00
mz3944	4d460d14ea	Merge pull request #1378 from mz3944/mz-SCI-2861 ... All users in smart annotation have removed in brackets [SCI-2861]	2018-11-20 21:22:23 +01:00
mz3944	a9eb2fc249	Merge pull request #1377 from mz3944/mz-SCI-2863 ... Fix DataTable display for protocol modal [SCI-2863]	2018-11-20 21:21:29 +01:00
Oleksii Kriuchykhin	59fb971394	Change text color on project cards tabs [SCI-2872]	2018-11-20 17:31:27 +01:00
Oleksii Kriuchykhin	d98f11abdc	Refactor & restyle the API authorization screen [SCI-2859]	2018-11-20 17:02:45 +01:00
Oleksii Kriuchykhin	5deaf25fd9	Prevent user being added to project/task multiple times [SCI-2869]	2018-11-20 14:29:33 +01:00
Alex Kriuchykhin	a6bc02a2cb	Merge pull request #1369 from okriuchykhin/ok_SCI_2830 ... Refactor result and step comments [SCI-2830]	2018-11-20 00:13:15 +01:00
Oleksii Kriuchykhin	b7ccfccfe0	Imrove tags update behaviour on canvas [SCI-2830]	2018-11-19 11:48:53 +01:00
mlorb	3b96a60938	Merge pull request #1374 from mlorb/ml-sci-2842 ... Update the Export all confirmation modal and export interaction [SCI-2842]	2018-11-19 11:36:08 +01:00
Alex Kriuchykhin	d524a1d508	Merge pull request #1364 from okriuchykhin/ok_SCI_2778 ... Add time format selection to settings [SCI-2778]	2018-11-19 10:17:09 +01:00
Matej Zrimšek	c144d599fc	Fix user smart annotation showing as if the user is removed from team [SCI-2861]	2018-11-19 08:02:25 +01:00
Matej Zrimšek	716e74ceb4	Fix DataTable display for protocol modal [SCI-2863]	2018-11-19 07:21:29 +01:00
Matej Zrimšek	dea4ed4e15	Add model name to the archive folders in export-all ZIP structure [SCI-2817]	2018-11-19 04:46:33 +01:00
mlorb	4b540958bd	change close/cancel button and refactor export_project_modal endpoint	2018-11-16 13:37:32 +01:00
mlorb	6453ab6fb1	update the Export all confirmation modal and export interaction	2018-11-15 15:53:58 +01:00
Oleksii Kriuchykhin	7642d8d472	Fix sorting on projects table [SCI-2860]	2018-11-15 10:36:37 +01:00
Luka Murn	e9c0b34662	Merge branch 'core-api' into 'master' ... Conflicts: Gemfile app/services/api.rb config/initializers/api.rb config/initializers/extends.rb config/routes.rb db/schema.rb spec/controllers/api/api_controller_spec.rb	2018-11-14 16:59:04 +01:00
Alex Kriuchykhin	324069c071	Merge pull request #1370 from okriuchykhin/ok_SCI_2853 ... Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]	2018-11-14 13:51:43 +01:00
Oleksii Kriuchykhin	3fd687161f	Remove unused variables from activities controller [SCI-2778]	2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin	537de596a7	Merge latest master [SCI-2778]	2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin	c44109958a	Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]	2018-11-14 12:56:04 +01:00
Oleksii Kriuchykhin	380a96dcce	Add caching for step and result fragments [SCI-2830]	2018-11-14 11:57:53 +01:00
Luka Murn	98a39ecd72	Fix visual bug (everything bold) on projects index page ... Bug was introduced in projects absent section, there was no closing </strong> tag.	2018-11-14 11:33:27 +01:00
Luka Murn	c0940b143a	Fix root page bug introduced with merge features/core-api -> master	2018-11-13 21:24:20 +01:00
mz3944	056efe170b	Merge pull request #1358 from mz3944/mz-SCI-2646 ... Removal of the temporary files for export all [SCI-2646]	2018-11-13 20:31:04 +01:00
Oleksii Kriuchykhin	fb309a12b9	Refactor result and step comments initialization [SCI-2830]	2018-11-13 16:57:42 +01:00
Luka Murn	84df2c81f9	Merge branch 'features/export-all' ... Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb	2018-11-13 09:14:02 +01:00
Alex Kriuchykhin	b16646b0b4	Merge pull request #1366 from okriuchykhin/ok_SCI_2839 ... Improve Export All button behaviour [SCI-2839]	2018-11-12 17:32:33 +01:00
Oleksii Kriuchykhin	98d1ea8542	Improve Export All button behaviour [SCI-2839]	2018-11-12 15:51:03 +01:00
Oleksii Kriuchykhin	145c66a834	Fix user counters on projects overview page [SCI-2847]	2018-11-12 11:52:38 +01:00
Oleksii Kriuchykhin	e89d60785f	Fix dates on activities and experiments [SCI-2778]	2018-11-12 10:26:48 +01:00
Matej Zrimšek	57dbd63aa3	Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817]	2018-11-12 01:34:00 +01:00
Oleksii Kriuchykhin	8d0dbc7076	Add time format selection to settings [SCI-2778]	2018-11-09 16:19:40 +01:00
mlorb	75875e5421	fix user_project manage permission	2018-11-09 11:36:44 +01:00
Alex Kriuchykhin	eb72ea69dd	Merge pull request #1361 from okriuchykhin/ok_SCI_2785_v2 ... Improve counters on projects overview table [SCI-2785]	2018-11-09 09:37:41 +01:00
Matej Zrimšek	2a5b36b3c2	Fix index/position for export-all folder names [SCI-2817]	2018-11-09 01:21:30 +01:00
Matej Zrimšek	6ff117d662	Fix path creation and construction for export-all [SCI-2817]	2018-11-09 00:44:17 +01:00
Matej Zrimšek	f23160ba6d	Refactor logic for handling model path in export-all [SCI-2817]	2018-11-08 23:23:23 +01:00
Matej Zrimšek	58b2310d26	Add archived models in corresponding archive directory [SCI-2817]	2018-11-08 23:21:25 +01:00
Matej Zrimšek	efb4e0c549	Change indexing in task names in export-all PDF [SCI-2817]	2018-11-08 21:48:09 +01:00
Matej Zrimšek	dc91be3749	Preserve task order from project sidebar in export-all file structure [SCI-2817]	2018-11-08 21:48:09 +01:00
Matej Zrimšek	08396b2101	Make folder and file names more readable for export-all ZIP [SCI-2817]	2018-11-08 21:48:09 +01:00
Matej Zrimšek	d65fcdc312	Change datetime to human friendly format for ZIP exports [SCI-2817]	2018-11-08 21:48:09 +01:00
Matej Zrimšek	159f6d1ee2	Minor refactoring of exports [SCI-2646]	2018-11-08 21:39:09 +01:00
Matej Zrimšek	b7fdd82409	Ensure temp files deletion after export is done [SCI-2646]	2018-11-08 21:32:07 +01:00
mlorb	a56d22a329	change count to size	2018-11-08 09:43:32 +01:00
Oleksii Kriuchykhin	1feb13c74a	Improve counters on projects overview table [SCI-2785]	2018-11-07 22:27:57 +01:00
Oleksii Kriuchykhin	23ee4760ae	Fix failing tests [SCI-2773]	2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin	30885e060d	Merge latest core-api branch [SCI-2773]	2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin	60e78fa868	Improve code style for error handling [SCI-2773]	2018-11-07 15:43:44 +01:00
mlorb	4d156080ac	fix empty projects page bug and projects tree bug	2018-11-07 13:45:46 +01:00
mlorb	039faf2964	Merge pull request #1359 from mlorb/ml-sci-2843 ... Fix bug with new project button not working [SCI-2843]	2018-11-07 11:02:47 +01:00
Oleksii Kriuchykhin	82a11ebca2	Remove duplicate destroy for report [SCI-2834]	2018-11-07 09:55:06 +01:00
Matej Zrimšek	2f6a6072e1	Fix repository ZIP export test to work with enabled workers [SCI-2646]	2018-11-07 06:14:40 +01:00
Matej Zrimšek	8fe0249f45	Fix test for repository ZIP export & return path for ZIP exports [SCI-2646]	2018-11-07 05:04:29 +01:00
mlorb	63e039e235	fix bug with new project button not working	2018-11-06 11:38:31 +01:00
Oleksii Kriuchykhin	0e192cc830	Ensure that temporary report is always deleted [SCI-2834]	2018-11-06 09:33:18 +01:00
Matej Zrimšek	ee611a45d9	Also remove temp file after other types of ZIP export generation [SCI-2646]	2018-11-04 01:39:16 +01:00
Matej Zrimšek	5defbdd76e	Remove temp files after export-all ZIP generation [SCI-2646]	2018-11-04 01:33:50 +01:00
mlorb	ad5f4c2ebb	Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint ... Remove show protocol api endpoint	2018-10-30 14:04:17 +01:00
Oleksii Kriuchykhin	daaeb385bb	Fix permission helpers in delayed export job [SCI-2834]	2018-10-30 14:04:01 +01:00
Alex Kriuchykhin	2f466383a5	Merge pull request #1333 from okriuchykhin/ok_SCI_2742 ... RESTful API for Object Querying (READ) - unit tests [SCI-2742]	2018-10-29 16:26:58 +01:00
Alex Kriuchykhin	126fa03305	Merge pull request #1349 from okriuchykhin/ok_SCI_2818 ... Fix project index endpoint permission bug [SCI-2818]	2018-10-29 14:59:22 +01:00
Alex Kriuchykhin	1083ce61fb	Merge pull request #1352 from okriuchykhin/ok_SCI_2814 ... Rename user_id to sub in JWT [SCI-2814]	2018-10-29 14:54:00 +01:00
Alex Kriuchykhin	d0804c8969	Merge pull request #1350 from okriuchykhin/ok_SCI_2821 ... Fix relationships in activities serializer [SCI-2821]	2018-10-29 14:53:15 +01:00
Alex Kriuchykhin	098b18b405	Merge pull request #1348 from okriuchykhin/ok_SCI_2782 ... Fix inventory column creation permission check [SCI-2782]	2018-10-29 14:52:57 +01:00
Alex Kriuchykhin	4320af794b	Merge pull request #1353 from okriuchykhin/ok_SCI_2771 ... Fix API endpoints that return file URLs [SCI-2771]	2018-10-29 13:44:55 +01:00
Alex Kriuchykhin	2b4ef619c2	Merge pull request #1345 from okriuchykhin/ok_SCI_2785 ... Show all experiments and tasks for archived projects [SCI-2785]	2018-10-29 11:56:38 +01:00
mlorb	0f8c80172e	remove show protocol api endpoint	2018-10-29 11:21:48 +01:00
Alex Kriuchykhin	c1d853f7bd	Merge pull request #1344 from okriuchykhin/ok_SCI_2783 ... Fix issue with project dropdown caching [SCI-2783]	2018-10-29 10:56:02 +01:00
Oleksii Kriuchykhin	5708e9bbe7	Fix project start day in serializer [SCI-2820]	2018-10-28 19:02:44 +01:00
Oleksii Kriuchykhin	d1e6c64d5e	Fix API endpoints that return file URLs [SCI-2771]	2018-10-28 18:39:34 +01:00
mz3944	d733f4e357	Merge pull request #1346 from mz3944/mz-SCI-2787 ... In project list table table is not updated when archiving/restoring project [SCI-2787]	2018-10-28 14:36:17 +01:00
Oleksii Kriuchykhin	04ff5870af	Rename user_id to sub in JWT [SCI-2814]	2018-10-28 14:34:51 +01:00
Jure Grabnar	0977f5251d	Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export ... Fix zero limit config on export all	2018-10-28 13:38:21 +01:00
Jure Grabnar	cab0b78afa	Fix zero limit config on export all	2018-10-28 09:43:34 +01:00
Oleksii Kriuchykhin	012447d762	Fix relationships in activities serializer [SCI-2821]	2018-10-26 17:30:04 +02:00
Oleksii Kriuchykhin	9ad2718f32	Fix project index endpoint permission bug [SCI-2818]	2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin	93e7c3f390	Fix inventory column creation permission check [SCI-2782]	2018-10-26 14:38:47 +02:00
Alex Kriuchykhin	802290df8b	Merge pull request #1343 from okriuchykhin/ok_SCI_2826 ... Skip missing files in assets [SCI-2826]	2018-10-26 14:23:23 +02:00
Alex Kriuchykhin	b51f064c28	Merge pull request #1347 from okriuchykhin/ok_SCI_2756 ... Remove double initialization of comments on steps [SCI-2756]	2018-10-26 14:19:58 +02:00
Jure Grabnar	7d2f2c3b5f	Merge pull request #1337 from jbargu/jg_bug_sci_2805 ... Add can_export_project? permission to allow archived projects to be exported [SCI-2805]	2018-10-26 11:23:57 +02:00
mz3944	ee2cc90825	Merge pull request #1324 from mz3944/mz-SCI-2732 ... Export all - Projects view - projects endpoints (unit tests) [SCI-2732]	2018-10-26 11:20:09 +02:00
Jure Grabnar	04b1d0e142	Remove blank line	2018-10-26 11:00:13 +02:00
Jure Grabnar	3903b4a6f2	Refactor read_project/export_project permissions	2018-10-26 10:58:59 +02:00
Alex Kriuchykhin	f581829357	Merge pull request #1339 from okriuchykhin/ok_SCI_2804 ... Fix relative links to files in export all PDF [SCI-2804]	2018-10-26 10:57:04 +02:00
Oleksii Kriuchykhin	6e6bb73d2f	Remove double initialization of comments on steps [SCI-2756]	2018-10-26 09:29:42 +02:00
Matej Zrimšek	6447750ff7	Fix showing projects in table view when all are archived [SCI-2787]	2018-10-25 22:31:00 +02:00
Alex Kriuchykhin	ababa0b157	Merge pull request #1340 from okriuchykhin/ok_SCI_2793 ... Fix helpers to use with export all [SCI-2793]	2018-10-25 16:55:39 +02:00
Oleksii Kriuchykhin	e9a8826a1e	Show all experiments and tasks for archived projects [SCI-2785]	2018-10-24 18:49:59 +02:00
Oleksii Kriuchykhin	641d74829a	Fix issue with project dropdown caching [SCI-2783]	2018-10-24 17:52:40 +02:00
Oleksii Kriuchykhin	744ad5b196	Skip missimg files in assets [SCI-2826]	2018-10-24 14:58:59 +02:00
Luka Murn	42793d25b7	Add bottom padding to sign in/up/forgot password pages ... Closes SCI-2764.	2018-10-24 13:57:58 +02:00
Luka Murn	95340bcf36	Update team name placeholder & sublabel on sign up pages	2018-10-24 13:43:56 +02:00
Oleksii Kriuchykhin	990d3a34ca	Fix link to inventory CSV file [SCI-2804]	2018-10-24 12:59:04 +02:00
Matej Zrimšek	c89488e105	Fix displaying projects when all are archived [SCI-2787]	2018-10-24 03:34:13 +02:00
Matej Zrimšek	43fdab561f	Fix project archiving and restoring edge case [SCI-2787]	2018-10-24 01:37:57 +02:00
Matej Zrimšek	18e52e2c6f	Fix fetching all user projects [SCI-2787]	2018-10-24 00:29:30 +02:00
Matej Zrimšek	c8d170f9ec	Add default page size when it's not in request params when fetching projects	2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin	b53f2c8347	Improve error messages in API [SCI-2773]	2018-10-23 17:52:48 +02:00
Oleksii Kriuchykhin	81d751974d	Fix helpers to use with export all [SCI-2793]	2018-10-22 14:32:10 +02:00
Oleksii Kriuchykhin	83566cc9d5	Fix relative links to files in export all PDF [SCI-2804]	2018-10-19 16:25:43 +02:00
Alex Kriuchykhin	e9b64b65a3	Merge pull request #1330 from okriuchykhin/ok_SCI_2770 ... Add request rate throttling for API [SCI-2770]	2018-10-19 09:38:31 +02:00
Jure Grabnar	bd5a2a43fd	Add can_export_project? permission ... Closes [SCI-2805].	2018-10-19 08:41:39 +02:00
mlorb	e5fca1b1cd	change the rich text max limit on frontend to 50000	2018-10-18 14:22:15 +02:00
Alex Kriuchykhin	18b1cad8a4	Merge pull request #1334 from okriuchykhin/ok_SCI_2772 ... Implement inventory column data type name mappings [SCI-2772]	2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin	e4e66d3e5d	Merge branch 'core-api' into ok_SCI_2742	2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin	02f536cd08	Merge latest features/export-all [SCI-2733]	2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin	ed46115b3f	Implement inventory column data type name mappings [SCI-2772]	2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin	f6b039d54e	Merge latest core-api branch [SCI-2765]	2018-10-16 12:07:47 +02:00
Jure Grabnar	c13e7531ea	Change generate_team method name	2018-10-16 11:13:01 +02:00
Jure Grabnar	447cad083d	Fix formatting according to HoundBot	2018-10-16 11:01:58 +02:00
Jure Grabnar	d50f56e319	Disable/enable export proejct button ... Fix filesystem saving	2018-10-16 11:01:58 +02:00
Jure Grabnar	ed16e8d479	Fix reviewers errors	2018-10-16 11:00:38 +02:00
Jure Grabnar	6b47165ac1	Fix formatting according to Houndbot	2018-10-16 11:00:38 +02:00
Jure Grabnar	2558b7a313	Fix formatting according to HoundBot	2018-10-16 11:00:38 +02:00
Jure Grabnar	26df1e5a98	Add export project modal ... Closes [SCI-2645]	2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin	0db9ef44e2	Add experiment, task, result READ endpoints tests [SCI-2742]	2018-10-15 16:27:22 +02:00
Luka Murn	1093ea11f4	Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes ... Conflicts: app/serializers/api/v1/activity_serializer.rb app/serializers/api/v1/inventory_column_serializer.rb app/serializers/api/v1/project_serializer.rb	2018-10-15 15:20:26 +02:00
Jure Grabnar	b9bb0db62d	Merge pull request #1314 from mz3944/mz-SCI-2752 ... Render SciNote tables within exported PDF as using HTML Tables [SCI-2752]	2018-10-15 10:03:42 +02:00
Jure Grabnar	ab71471a49	Fix inventories attachment/CSV file path	2018-10-15 08:55:00 +02:00
Matej Zrimšek	ef5bf42fc2	Refactor table styling for export all PDF; remove 'min-width' from table cells to also display bigger tables nicely	2018-10-15 08:00:04 +02:00
Matej Zrimšek	7fe6837206	Style tables in export all PDF (in same way as in PDF reports) [SCI-2752]	2018-10-15 07:59:28 +02:00
Matej Zrimšek	97e6fe34a1	Add unstyled tables to the export all PDF [SCI-2752]	2018-10-15 07:58:44 +02:00
Matej Zrimšek	46da1e6b7d	Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641]	2018-10-15 07:13:41 +02:00
Matej Zrimšek	9fb5520970	Refactor/match exported filenames in export all PDF [SCI-2641]	2018-10-15 05:54:19 +02:00
Matej Zrimšek	17380ba0ca	Refactoring rebased code [SCI-2641]	2018-10-15 01:12:25 +02:00
Matej Zrimšek	1bf16537f6	Add PDF content to the export all ZIP [SCI-2641]	2018-10-14 23:56:10 +02:00
Matej Zrimšek	48a6a64502	Move PDF generation and export logic of export all PDF to the model	2018-10-14 22:52:54 +02:00
Oleksii Kriuchykhin	1cafbd8c50	Move generic code to Viewable Concern [SCI-2733]	2018-10-12 16:14:24 +02:00
Oleksii Kriuchykhin	f221d71bbc	Fix datatables state restore [SCI-2733]	2018-10-12 15:15:43 +02:00
Matej Zrimšek	69f3a919db	Some specification and syntax fixes [SCI-2641]	2018-10-12 07:42:17 +02:00
Matej Zrimšek	e242e9a516	Refactor export all PDF content generation [SCI-2641]	2018-10-12 07:40:22 +02:00
Matej Zrimšek	67d51a8880	Refactor ReportsHelper#render_report_element	2018-10-12 07:40:22 +02:00
Matej Zrimšek	aa30cf6130	Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641]	2018-10-12 07:40:22 +02:00
Matej Zrimšek	1575da6edb	Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641]	2018-10-12 07:40:22 +02:00
Matej Zrimšek	d970576d60	Switch between generating report PDF and export all PDF [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	a16d16bc5b	Move export all report business logic to model [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	5ce94b5ecd	Remove dynamically created export all report after it's no longer needed	2018-10-12 07:40:21 +02:00
Matej Zrimšek	476b6d50a2	Create export all PDF when it's needed [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	c0dc4f6951	Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	ed6dfc90b0	Also shorten too long folder names, fix filename shortening [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	7152d2f0f1	Fix/update file naming convection for exported files [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	d598bb8366	Make relative links work in export all PDF [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	6f77c4772c	Minor fix for assets & tables naming in export all PDF	2018-10-12 07:40:21 +02:00
Matej Zrimšek	0ebce8e283	Add relative links (not working) to files and tables into the PDF [SCI-2641]	2018-10-12 07:40:21 +02:00
Matej Zrimšek	b15cc66b2f	Add export project PDF for dummy project	2018-10-12 07:40:21 +02:00
Luka Murn	1e46631c02	Merge pull request #1316 from czbiohub/mc-SCI-2700 ... close sci-2700; add unit tests for inventory column update [SCI-2700]	2018-10-11 10:20:15 +02:00
Luka Murn	c11345d6a1	Minorly update inventory_column_serializer so tests pass	2018-10-11 09:49:54 +02:00
Oleksii Kriuchykhin	8cf59d8d22	Add request rate throttling for API [SCI-2770]	2018-10-11 09:48:06 +02:00
Luka Murn	a217b11bba	Merge pull request #1298 from Zanz2/zz_projects_api_task_2539 ... Created read endpoint for projects and related models [SCI-2539]	2018-10-11 09:03:18 +02:00
Luka Murn	c0f47f03b7	Hound is love, Hound is life	2018-10-11 08:51:14 +02:00
Luka Murn	dd4f7b5d02	Fix project users, activities, comments, reports endpoints	2018-10-10 17:35:09 +02:00
Zanz2	4dc1320988	Merge pull request #1326 from Zanz2/zz_pio_upload_button_sci2760 ... Disabled turbolinks in left navigation bar protocols button [SCI-2760]	2018-10-10 17:14:15 +02:00
Oleksii Kriuchykhin	bf80aa12a7	Fix failing test [SCI-2765]	2018-10-10 17:00:53 +02:00
Oleksii Kriuchykhin	af02f29fb5	Implement user state saving for projects overview [SCI-2733]	2018-10-10 16:15:31 +02:00
Alex Kriuchykhin	16b29b50a5	Merge pull request #1321 from okriuchykhin/ok_SCI_2731 ... Add Projects view - list/table view [SCI-2731]	2018-10-08 17:53:35 +02:00
Oleksii Kriuchykhin	7a591273a3	Remove unused variables [SCI-2731]	2018-10-08 13:45:26 +02:00
Oleksii Kriuchykhin	77e2371091	Add tests for inventory cell endpoints [SCI-2765]	2018-10-08 13:25:03 +02:00
Luka Murn	a8d56d32e2	Hound is love, Hound is life	2018-10-07 13:28:29 +02:00
Luka Murn	7527dc7352	Fix READ index, READ show, POST create /tasks/:id/results endpoints	2018-10-07 12:58:17 +02:00
Luka Murn	fc5cf33614	Fix GET /tasks/:id/activities endpoint	2018-10-07 11:54:11 +02:00
Luka Murn	fca580face	Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints	2018-10-07 11:35:12 +02:00
Luka Murn	239b974fa0	Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts	2018-10-07 11:29:56 +02:00
Luka Murn	24299ef4c0	Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts	2018-10-07 11:10:41 +02:00
Luka Murn	98544f00e8	Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts	2018-10-07 10:20:01 +02:00
Luka Murn	94e80edc9b	Minor variable rename in task_groups_controller.rb	2018-10-07 10:16:00 +02:00
Luka Murn	f56e5b1e5a	Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts	2018-10-07 10:07:37 +02:00
Luka Murn	0de3c7eb4e	Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb	2018-10-07 09:45:24 +02:00
Luka Murn	0643ba216e	Fix GET /connections, /connections/:id endpoints	2018-10-07 00:53:39 +02:00
Luka Murn	c9a15db85f	Fix GET /task_groups endpoints	2018-10-06 20:11:01 +02:00
Luka Murn	d235dd7807	Update GET /inventory_items, GET /inventory_items/:id endpoints	2018-10-06 18:37:40 +02:00
Luka Murn	9e78de6ef2	Update CREATE, PATCH, DELETE inventory_column endpoints	2018-10-06 17:11:59 +02:00
Luka Murn	6625b4019e	Update GET /inventory_columns, GET /inventory_columns/:id endpts	2018-10-06 13:47:41 +02:00
Zanz2	cfe5801856	Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue	2018-10-06 12:56:13 +02:00
Luka Murn	eaa8a627a8	Update GET /inventories, GET /inventories/:inventory_id endpoints	2018-10-06 12:39:44 +02:00
Luka Murn	6faaff550b	Update GET /teams, GET teams/:team_id endpoints slightly	2018-10-06 12:18:57 +02:00
Jure Grabnar	d7c875135e	Merge pull request #1304 from jbargu/jg_zipfile_structure ... Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]	2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin	0c452f519d	Add CRUD endpoints for inventory cells [SCI-2765]	2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin	363c1e4a34	Add endpoints for managing inventory list items [SCI-2741]	2018-10-03 13:54:52 +02:00
Oleksii Kriuchykhin	ba58eec2e2	Merge latest features/export-all [SCI-2731]	2018-10-03 11:04:44 +02:00
Oleksii Kriuchykhin	53874c4680	Fix Hound config and CSS code styling [SCI-2730]	2018-10-03 10:39:22 +02:00
Luka Murn	21a24dc98b	Fix invite users modal to display tooltips in all variants ... Closes SCI-2759.	2018-10-02 17:55:39 +02:00
Oleksii Kriuchykhin	7d995189bd	Fixies after code review [SCI-2730]	2018-10-02 14:24:44 +02:00
Luka Murn	d71be76657	Fix minor styling & text on settings - preferences page	2018-10-02 13:59:19 +02:00
Luka Murn	c079f16d58	Fix the tooltips positioning on canvas	2018-10-02 13:50:26 +02:00
Luka Murn	9632d1cd01	Set tooltips initialization to comply with turbolinks ... Also add custom styling options as another data attribute.	2018-10-02 13:49:19 +02:00
Luka Murn	c12f77d1d1	Fix styling (ESLint) on tooltip_helper.js	2018-10-02 11:25:51 +02:00
Oleksii Kriuchykhin	492a5de19e	Add Projects view - list/table view [SCI-2731]	2018-10-01 15:39:42 +02:00
Jure Grabnar	553ac4c360	Refactor code according to PR review ... PR review: https://github.com/biosistemika/scinote-web/pull/1304 Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].	2018-09-30 16:37:18 +02:00
Zanz2	ada98e9eaf	Merge pull request #1289 from Zanz2/step_save_table_too_long_bug_sci2719 ... Fixed bug with table name of step not being length validated [SCI-2719]	2018-09-28 14:37:08 +02:00
Zanz2	16f9728a05	fixed to not use gon gem	2018-09-28 14:26:05 +02:00
Zanz2	c6936bc71e	fixed the implementation according to PR review, now validates all table names, when multiple are present, and uses gon gem	2018-09-28 13:13:25 +02:00
Oleksii Kriuchykhin	2508394924	Refactor Projects view - cards view [SCI-2730]	2018-09-27 10:43:44 +02:00
Zanz2	2e0c40ed45	fixed merge	2018-09-26 12:20:13 +02:00
Zanz2	c8ed808920	merged with core-api	2018-09-26 12:17:49 +02:00
Zanz2	1a512698e8	Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2 ... ( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]	2018-09-26 12:04:09 +02:00
Alex Kriuchykhin	112343e65d	Merge pull request #1311 from okriuchykhin/ok_SCI_2738 ... Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]	2018-09-25 11:49:19 +02:00
Oleksii Kriuchykhin	f8388d4bcd	Merge branch 'ok_SCI_2729' into ok_SCI_2730	2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin	e06684b7cf	Few fixes after review [SCI-2718]	2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin	ab3aeac26b	Merge latest core-api branch [SCI-2718]	2018-09-24 16:49:27 +02:00
Oleksii Kriuchykhin	80e73bfb97	Implement Projects view - navigation bar (tabs) [SCI-2729]	2018-09-24 16:25:04 +02:00
Luka Murn	63b4f7d909	Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 ... Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]	2018-09-24 16:23:53 +02:00
Luka Murn	2396149c57	Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663 ... Added toggle checkbox for tooltips help in prefferences [SCI-2663]	2018-09-24 16:23:28 +02:00
Zanz2	87d2b0db14	fixed accordign to pr review	2018-09-24 15:57:31 +02:00
Zanz2	8699761389	Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667 ... Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]	2018-09-24 15:31:47 +02:00
Zanz2	e5b7d68031	this should fix travis ci	2018-09-24 13:33:44 +02:00
Zanz2	1e8442e22e	fixed pull request review, forgot some small thing	2018-09-24 12:50:11 +02:00
Zanz2	1a9890ee0f	fixed pull request review	2018-09-24 12:48:53 +02:00
Alex Kriuchykhin	b38e85c282	Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2 ... Fix CREATE inventory endpoint [SCI-2693]	2018-09-24 10:51:13 +02:00
Jure Grabnar	872a1211bb	Format according to Houndbot #3	2018-09-23 18:58:56 +02:00
Jure Grabnar	d6f7ec2604	Format according to houndbot #2	2018-09-23 18:53:43 +02:00
Jure Grabnar	869967361c	Fix according to Houndbot	2018-09-23 18:48:44 +02:00
Jure Grabnar	7877d559a3	Update email/notification, type: deliver ... Closes [SCI-2643], [SCI-2644].	2018-09-23 18:45:13 +02:00
Jure Grabnar	59169f882d	Add permission check for every project	2018-09-23 14:34:21 +02:00
Jure Grabnar	6106904460	Format according to Houndbot #5	2018-09-23 12:07:53 +02:00
Jure Grabnar	90b220ddda	Format according to Houndbot #4	2018-09-23 12:06:06 +02:00
Jure Grabnar	970341e7d7	Format according to Houndbot #3	2018-09-23 11:56:23 +02:00
Jure Grabnar	a3d7d37081	Format according to Hound bot #2	2018-09-23 11:30:20 +02:00
Zanz2	b536aa6f3e	Merge pull request #1287 from Zanz2/zz_dropdown_blue_sci2672 ... Fixed blue block in dropdown, now its a full line [SCI-2672]	2018-09-23 11:27:00 +02:00
Jure Grabnar	64a6ed7ffe	Format according to houndbot	2018-09-23 11:14:59 +02:00
Oleksii Kriuchykhin	7f7ece2be0	Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]	2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin	84428b37c2	Add project view JSON endpoints [SCI-2728]	2018-09-21 10:39:20 +02:00
Luka Murn	5d6881bae1	Merge pull request #1309 from biosistemika/release-1.14.5 ... Merge release-1.14.5 into master	2018-09-20 08:53:51 +02:00
Luka Murn	32e068f298	Merge pull request #1307 from biosistemika/release-1.14.4 ... Merge release-1.14.4 into release-1.14.5	2018-09-19 15:29:57 +02:00
Oleksii Kriuchykhin	872a48082a	Remove Samples from search controller [SCI-2739]	2018-09-18 15:03:19 +02:00
Oleksii Kriuchykhin	4ee9eb3134	Improve search speed on files and inventories [SCI-2739]	2018-09-17 17:06:47 +02:00
Jure Grabnar	d783c34d33	Clean some minor artefacts	2018-09-16 23:52:36 +02:00
Jure Grabnar	d40096f663	Remove typo and add hyperlink to inventories	2018-09-16 23:45:38 +02:00
Jure Grabnar	f8b1db7f72	Fix repository export and relative hyperlinks	2018-09-16 23:01:44 +02:00
Zanz2	5b955da74c	makes tooltip behaviour more reliable and less erratic	2018-09-16 21:34:36 +02:00
Jure Grabnar	06eaafd118	Suffix should append to basename first and then extension	2018-09-16 20:57:37 +02:00
Jure Grabnar	449aa12070	Refactor TeamZipExport code (move it into special file)	2018-09-16 20:28:26 +02:00
Zanz2	07757e382a	fixed hound	2018-09-14 13:43:31 +02:00
Zanz2	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Oleksii Kriuchykhin	49e788a9ad	Mergre latest core-api [SCI-2515]	2018-09-14 10:24:05 +02:00
Luka Murn	f9d771d01a	Add minor comment	2018-09-13 14:50:00 +02:00
Luka Murn	0ddc3e0968	Merge pull request #1303 from biosistemika/release-1.14.4 ... Merge release-1.14.4 into master	2018-09-13 14:47:17 +02:00
Oleksii Kriuchykhin	acc00ff3b9	Add CREATE Result endpoint: Create Text result [SCI-2718]	2018-09-13 13:38:11 +02:00
Zanz2	e47acfb4a1	Fixed attribute names	2018-09-13 11:57:31 +02:00
Zanz2	81115f411a	Renaming my module attribute to tasks	2018-09-13 11:46:25 +02:00
Zanz2	46d33d28a3	standardized serializers by removing specified attributes	2018-09-13 11:38:29 +02:00
Zanz2	8ac1445ace	Fixed hound	2018-09-13 11:37:07 +02:00
Zanz2	7f704c07e3	Created base endpoints for projects and related models	2018-09-13 11:37:07 +02:00
Zanz2	dace81f724	created base projects endpoint	2018-09-13 11:37:07 +02:00
Zanz2	a9c0201fcc	Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629 ... Fixed disabled export button after new inventory item save [SCI-2629]	2018-09-13 11:35:07 +02:00
Zanz2	68385b36cc	removed attributes	2018-09-13 11:20:30 +02:00
Zanz2	23f74a5b9b	standardized serializers by removing specified attributes	2018-09-13 11:19:54 +02:00
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