43 commits

Author	SHA1	Message	Date
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin	2ddb0ea009	Improve XLSX parsing with Roo [SCI-1915]	2018-01-11 17:52:57 +01:00
Oleksii Kriuchykhin	1a81a99ff0	Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]	2017-12-19 16:17:11 +01:00
Oleksii Kriuchykhin	baf3151bb0	Fix notification settings accessors [SCI-1864]	2017-12-13 11:59:53 +01:00
Oleksii Kriuchykhin	84f4aba213	Pull latest master into gilson-iot-rails4	2017-11-15 15:15:26 +01:00
zmagod	5bc38414d1	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731	2017-11-03 09:56:44 +01:00
zmagod	e0323a0a46	fixes failing tests	2017-10-27 09:35:39 +02:00
zmagod	c36fcb1fa4	fixes user invitation button [fixes SCI-1726]	2017-10-25 11:31:32 +02:00
Luka Murn	c026b60790	Update Profile page to use validation	2017-10-23 18:04:20 +02:00
Luka Murn	82f982e983	Merge branch 'rails-5.1' into decoupling-settings-page ... Conflicts: Gemfile Gemfile.lock	2017-10-23 10:59:10 +02:00
Oleksii Kriuchykhin	c8d2ae70fa	Move duplicated code to service [SCI-1665]	2017-10-17 14:46:16 +02:00
zmagod	c5978f2d86	adds cucumber test for profile page [fixes SCI-1572]	2017-10-16 16:21:52 +02:00
Oleksii Kriuchykhin	56f52ebfa7	Optimize memory usage in samples/repositories import [SCI-1665]	2017-10-12 14:43:25 +02:00
zmagod	dea69014d0	fixes bug with password confirmation	2017-10-06 09:54:17 +02:00
zmagod	754627efe7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564	2017-10-05 11:08:31 +02:00
zmagod	f492234f89	fixes hound allerts	2017-09-28 17:00:11 +02:00
mlorb	c358f8fa0c	write unit tests for invite users	2017-09-28 14:49:33 +02:00
zmagod	e2aa0d7515	fixes user profile	2017-09-26 17:29:11 +02:00
mlorb	4ef7b57f31	fix error handeling	2017-09-22 09:57:41 +02:00
mlorb	9d96bf668a	fix error handeling, refactoring	2017-09-21 16:42:56 +02:00
mlorb	55772a80ab	fix hound and refactor	2017-09-21 10:45:36 +02:00
mlorb	48c8922604	adds invite users modal	2017-09-21 10:45:35 +02:00
Luka Murn	5429f6bbbd	Fix @ZmagoD's remarks	2017-09-21 08:06:11 +02:00
Luka Murn	44877a13a5	Refactor services on backend. New team page is now working	2017-09-19 16:32:21 +02:00
Luka Murn	80c05e50ec	Semi-working version of create new team form	2017-09-19 16:30:26 +02:00
zmagod	1a00b53034	adds user_team tests	2017-09-14 13:11:19 +02:00
zmagod	705d07f60e	adds remove team action	2017-09-13 17:11:51 +02:00
zmagod	1b3b3dfea9	adds team members update role functionality	2017-09-12 17:30:13 +02:00
zmagod	9c01ab414c	refactor leave team	2017-09-01 17:10:43 +02:00
zmagod	91d2d8a935	adds team details view	2017-08-31 15:56:55 +02:00
zmagod	1325732b0c	adds specs for team controller actions	2017-08-30 16:18:21 +02:00
Oleksii Kriuchykhin	c3fceb90df	Backport API to Rails-4 [SCI-1579]	2017-08-30 13:30:41 +02:00
zmagod	ee054f91b8	adds bullet gem [fixes SCI-1578]	2017-08-30 09:29:45 +02:00
Luka Murn	13eae287bb	Revert "Add core API using JWT authentication and tests for it [SCI-1507]"	2017-08-07 11:54:45 +02:00
Luka Murn	ae5bccf709	Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile.lock app/datatables/repository_datatable.rb app/models/repository_cell.rb	2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin	e958410261	Add core API using JWT authentication and tests for it [SCI-1507]	2017-08-03 17:00:14 +02:00
Oleksii Kriuchykhin	ece27b2652	Fix importing files with empty header cells and error messages improvements [SCI-1484]	2017-07-18 14:54:35 +02:00
zmagod	18fd5b00ba	fix hound	2017-06-21 15:01:55 +02:00
zmagod	f66fb49b56	adds import records to repositories [fixes SCI-1336]	2017-06-21 14:45:50 +02:00
zmagod	f64e1ac713	fix locales	2017-06-21 09:31:39 +02:00
zmagod	70fa681519	split the import service	2017-06-19 14:05:37 +02:00
zmagod	cee052fc19	added service object	2017-06-14 09:11:20 +02:00
zmagod	a865253a2e	first run	2017-06-13 08:10:10 +02:00