157 commits

Author	SHA1	Message	Date
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	c65d1af18d	Fix failing tests	2019-03-13 09:53:34 +01:00
Urban Rotnik	b6a8556601	Add activities for exporting Projects, Inventory items	2019-03-12 09:15:06 +01:00
Urban Rotnik	3f18166320	Add Task and TaskTags activities	2019-03-12 09:15:06 +01:00
Urban Rotnik	b33e95e18a	New Protocols actions logging	2019-03-12 09:14:53 +01:00
Urban Rotnik	cfe2888bea	Repository columns actions loggin	2019-03-12 09:11:00 +01:00
Urban Rotnik	2a7bbac733	Repository actions logging	2019-03-12 09:11:00 +01:00
Urban Rotnik	b8e84b5685	Add logic for saving message items values and types	2019-03-11 08:37:22 +01:00
Urban Rotnik	5a123d26ac	Activity model update	2019-02-26 07:15:05 +01:00
Urban Rotnik	3ad6cee766	Fix tests, remove nullable field	2019-02-25 16:50:38 +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
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
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
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
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
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
Urban Rotnik	f1d59e65f3	Add module and rename service object	2019-01-18 16:56:33 +01:00
Urban Rotnik	d738169120	Refactor FactoryBot factories	2019-01-18 16:56:33 +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	e4e66d3e5d	Merge branch 'core-api' into ok_SCI_2742	2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin	0db9ef44e2	Add experiment, task, result READ endpoints tests [SCI-2742]	2018-10-15 16:27:22 +02:00
Oleksii Kriuchykhin	af02f29fb5	Implement user state saving for projects overview [SCI-2733]	2018-10-10 16:15:31 +02:00
Luka Murn	0bd3c81e39	Fix /users, /users/:id/identities endpoints	2018-10-07 13:07:27 +02:00
Oleksii Kriuchykhin	363c1e4a34	Add endpoints for managing inventory list items [SCI-2741]	2018-10-03 13:54:52 +02:00
Oleksii Kriuchykhin	afef8bc0b1	Fix failing tests [SCI-2687]	2018-08-24 15:37:23 +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
Oleksii Kriuchykhin	298b866df4	Fix failing tests [SCI-2611][SCI-2612]	2018-08-07 14:58:02 +02:00
zmagod	589389fa8e	fixex failing specs	2018-04-25 11:00:22 +02:00
zmagod	c23eacfe13	fixes for_admin action/ test visible_by functlion	2018-04-19 12:41:00 +02:00
okriuchykhin	503617b42c	Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025	2018-03-13 14:44:20 +01:00
mlorb	3b9ad2f86f	Merge pull request #1028 from mlorb/ml-sci-2144 ... Add file custom column type to db [SCI-2144]	2018-03-12 15:18:02 +01:00
mlorb	64e26e1c60	add file custom column type to db	2018-03-09 17:04:54 +01:00
zmagod	fca01bd54f	refactor repository export [fixes SCI-2025]	2018-03-05 15:54:04 +01:00
zmagod	c53df21946	adds specs for sample_to_repository migration service	2018-02-15 16:56:38 +01:00
zmagod	ae99c92516	follow @okriuchykhin 's suggestions	2018-02-09 16:28:21 +01:00
zmagod	557aeca049	refactor relations	2018-02-09 14:11:56 +01:00
zmagod	6b7ff11bcf	setup models for repository list column [fixes SCI-2015]	2018-02-07 15:28:28 +01:00
zmagod	88d7429041	1. fixes failing unit and integration tests ... 2. fixes gem dependencies issues 3. fixes failing migrations 4. updates depricated factory_girl => factory_bot and fixes related issues Signed-off-by: zmagod <zmago_devetak@yahoo.com>	2018-01-23 14:54:15 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
zmagod	1d3881b649	fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]	2018-01-03 13:48:59 +01:00
zmagod	219ef3baf6	setup new pagination for activities	2017-12-14 14:02:40 +01:00
zmagod	3d22a5404d	add scenic gem, teams datatables sql view	2017-10-26 16:59:00 +02:00
zmagod	edf4443995	added notification alert [fixes SCI-1566]	2017-10-02 14:51:54 +02:00
Oleksii Kriuchykhin	c3fceb90df	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
zmagod	db16da7bd6	adds custom query to fetch teams data	2017-08-25 16:07:37 +02:00
zmagod	ca3e89ab62	fix hound	2017-07-28 12:03:44 +02:00
zmagod	b69ec22dfe	fixes failing tests [fixes SCI-1470]	2017-07-28 10:14:50 +02:00
zmagod	cd7ababab0	fix sample types	2017-07-26 16:16:08 +02:00
zmagod	dfd488fa96	prevents cleaning data after rspec	2017-07-10 14:38:18 +02:00
zmagod	750c82a80f	setup testing tools [fixes SCI-1400]	2017-07-06 09:07:05 +02:00