210 commits

Author	SHA1	Message	Date
zmagod	4bc01c44e9	add file name to loading image	2018-05-10 10:37:48 +02:00
zmagod	66b676b5ce	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-04-26 17:04:36 +02:00
zmagod	0afe461962	fixes download link	2018-04-26 17:00:51 +02:00
Luka Murn	cb6fe50832	Merge branch 'master' into ux-release-1 ... Conflicts: app/assets/javascripts/repositories/index.js	2018-04-26 11:38:54 +02:00
Zmago Devetak	096167c125	Merge pull request #1101 from ZmagoD/zd_SCI_2124 ... adds new reports index page [fixes SCI-2124]	2018-04-23 12:42:24 +02:00
zmagod	e96b690a5b	removes reports link from secondary navigation, fix bug with turbolinks	2018-04-20 11:57:52 +02:00
zmagod	dafa29d4bf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124	2018-04-20 10:33:15 +02:00
zmagod	2a5c4daa9d	fix file preview [SCI-2313]	2018-04-20 09:29:08 +02:00
mlorb	d7eccac289	Merge pull request #1099 from mlorb/ml-sci-2167 ... Remove breadcrumbs throughout application [SCI-2167]	2018-04-19 16:11:37 +02:00
mlorb	c149b3cc2a	refactoring	2018-04-19 15:12:26 +02:00
mlorb	56e00740c1	fix blocked buttons edit and eye icon	2018-04-19 14:40:46 +02:00
zmagod	9d282d1800	adds new reports index page [fixes SCI-2124]	2018-04-18 16:47:52 +02:00
mlorb	c08d72be36	remove breadcrumbs throughout application	2018-04-17 17:00:04 +02:00
mlorb	600ec99c82	fix project navigation to work with archived pages and correct current team	2018-04-17 13:52:43 +02:00
zmagod	b4deb232c0	rename variable: not_in_repository => display_image_tag	2018-04-12 13:40:17 +02:00
zmagod	233e73c709	adds asset preview link to repository row modal and to table row item [fixes SCI-2110]	2018-04-10 17:06:53 +02:00
Oleksii Kriuchykhin	3b7977ee3b	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin	f656ad1561	Fix fa icons [SCI-2217]	2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
zmagod	7c1390ece2	implement sidebar toggle [fixes SCI-2232]	2018-03-28 14:12:11 +02:00
Oleksii Kriuchykhin	31aed55ffc	Disable turbolinks on tasks navigation [SCI-2251]	2018-03-26 17:55:51 +02:00
mlorb	b7a14215bc	Merge pull request #1050 from mlorb/ml-sci-2120-v2 ... Refactor project navigation [SCI-2120]	2018-03-26 12:56:19 +02:00
mlorb	0092be08cc	refactor links	2018-03-26 12:11:59 +02:00
mlorb	1797afa718	Merge branch 'ux-release-1' into ml-sci-2238	2018-03-26 10:44:43 +02:00
Oleksii Kriuchykhin	aa69624f9f	Fix sample assign permissions [SCI-2249]	2018-03-25 20:10:32 +02:00
mlorb	83741358d1	fix locales	2018-03-23 16:19:06 +01:00
mlorb	eee597b315	fix naming	2018-03-23 15:56:38 +01:00
mlorb	2e81359ebb	re-implement About sciNote modal	2018-03-23 15:14:49 +01:00
mlorb	faaecec2ff	implement new Help dropup in navigation	2018-03-23 14:08:27 +01:00
mlorb	bc06542ed7	refactor project navigation	2018-03-22 11:41:33 +01:00
mlorb	884eef9d07	Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118	2018-03-20 14:25:59 +01:00
Oleksii Kriuchykhin	acbd40e0d1	Remove Power Up button [SCI-2117]	2018-03-18 22:12:29 +01:00
zmagod	86a8afd907	refactor	2018-03-16 15:56:12 +01:00
zmagod	ee03115361	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095	2018-03-16 15:32:40 +01:00
mlorb	9de998e85c	code left-side menu bar	2018-03-14 14:33:34 +01:00
Zmago Devetak	d7679dcb99	Merge pull request #1032 from ZmagoD/zd_SCI_2141 ... refactor global activities in separate page [fixes SCI-2141]	2018-03-13 15:20:14 +01:00
zmagod	8fe173e831	re-structure top navigation bar	2018-03-12 16:27:35 +01:00
zmagod	e218cae453	refactor global activities in separate page [fixes SCI-2141]	2018-03-12 11:01:23 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Matej Zrimšek	6b1fee4d30	Added/joined repository record assignment to task with sample assignmment to task.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	f21c794a95	Fixed permission error when accessing samples page.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
Matej Zrimšek	7938c2e036	Minor code style changes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	854333b0e6	Grouped permissions for experiment with canaid gem (WIP).	2018-02-14 14:19:00 +01:00
Matej Zrimšek	13e9a2a132	Corrected some project level permissions; minor refactoring.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
zmagod	695e9d90d2	fixes user dropdown [fixes SCI-2033]	2018-02-07 08:43:42 +01:00
zmagod	25dcfe66ae	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960	2018-02-01 16:04:05 +01:00
zmagod	366b67ca1c	fixes per @mojca 's request	2018-01-31 15:18:18 +01:00
zmagod	b1684dbd5b	removed unneeded hook	2018-01-31 14:40:19 +01:00