1094 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	0930277c4e	Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]	2019-02-27 16:02:53 +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