202 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	d52df56fc4	Fix production build and update packages [SCI-3678]	2019-08-08 14:03:15 +02:00
Anton Ignatov	ffd415d409	Inital refactor for Assets model	2019-07-12 15:02:06 +02:00
Anton Ignatov	57a273d5d0	Merge branch 'activestorage_migration' into features/marvinjs-integration	2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin	9d926dc956	Refactor TinyMce assets, user avatars, zip files [SCI-3539]	2019-07-05 16:56:05 +02:00
Anton Ignatov	c9ae9f056e	Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration	2019-07-01 10:44:29 +02:00
Oleksii Kriuchykhin	5acb16d43e	Update Asset helper methods [SCI-3539]	2019-06-28 08:17:09 +02:00
Oleksii Kriuchykhin	ba2daede0b	Add migration scripts [SCI-3539]	2019-06-24 15:17:42 +02:00
Anton Ignatov	7e5c39d3e4	Merge branch 'master' into features/marvinjs-integration	2019-06-21 14:51:45 +02:00
aignatov-bio	9653f16196	Convert image to base64 in PDF reports [SCI-3557] (#1835) ... * Convert image to base64 in PDF reports * Fix typo error	2019-06-19 13:57:04 +02:00
Oleksii Kriuchykhin	109793c7fb	Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539]	2019-06-13 12:10:44 +02:00
Anton Ignatov	16d00340cd	Fix merge errors	2019-05-31 10:35:04 +02:00
Anton Ignatov	c9a29b12ba	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
Oleksii Kriuchykhin	d46d82d0f0	Fix Hound warning [SCI-3368]	2019-05-21 10:56:55 +02:00
Oleksii Kriuchykhin	d3f29d5d72	Add type column to zip_exports for STI [SCI-3368]	2019-05-20 16:35:24 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
Anton Ignatov	652fba0e23	Merge branch 'master-with-note-section'	2019-05-13 11:08:11 +02:00
Urban Rotnik	2364c2653f	Add bulk insert for UserSystemNotifications, New service for sending emails	2019-05-08 08:38:10 +02:00
Anton Ignatov	f80d881847	Fix markup	2019-04-28 19:11:41 +02:00
Anton Ignatov	46f0e0c0c2	Add marvin js assets to assets sort and name field	2019-04-27 12:46:45 +02:00
Anton Ignatov	fe620c4a63	Add marvin model and controller	2019-04-26 22:59:38 +02:00
Anton Ignatov	7d60eb5572	Fix migration issues	2019-04-23 11:11:22 +02:00
Anton Ignatov	aa2dab2014	Merge branch 'features/note-section' into master-with-note-section	2019-04-23 10:31:37 +02:00
aignatov-bio	6ac620feb3	Migration for old tinymce assets [SCI-3176] (#1663) ... * adding rake task * Addign test for update images * Adding tests for tiny mce model	2019-04-19 15:24:54 +02:00
Oleksii Kriuchykhin	4014f19665	Update schema.rb file	2019-04-17 14:57:38 +02:00
aignatov-bio	8d7cc57da1	Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) ... * Add zoom to image annotation and check jpeg file quality before save * Move compression to front end * Move quality extractor to paperclip processor	2019-04-15 09:49:44 +02:00
aignatov-bio	08263ab64e	adding filters for task activities [SCI-3076] (#1553) ... * update task activity screen	2019-03-28 10:55:48 +01:00
Miha Mencin	4a87216a3d	Merge branch 'master' into features/global-activities	2019-03-25 14:35:24 +01:00
Anton Ignatov	5d6f009ee8	fix error for delay deleting	2019-03-20 15:20:31 +01:00
Anton Ignatov	55c93922ea	markup fixes	2019-03-20 14:46:54 +01:00
Anton Ignatov	07c2819163	refactoring tinymce image uploading	2019-03-20 14:46:54 +01:00
Anton Ignatov	87280f083a	[SCI-3166] Finalize global activities front end	2019-03-19 13:50:55 +01:00
Urban Rotnik	ad8e5973fa	Remove not null constraint from project_id in Activity table	2019-03-11 08:36:15 +01:00
Miha Mencin	6deaff6382	fixing hound errors	2019-03-04 18:36:32 +01:00
Miha Mencin	fa7bba9de7	scheduling creation of demo project at the sign in time ... remove wrong schema, fix comment, add migration	2019-03-04 18:26:15 +01:00
Miha Mencin	51b3aea49a	added uniquness validator and index on user_projects and user_teams relations ... finxing typo, fixied failing test fixing mistakenly commited file fixing schema to include bigint migration	2019-02-27 15:09:47 +01:00
Urban Rotnik	3ad6cee766	Fix tests, remove nullable field	2019-02-25 16:50:38 +01:00
Urban Rotnik	5b5c6c7122	Changes to Activity model	2019-02-25 16:49:55 +01:00
Urban Rotnik	7b6c6c414d	Merge branch 'master' into features/templates	2019-02-19 14:46:15 +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
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
Urban Rotnik	8ebb7561d9	Add last_time_changed_at columnd to SystemNotifications	2019-01-31 16:44:20 +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
Oleksii Kriuchykhin	f7b73c617a	Fix code styling [SCI-2939]	2019-01-28 15:37:24 +01:00
Miha Mencin	4acd2a592d	Adding previously forgotten schema file	2019-01-28 11:25:35 +01:00
Oleksii Kriuchykhin	bd2efa55ac	Add templates business logic [SCI-2939]	2019-01-25 10:55:08 +01:00
Miha Mencin	6e16a63dcd	implementing suggestion from alex, now table and indices names are hardoced	2019-01-21 11:02:33 +00:00
Miha Mencin	7ade88cf92	SCI-2936 code style final	2019-01-18 09:38:04 +01:00
Miha Mencin	70b1852d64	SCI-2936 code style	2019-01-18 09:33:45 +01:00
Miha Mencin	2271e453df	SCI-2936 minor refactor and code styling	2019-01-18 09:25:32 +01:00