718 commits

Author	SHA1	Message	Date
Luka Murn	9f60ece25f	Merge branch 'master' into rails-5.1 ... Conflicts: app/models/repository.rb app/models/repository_row.rb app/views/projects/index.html.erb app/views/shared/_secondary_navigation.html.erb	2017-07-06 15:12:15 +02:00
Zmago Devetak	53a1dd14b7	Merge pull request #718 from ZmagoD/zd_SCI_1129_v3 ... Fixes error message [fixes SCI-1129]	2017-07-04 11:16:36 +02:00
Oleksii Kriuchykhin	4c6690e59b	Fix ordering of the columns after adding the new ones [SCI-1445]	2017-07-03 11:53:15 +02:00
Oleksii Kriuchykhin	5c39b90b2d	Fix activities button misbehaviour with turbolinks [SCI-1412]	2017-06-30 16:33:52 +02:00
Oleksii Kriuchykhin	e474cda03a	Fix activities [SCI-1412]	2017-06-28 16:49:50 +02:00
zmagod	a9f38962bc	Fixes error message [fixes SCI-1129]	2017-06-28 11:17:50 +02:00
mz3944	ca59ac5e36	Merge pull request #714 from mz3944/mz-SCI-1402 ... Missing error message when not selecting name in case of import repository file [SCI-1402]	2017-06-27 11:54:26 +02:00
Oleksii Kriuchykhin	938896981d	Remove spinner after samples import error [SCI-1399]	2017-06-26 16:51:58 +02:00
Matej Zrimšek	f847b44067	Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]	2017-06-26 16:50:40 +02:00
zmagod	75507107fd	migrate to 4.2.9	2017-06-23 08:50:12 +02:00
zmagod	1690d8ebe3	removed reload on hide modal	2017-06-22 16:47:50 +02:00
zmagod	a2e1aa5b36	fixes bug with long text in parse records modal [fixes SCI-1392]	2017-06-22 14:43:01 +02:00
zmagod	28129ebb73	refactor	2017-06-21 17:39:20 +02:00
zmagod	bad52ceff1	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336	2017-06-21 15:56:07 +02:00
mz3944	568e41f5fa	Merge pull request #701 from mz3944/mz-SCI-1383 ... Removed empty first column of repository export file [SCI-1383]	2017-06-21 10:57:46 +02:00
mz3944	d19bfc8fd8	Merge pull request #700 from mz3944/mz-SCI-1386 ... Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]	2017-06-21 10:40:37 +02:00
Matej Zrimšek	47407ef40c	Removed empty first column of repository export file. [SCI-1383]	2017-06-20 18:40:41 +02:00
Matej Zrimšek	ce97d18e78	Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386]	2017-06-20 17:51:51 +02:00
Matej Zrimšek	d49524a26f	Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]	2017-06-20 16:10:50 +02:00
mlorb	14429a270c	Merge pull request #689 from mlorb/ml_sci_1354 ... Truncate and display text in tooltip in custom repository fields [SCI-1354]	2017-06-19 15:50:38 +02:00
Mojca Lorber	730c4738d5	fix tooltip in edit mode	2017-06-19 15:49:31 +02:00
Mojca Lorber	39dd6daabb	small fixes	2017-06-19 15:30:38 +02:00
mlorb	122ac7971f	Merge pull request #692 from mlorb/ml_sci_1348 ... Fix cog position on repositories page [SCI-1348]	2017-06-19 15:16:01 +02:00
mlorb	9a7669bf2a	remove empty line	2017-06-19 15:15:27 +02:00
zmagod	70fa681519	split the import service	2017-06-19 14:05:37 +02:00
Mojca Lorber	9b941fe374	fix flash when deleting samples of other users	2017-06-16 17:12:04 +02:00
Mojca Lorber	b6f146f177	fix cog position on repositories page	2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin	94d74b8101	Make assigned column always visible in repositories [SCI-1346]	2017-06-16 11:47:41 +02:00
Mojca Lorber	a195c9a5af	truncate and display text in tooltip in custom repository fields	2017-06-15 15:08:33 +02:00
zmagod	5d6fba7153	fixes bug with sorting columns [fixes SCI-1371]	2017-06-14 17:35:41 +02:00
zmagod	2d3b5f4308	refactor	2017-06-14 10:55:24 +02:00
okriuchykhin	da87a41c86	Merge pull request #680 from okriuchykhin/ok_SCI_1365 ... Remove row selection after assign/unassign in repositories [SCI-1365]	2017-06-14 10:19:09 +02:00
zmagod	6dd85d6c39	fixes drag'n drop bug in results on safari [fixes SCI-1370]	2017-06-14 09:45:49 +02:00
zmagod	cee052fc19	added service object	2017-06-14 09:11:20 +02:00
Mojca Lorber	849b269d87	fix errors in repo table	2017-06-13 16:56:34 +02:00
Oleksii Kriuchykhin	2e98433abc	Remove row selection after assign/unassign in repositories [SCI-1365]	2017-06-13 16:56:28 +02:00
Zmago Devetak	f3f1a68070	Merge pull request #667 from ZmagoD/zd_SCI_1338 ... fixes long column names in repository dropdown [fixes SCI-1338]	2017-06-13 09:33:04 +02:00
okriuchykhin	d88de4009a	Merge pull request #674 from okriuchykhin/ok_SCI_1346 ... Fix reordering columns to the first position [SCI-1346]	2017-06-13 09:01:10 +02:00
okriuchykhin	56c3b891a5	Merge pull request #673 from okriuchykhin/ok_SCI_1350 ... Fix row selection info after record deletion [SCI-1350]	2017-06-13 09:00:48 +02:00
okriuchykhin	05c77e7298	Merge pull request #672 from okriuchykhin/ok_SCI_1341 ... Fix row selecton after column reorder in repositories [SCI-1341]	2017-06-13 09:00:33 +02:00
Matej Zrimšek	e3db79b3cc	Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275]	2017-06-12 17:49:42 +02:00
Oleksii Kriuchykhin	248fd7be06	Fix reordering columns to the first position [SCI-1346]	2017-06-12 17:16:49 +02:00
Oleksii Kriuchykhin	c081cda5f3	Fix row selection info after record deletion [SCI-1350]	2017-06-12 10:23:18 +02:00
Oleksii Kriuchykhin	aa42ca6b8b	Fix row selecton after column reorder in repositories [SCI-1341]	2017-06-12 10:07:16 +02:00
Matej Zrimšek	514aa6214b	Repository records minor JS refactoring. [SCI-1275]	2017-06-09 19:44:28 +02:00
Matej Zrimšek	29b721365a	Moved export form to proper place in the code. [SCI-1275]	2017-06-09 19:44:28 +02:00
rekonder	4df8e1ffe3	Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository	2017-06-09 19:44:28 +02:00
rekonder	ede744849b	Export repository [aj-SCI-1275]	2017-06-09 19:44:28 +02:00
Luka Murn	e26337d5ee	Merge pull request #671 from biosistemika/custom-repositories ... Merge custom-repositories into master	2017-06-09 18:46:47 +02:00
zmagod	d1977d0773	fixes long column names in repository dropdown [fixes SCI-1338]	2017-06-09 11:42:38 +02:00