498 commits

Author	SHA1	Message	Date
Luka Murn	9bf8b5d864	Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 ... Conflicts: Makefile app/assets/javascripts/projects/index.js.erb app/assets/stylesheets/themes/scinote.scss config/locales/en.yml	2018-04-12 13:16:46 +02:00
zmagod	6e255a4657	fixes failing specs	2018-04-04 14:44:32 +02:00
zmagod	e630d3113f	add ID column to repository [fixes SCI-2206]	2018-04-04 11:55:11 +02:00
Oleksii Kriuchykhin	e42fc3117b	Implement search in file repository cells and improve performance [SCI-2111]	2018-03-26 13:19:09 +02:00
Zmago Devetak	75d7ace8c7	Merge pull request #1017 from ZmagoD/zd_SCI_2068 ... Write server-side endpoints for custom repositories [SCI-2068]	2018-03-20 14:30:47 +01:00
okriuchykhin	d906baff61	Merge pull request #1039 from okriuchykhin/ok_SCI_1697 ... Improve connections between repository models [SCI-1697]	2018-03-19 16:42:55 +01:00
Oleksii Kriuchykhin	a105e61d48	Remove tutorial [SCI-1860]	2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin	9371d77762	Improve connections between repository models [SCI-1697]	2018-03-16 13:12:33 +01:00
zmagod	fad4001273	fix edit row action	2018-03-16 12:27:19 +01:00
zmagod	1cdba5e0d3	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068	2018-03-16 11:05:16 +01:00
zmagod	d69754af04	implement search on list items dropdown, update, create actions [fixes SCI-2070]	2018-03-15 15:43:16 +01:00
zmagod	b67a54e2d1	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import	2018-03-13 15:25:57 +01:00
okriuchykhin	503617b42c	Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025	2018-03-13 14:44:20 +01:00
zmagod	dd2f7dd417	Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration	2018-03-13 13:24:36 +01:00
okriuchykhin	262c21d145	Merge pull request #1036 from okriuchykhin/ok_SCI_2078 ... Implement importable selector for repository columns [SCI-2078]	2018-03-13 13:14:53 +01:00
Oleksii Kriuchykhin	be1ead22e0	Implement importable selector for repository columns [SCI-2078]	2018-03-13 11:36:05 +01:00
Oleksii Kriuchykhin	21c07371c9	Fix repository export to support file columns [SCI-2079]	2018-03-13 10:40:27 +01:00
mlorb	34f5c2c7ac	fix validation in asset model and change formatted method in repository_asset_value model	2018-03-12 10:50:45 +01:00
mlorb	64e26e1c60	add file custom column type to db	2018-03-09 17:04:54 +01:00
Oleksii Kriuchykhin	e4d974aa58	Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]	2018-03-09 15:34:06 +01:00
zmagod	4f951f6679	adds unit specs for datatable service [fixes SCI-2068]	2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin	1765d83cd1	Refactor search to support repository list items [SCI-2108]	2018-03-09 11:05:43 +01:00
zmagod	26883af386	fix assigned ordering	2018-03-08 17:36:10 +01:00
zmagod	fb66131e29	setup endpoint for repository_rows paging/search	2018-03-06 16:32:39 +01:00
mz3944	bb21f6543c	Merge pull request #1004 from mz3944/mz-SCI-2011 ... Wrapping up the permissions [SCI-2011]	2018-03-06 07:10:40 +01:00
zmagod	fca01bd54f	refactor repository export [fixes SCI-2025]	2018-03-05 15:54:04 +01:00
Zmago Devetak	50ccec5007	Merge pull request #1009 from ZmagoD/zd_SCI_2066 ... add info modal for repository items [fixes SCI-2066]	2018-03-05 12:49:29 +01:00
zmagod	0996745781	refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024]	2018-03-02 13:39:22 +01:00
mlorb	08439e7f58	sign up with linkedIn account	2018-02-28 18:12:21 +01:00
Matej Zrimšek	b8b9707c06	Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.	2018-02-19 14:51:14 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
zmagod	36595d33f4	fix name scope	2018-02-12 09:09:56 +01:00
zmagod	d12f8403e4	add reference to repository column	2018-02-12 09:05:41 +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	7c13c5a1f4	fixes typo, follows @okriuchykhin 's suggestions	2018-02-09 11:38:52 +01:00
zmagod	6b7ff11bcf	setup models for repository list column [fixes SCI-2015]	2018-02-07 15:28:28 +01:00
Oleksii Kriuchykhin	16e1d072b9	Improve files handling in protocol clonning [SCI-2003]	2018-02-01 15:44:08 +01:00
mlorb	775b8b3201	fix bug with ajax error caused to the other user when deleting column in custom repository	2018-01-29 16:01:33 +01:00
zmagod	f8a3fca2db	Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling	2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin	819febb05b	Remove skip_on_import from repository_cell [SCI-1939]	2018-01-17 12:54:32 +01:00
Oleksii Kriuchykhin	a64012237e	Fix repository records import [SCI-1939]	2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin	2ddb0ea009	Improve XLSX parsing with Roo [SCI-1915]	2018-01-11 17:52:57 +01:00
zmagod	862b73cae7	Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866	2018-01-05 09:13:43 +01:00
okriuchykhin	e49ffb61d4	Merge pull request #914 from okriuchykhin/ok_SCI_1873 ... Fix repositories [SCI-1873]	2018-01-04 13:33:30 +01:00
Oleksii Kriuchykhin	66869fe4cf	Fix canvas update [SCI-1871]	2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin	512ee07bde	Fix repositories [SCI-1873]	2017-12-19 17:53:45 +01:00
Luka Murn	cf291bf887	Merge branch 'gilson-iot-rails4' ... Conflicts: Gemfile.lock	2017-12-19 10:56:39 +01:00
zmagod	219ef3baf6	setup new pagination for activities	2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin	6256acdfea	Rename notifications settings accessor [SCI-1864]	2017-12-07 13:59:33 +01:00