1232 commits

Author	SHA1	Message	Date
Miha Mencin	9a30d7be9d	SCI-3232 renaming the attribute name so it doesnt get 'constantized'	2019-03-26 11:39:54 +01:00
Oleksii Kriuchykhin	e3a3ec4491	Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]	2019-03-25 17:38:13 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
Jure Grabnar	171b2eeedc	Remove the title of protocol steps when empty ... Closes SCI-3072	2019-03-25 09:36:56 +01:00
aignatov-bio	9fff93ab0e	Merge pull request #1576 from biosistemika/image-editor-prototype ... Feature/Image annotation	2019-03-22 16:31:00 +01:00
Anton Ignatov	4ec0a3c871	Update TinyMCE image loader for new fields	2019-03-22 10:52:26 +01:00
Anton Ignatov	bc58f0aecd	Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload	2019-03-21 11:48:51 +01:00
aignatov-bio	e8827b0d74	Update tags in task info [SCI-3093] (#1575) ... * Adding inline tags selection	2019-03-21 10:13:07 +01:00
Mojca Lorber	c55e314ed5	Refactor upon the review requests	2019-03-20 21:34:47 +01:00
Anton Ignatov	55c93922ea	markup fixes	2019-03-20 14:46:54 +01:00
Mojca Lorber	8f8f4aa250	Move and update the activities locales	2019-03-20 13:20:35 +01:00
Oleksii Kriuchykhin	0c2b7959b6	Fix smart annotations in RTE [SCI-3111]	2019-03-20 11:41:36 +01:00
Mojca Lorber	4f9814b884	Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021	2019-03-20 11:03:00 +01:00
Mojca Lorber	cd7a87348f	Protocol activities refactoring, without tests	2019-03-19 16:12:07 +01:00
Mojca Lorber	c476816359	Task activities refactoring, without tests	2019-03-19 15:33:57 +01:00
Mojca Lorber	7757096693	Results activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	1418abc8d7	Reports activities refactoring	2019-03-19 15:33:57 +01:00
Mojca Lorber	d1e38e5bc9	Project activities refactoring	2019-03-19 15:33:57 +01:00
Urban Rotnik	fe35c805b7	Add model breadcrumbs, update activities_helper	2019-03-19 14:01:06 +01:00
aignatov-bio	6eae12efab	Updating permission check for image editing [SCI - 3153, 3159] (#1568) ... *Add permission check for assets editing * Add check for image format	2019-03-19 13:52:57 +01:00
Oleksii Kriuchykhin	a822227383	Add rich text editor to task and protocol description [SCI-3062][SCI-3071]	2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin	645930b8d7	Merge branch 'master' into features/note-section	2019-03-14 16:25:51 +01:00
Luka Murn	fc4b271803	Fix stack trace trimming on WOPI middleware	2019-03-14 08:34:04 +01:00
Urban Rotnik	b33e95e18a	New Protocols actions logging	2019-03-12 09:14:53 +01:00
Urban Rotnik	32422c00eb	RepositoryRows actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	1a3c97b978	Add new enum values for Activity type_of	2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin	af94f79f0d	Submit image as FormData [SCI-2879]	2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin	37dc8298b7	Fix webpack config [SCI-2856]	2019-03-11 15:13:06 +01:00
Oleksii Kriuchykhin	9bbdc8fc89	Include tui image editor with webpack [SCI-2856]	2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin	80e525fd97	Improve image editor behaviour [SCI-2855]	2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin	89e968c410	Add tui.image-editor [SCI-2815]	2019-03-11 15:08:15 +01:00
Urban Rotnik	b8e84b5685	Add logic for saving message items values and types	2019-03-11 08:37:22 +01:00
Oleksii Kriuchykhin	e3bacd6b9a	Fix global activities page after refactoring [SCI-2994][SCI-3024]	2019-03-08 13:09:27 +01:00
Oleksii Kriuchykhin	0b87e8e1e4	Merge branch 'features/global-activities' into ok_SCI_3024_v3	2019-03-08 10:29:51 +01:00
Oleksii Kriuchykhin	0c99ea9c5c	Fix local storage file download links [SCI-3048]	2019-03-07 16:46:05 +01:00
aignatov-bio	ec2dbb897f	Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521) ... * Adding side pane filtering and top pane	2019-03-06 10:34:04 +01:00
aignatov-bio	125d2a3b9b	New inline tags editing in task [SCI 3093] (#1529) ... * Adding inline tags selection	2019-03-06 09:18:45 +01:00
Oleksii Kriuchykhin	0930277c4e	Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]	2019-02-27 16:02:53 +01:00
Urban Rotnik	3121bf1d39	Update tooltip for system notifications dropdown	2019-02-27 14:49:18 +01:00
Oleksii Kriuchykhin	74a60d443d	Merge branch 'features/global-activities' into ok_SCI_3014_v2	2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin	61147b480c	Add main global activities bussiness logic [SCI-3014]	2019-02-26 11:01:15 +01:00
Urban Rotnik	5a123d26ac	Activity model update	2019-02-26 07:15:05 +01:00
Miha Mencin	a93402d69f	sci-2992 routes	2019-02-25 16:50:38 +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
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
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	8768fcac6c	Copy change	2019-02-20 14:19:59 +01:00
Urban Rotnik	7b6c6c414d	Merge branch 'master' into features/templates	2019-02-19 14:46:15 +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
Urban Rotnik	d3d9868ba4	Set version for HTTParty dependency, add opts in mailer	2019-02-19 11:23:01 +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
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
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
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
Oleksii Kriuchykhin	cc92de3726	Merge latest features/templates [SCI-2939]	2019-01-30 10:43:54 +01:00
Urban Rotnik	863e3873c2	Comment for depricated NotificationType	2019-01-29 11:40:26 +01:00
Urban Rotnik	16e9a56874	Add recaptcha to invitation modal ... SCI-2935	2019-01-25 11:27:01 +01:00
Oleksii Kriuchykhin	bd2efa55ac	Add templates business logic [SCI-2939]	2019-01-25 10:55:08 +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	6cf4717ab3	Add envirnoments to run app without docker, reorder Gemfile ... - Reorder Gemfile into alphabet order (rule by Rubocop) - Add extra ENV variable for custom DB settings locally - Add extra ENV for disable spoof check on Paperclip	2019-01-18 16:01:09 +01:00
mlorb	7fdef4d3ec	Change experiment cards look and feel	2019-01-18 15:57:44 +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
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	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
Matej Zrimšek	8070b7f8b5	Fix Date and Time display formats on JS side	2019-01-08 08:07:24 +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
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
Alex Kriuchykhin	c536130cef	Merge pull request #1427 from okriuchykhin/ok_SCI_2864 ... Fix default value setting for rack attack [SCI-2864]	2018-12-17 15:30:54 +01:00
Oleksii Kriuchykhin	3277ab1422	Fix default value setting for rack attack [SCI-2864]	2018-12-17 15:15:56 +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
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
Oleksii Kriuchykhin	2c96f08b98	Refresh sidebar when project is archived/restored [SCI-2881]	2018-11-29 14:20:20 +01:00
Alex Kriuchykhin	32e9566915	Merge pull request #1401 from okriuchykhin/ok_SCI_2886 ... Improve error messages and fix task users/items endpoints [SCI-2886]	2018-11-28 18:24:53 +01:00
Alex Kriuchykhin	a4b75f00d2	Merge pull request #1400 from okriuchykhin/ok_SCI_2727 ... Make AWS access key variables optional [SCI-2727]	2018-11-28 14:45:45 +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
Oleksii Kriuchykhin	32d00cb2b9	Make AWS access key variables optional [SCI-2727]	2018-11-28 10:41:05 +01:00
Alex Kriuchykhin	5ce6a9babd	Merge pull request #1399 from okriuchykhin/ok_SCI_2727 ... Add subfolder option to S3 bucket config [SCI-2727]	2018-11-27 17:46:36 +01:00
Oleksii Kriuchykhin	32536db171	Add subfolder option to S3 bucket config [SCI-2727]	2018-11-27 14:58:34 +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
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
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	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
mlorb	4052fad9e0	fix hound	2018-11-23 15:51:18 +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
Luka Murn	af307eae73	Move some text into localization file	2018-11-23 11:12:10 +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
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
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
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
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
Oleksii Kriuchykhin	537de596a7	Merge latest master [SCI-2778]	2018-11-14 13:05:57 +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
Oleksii Kriuchykhin	8d0dbc7076	Add time format selection to settings [SCI-2778]	2018-11-09 16:19:40 +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	0f8c80172e	remove show protocol api endpoint	2018-10-29 11:21:48 +01:00
Oleksii Kriuchykhin	6d5af3da8f	Remove error message for index page and unauthenticated users [SCI-2775]	2018-10-28 23:19:06 +01:00
Luka Murn	95340bcf36	Update team name placeholder & sublabel on sign up pages	2018-10-24 13:43:56 +02:00
Matej Zrimšek	4bf1d904b7	Add project controller unit tests [SCI-2732]	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
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
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	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	26df1e5a98	Add export project modal ... Closes [SCI-2645]	2018-10-16 11:00:38 +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
Matej Zrimšek	17380ba0ca	Refactoring rebased code [SCI-2641]	2018-10-15 01:12:25 +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	c0dc4f6951	Add hyperlinks to inventories' *.csv files in export all PDF [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	0ebce8e283	Add relative links (not working) to files and tables into the PDF [SCI-2641]	2018-10-12 07:40:21 +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	dd4f7b5d02	Fix project users, activities, comments, reports endpoints	2018-10-10 17:35:09 +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
Luka Murn	dc2ab5fdc0	Fix the Doorkeeper config/access for all users (due to update of Gem)	2018-10-07 13:11:56 +02:00
Luka Murn	0bd3c81e39	Fix /users, /users/:id/identities endpoints	2018-10-07 13:07:27 +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	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	9e78de6ef2	Update CREATE, PATCH, DELETE inventory_column endpoints	2018-10-06 17:11:59 +02:00
Luka Murn	7b5a65416a	Update status endpoint	2018-10-06 11:47:23 +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
Luka Murn	d71be76657	Fix minor styling & text on settings - preferences page	2018-10-02 13:59:19 +02:00