1408 commits

Author	SHA1	Message	Date
mlorb	cea7f5a3f7	some extra style unification	2018-05-15 17:10:31 +02:00
mlorb	5f462165b5	change font and alerts colors	2018-05-15 14:16:34 +02:00
Oleksii Kriuchykhin	95b8821cc9	Re-init file preview modal after inventory row editing [SCI-2391]	2018-05-15 12:57:36 +02:00
mlorb	dfe65ccaed	UI/UX restyle - fixes throughout application - part 2	2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin	a92abc5995	Fix editing of inventory rows with existing files [SCI-2394]	2018-05-14 14:26:01 +02:00
mlorb	f01cfc2968	fix hound	2018-05-14 12:08:45 +02:00
mlorb	ed27a7a62a	some extra restyling/unifying off app	2018-05-11 18:02:17 +02:00
mlorb	b5649f0574	Merge branch 'ux-release-1' into ml-sci-2336-v1	2018-05-10 13:59:57 +02:00
zmagod	3db7cc437b	fixes error message for invalid file type [fixes SCI-2337]	2018-05-10 13:52:01 +02:00
Luka Murn	8650edbbb9	Merge pull request #1129 from Ducz0r/lm-fix-repositories-index ... Fix merge conflict introduced in when merging master->ux-release-1	2018-05-10 11:19:38 +02:00
okriuchykhin	ed8237484b	Merge pull request #1131 from okriuchykhin/ok_SCI_2379 ... Re-init file preview modal after column visability change [SCI-2379]	2018-05-10 10:45:56 +02:00
zmagod	e5c3fb6af2	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321	2018-05-10 10:38:56 +02:00
Zmago Devetak	0a4deeaa35	Merge pull request #1112 from ZmagoD/zd_SCI_2261 ... propagate assigned repository items in workflow [fixes SCI-2261]	2018-05-10 09:57:49 +02:00
zmagod	38869ec037	adds title on disabled download file link	2018-05-10 09:47:10 +02:00
Oleksii Kriuchykhin	fa1fea634c	Re-init file preview modal after column visability change [SCI-2379]	2018-05-09 17:41:52 +02:00
mlorb	13f9ec30b8	fix hound	2018-05-09 13:56:32 +02:00
mlorb	7df40e56c7	UI/UX restyle - fixes throughout application part one	2018-05-08 16:33:42 +02:00
Luka Murn	f8295b60c9	Fix merge conflict introduced in when merging master->ux-release-1 ... Bug was introduced in merge commit cb6fe50832 and resulted in import into inventories not working.	2018-05-08 09:41:40 +02:00
Zmago Devetak	ee307886df	Merge pull request #1124 from ZmagoD/zd_SCI_2347 ... fix the missing icons on task card [fixes SCI-2347]	2018-05-04 09:34:49 +02:00
zmagod	0177dc811b	fixes per @mojca 's request	2018-05-03 16:21:29 +02:00
zmagod	abbc0995f2	fix css	2018-05-03 14:51:49 +02:00
zmagod	60e5aa8716	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2	2018-05-03 14:49:06 +02:00
zmagod	f04677600b	fix the missing icons on task card [fixes SCI-2347]	2018-05-03 10:05:40 +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
mlorb	f97477f3f0	some extra button styling	2018-04-26 15:19:05 +02:00
mlorb	763d934aa7	fix buttons again	2018-04-26 15:02:24 +02:00
zmagod	8dac887f10	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261	2018-04-26 14:18:41 +02:00
zmagod	24acd5c779	fixes per @duco 's request	2018-04-26 14:13:46 +02:00
mlorb	88d5ba369d	Merge branch 'ux-release-1' into ml-sci-2244	2018-04-26 14:07:03 +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	ac10f9fdb1	Merge pull request #1117 from ZmagoD/zd_SCI_2187 ... remove task description info from canvas task card [fixes SCI-2187]	2018-04-26 09:42:47 +02:00
mlorb	9e11f3b220	update buttons positions and wording throughout app	2018-04-25 13:57:12 +02:00
Luka Murn	cd04596c62	Merge pull request #1111 from Ducz0r/lm-sci-2276-fix ... Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]	2018-04-25 12:37:27 +02:00
Luka Murn	bd6f97fabc	Add initializer to include helpers in all assets (including .js)	2018-04-25 10:51:19 +02:00
zmagod	4d6e995481	add dismiss buttons back	2018-04-25 10:43:16 +02:00
zmagod	c026044322	fixes flash message [fixes SCI-2142]	2018-04-25 07:32:49 +02:00
zmagod	3a4df069d7	remove task description info from canvas task card [fixes SCI-2187]	2018-04-24 15:11:48 +02:00
zmagod	c2d19fee52	fixes images preview in repository/library [fixes SCI-2321]	2018-04-24 13:11:55 +02:00
zmagod	824962c084	propagate assigned repository items in workflow [fixes SCI-2261]	2018-04-23 11:33:16 +02:00
Luka Murn	caab0cf55c	Update the ordering upon table load	2018-04-20 12:31:22 +02:00
Luka Murn	21e7e7057e	Refactor all the methods into two new services	2018-04-20 12:31:22 +02:00
Luka Murn	5e2622ecfc	Change default repository state to Ruby representation ... Also remove some dead code from repositories datatables	2018-04-20 12:31:22 +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
mlorb	3249d5db0d	Merge pull request #1100 from mlorb/ml-sci-2303 ... Update reports show page to work with new navigation [SCI-2303]	2018-04-20 09:50:35 +02:00
Zmago Devetak	487fb1fb48	Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2 ... Zd sci 2239 v2	2018-04-19 18:00:19 +02:00
mlorb	72c79013de	fix file preview background	2018-04-19 17:40:24 +02:00
Zmago Devetak	93fc1af12d	Merge pull request #1083 from ZmagoD/zd_SCI_2259 ... set limit on maximum number of dropdown list items [fixes SCI-2259]	2018-04-19 17:17:54 +02:00
Zmago Devetak	1290435372	Merge pull request #1086 from ZmagoD/zd_SCI_2207 ... enables copying of repository items [fixes SCI-2207]	2018-04-19 17:13:43 +02:00
mlorb	ea4d3f815b	add back needed code	2018-04-19 16:51:37 +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
zmagod	a948710576	fixes alert label [fixes SCI-2239]	2018-04-19 15:51:36 +02:00
zmagod	f555e8cea4	fix error message	2018-04-19 15:32:14 +02:00
mlorb	8753df7ce3	Merge pull request #1103 from mlorb/ml-sci-2309 ... Fix top navigation style [SCI-2309]	2018-04-19 15:16:27 +02:00
zmagod	ce52eb851b	add validation to dropdown items	2018-04-19 14:02:42 +02:00
mlorb	c1832969b4	fix top navigation style	2018-04-19 13:26:10 +02:00
mlorb	4f0c2a8122	fix screen responsiveness	2018-04-18 17:06:47 +02:00
zmagod	9d282d1800	adds new reports index page [fixes SCI-2124]	2018-04-18 16:47:52 +02:00
mlorb	57f09029f5	return needed code	2018-04-18 16:22:36 +02:00
mlorb	cc34376253	update reports show page to work with new navigation	2018-04-18 14:40:53 +02:00
mlorb	c08d72be36	remove breadcrumbs throughout application	2018-04-17 17:00:04 +02:00
mlorb	04a20ab7ec	change links	2018-04-16 17:05:22 +02:00
Zmago Devetak	f90589d714	Merge pull request #1095 from ZmagoD/zd_SCI_2300 ... fixes archive button [fixes SCI-2300]	2018-04-16 16:19:21 +02:00
zmagod	a2d8285f35	fixes archive button but [fixes SCI-2300]	2018-04-16 09:22:10 +02:00
mlorb	2627efe402	implement file column type when editing & creating new rows in inventories DataTables	2018-04-13 17:21:17 +02:00
Luka Murn	fa603b54b8	Merge pull request #930 from okriuchykhin/ok_SCI_1860 ... Remove tutorial [SCI-1860]	2018-04-12 14:46:20 +02:00
Luka Murn	09c60d2468	Fixes per @Ducz0r's request	2018-04-12 14:38:22 +02:00
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	6291857bbf	enables copying of repository items [fixes SCI-2207]	2018-04-11 17:17:19 +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
zmagod	ea4bd8831f	fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]	2018-04-10 13:19:53 +02:00
Zmago Devetak	eca69cfc75	Merge pull request #1080 from ZmagoD/zd_SCI_2076 ... add asset field preview/sort/search in repository table [fixes SCI-2076]	2018-04-09 14:29:45 +02:00
mlorb	a10f671184	Merge pull request #1081 from mlorb/ml-sci-2123 ... Refactor settings into the new navigation bar [SCI-2123]	2018-04-09 13:21:16 +02:00
mlorb	8a35ce5c58	add locales	2018-04-09 10:53:03 +02:00
Zmago Devetak	bdb6554870	Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219 ... adds manage columns page	2018-04-06 17:06:28 +02:00
zmagod	58b6eb908e	fix duplications	2018-04-06 17:02:10 +02:00
mlorb	70dfe66b2d	refactoring	2018-04-06 14:20:40 +02:00
zmagod	cf7761daaa	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223	2018-04-06 12:56:39 +02:00
zmagod	b51ad84ee5	add asset field preview/sort/search in repository table [fixes SCI-2076]	2018-04-06 12:03:39 +02:00
mlorb	b8e91e91a1	refactor settings into the new navigation bar	2018-04-05 16:30:02 +02:00
zmagod	c0cc6c293a	fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]	2018-04-05 13:15:32 +02:00
zmagod	030ce271be	fixes name validations	2018-04-05 10:47:47 +02:00
zmagod	afc2a35557	move import export to dropdown	2018-04-05 09:32:34 +02:00
zmagod	a8a19df06d	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219	2018-04-05 08:51:58 +02:00
okriuchykhin	e608d629c7	Merge pull request #1068 from okriuchykhin/ok_SCI_2217 ... Refactor file preview modal [SCI-2217]	2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin	9720063fb3	Fix tests [SCI-2217]	2018-04-05 00:06:11 +02:00
zmagod	525a1c15ca	fixes hound	2018-04-04 16:40:07 +02:00
zmagod	0c05c60ebf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219	2018-04-04 16:06:38 +02:00
Zmago Devetak	d1f3a65279	Merge pull request #1073 from ZmagoD/zd_SCI_2206 ... add ID column to repository [fixes SCI-2206]	2018-04-04 15:39:59 +02:00
Oleksii Kriuchykhin	3b7977ee3b	Merge latest changes from ux-release-1 [SCI-2217]	2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin	8ee98b7cf0	Update Capybara and dependencies [SCI-2217]	2018-04-04 14:13:37 +02:00
zmagod	5eb007f4d2	fixes per @mlorb 's request	2018-04-04 13:22:14 +02:00
zmagod	38b84edfb0	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-04-04 12:59:41 +02:00
zmagod	e630d3113f	add ID column to repository [fixes SCI-2206]	2018-04-04 11:55:11 +02:00
Zanz2	7f36ab3e5e	deleted require and gemfile entry for remotipart	2018-04-04 11:12:39 +02:00
mlorb	11c0f5e5a1	Merge pull request #1067 from mlorb/ml-sci-2243 ... Style Guide - refactor colors, typography and buttons [SCI-2243]	2018-04-03 11:30:02 +02:00
Oleksii Kriuchykhin	51860652c1	Refactor smart annotations modal [SCI-2223]	2018-04-02 20:38:56 +02:00
Zanz2	1606982966	found a hackish fix by doing a manual ajax call and some other things with jquery	2018-04-02 19:56:25 +02:00
mlorb	6a20c37449	fix travis againnnnn	2018-03-30 17:16:18 +02:00
mlorb	5f0d33d75e	fix travis again	2018-03-30 16:47:23 +02:00
Oleksii Kriuchykhin	cc5d8550b1	Refactor file preview modal [SCI-2217]	2018-03-30 11:50:28 +02:00
mlorb	10b5e1de84	refactor typography	2018-03-30 09:54:57 +02:00
zmagod	56b0900619	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219	2018-03-29 16:42:10 +02:00
mlorb	4bf9369bc5	refactor buttons	2018-03-29 13:58:14 +02:00
zmagod	7c1390ece2	implement sidebar toggle [fixes SCI-2232]	2018-03-28 14:12:11 +02:00
mlorb	22afa61b11	refactor colors	2018-03-28 13:54:01 +02:00
Oleksii Kriuchykhin	1ed0b16d12	Rescale Linkedin buttons [SCI-2201]	2018-03-27 15:00:28 +02:00
Oleksii Kriuchykhin	fac5875cfd	Add repository name to record info modal [SCI-2205]	2018-03-26 16:18:09 +02:00
zmagod	8f09e1f7a4	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-03-26 13:08:31 +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
zmagod	3efe06a410	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-03-26 12:02:24 +02:00
zmagod	9e1f285c9e	adds missing labels [fixes SCI-2219]	2018-03-26 11:28:14 +02:00
mlorb	70e0d8bd1d	Merge pull request #1052 from mlorb/ml-sci-2125 ... Implement new Help dropup in navigation [SCI-2125]	2018-03-26 09:22:39 +02:00
zmagod	baf69461f5	adds edit/create modal and related actions	2018-03-23 16:00:33 +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
zmagod	3be3c00574	adds manage columns page [fixes SCI-2218]	2018-03-22 09:35:36 +01:00
Oleksii Kriuchykhin	36302ad6e8	Refactor existing columns management to control only Column visibility and order [SCI-2220]	2018-03-21 16:56:36 +01:00
zmagod	81df97f008	add library sidebar and create new library button [fixes SCI-2121]	2018-03-21 09:22:55 +01:00
zmagod	62858bc14f	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121	2018-03-20 14:46:11 +01:00
zmagod	1ad8c259d1	add blank page for repositories [fixes SCI-2139]	2018-03-20 14:45:57 +01:00
mlorb	35afc06cbd	Merge pull request #1038 from mlorb/ml-sci-2118 ... Code left-side menu bar [SCI-2118]	2018-03-20 14:40:55 +01: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
mlorb	9cf9bf94c0	fix merge conflict	2018-03-20 14:30:07 +01:00
mlorb	884eef9d07	Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118	2018-03-20 14:25:59 +01:00
mlorb	e0926ddc3c	code refactoring	2018-03-20 13:53:11 +01:00
Oleksii Kriuchykhin	acbd40e0d1	Remove Power Up button [SCI-2117]	2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin	a105e61d48	Remove tutorial [SCI-1860]	2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin	37f675b32a	Use larger LinkedIn sign-in button [SCI-2201]	2018-03-18 12:18:33 +01:00
zmagod	a9dfcd9681	refactor	2018-03-16 16:38:59 +01:00
zmagod	311b2dac5a	Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142	2018-03-16 16:21:47 +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
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
mlorb	9de998e85c	code left-side menu bar	2018-03-14 14:33:34 +01:00
zmagod	a6a25bbe08	add floating alert message	2018-03-13 16:33:48 +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	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
zmagod	51af74071c	remove comments and activity modal	2018-03-13 10:52:53 +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
zmagod	2b55cd7090	rename variables	2018-03-02 14:14:27 +01:00
mlorb	08439e7f58	sign up with linkedIn account	2018-02-28 18:12:21 +01:00
zmagod	e3ca782996	add info modal for repository items [fixes SCI-2066]	2018-02-27 16:21:46 +01:00
Zmago Devetak	e0510ab448	Merge pull request #995 from ZmagoD/zd_SCI_2040 ... fixed bug with assigned repository items [fixes SCI-2040]	2018-02-15 13:05:30 +01:00
zmagod	78e902f316	fixes few Hound alerts	2018-02-15 11:06:59 +01:00
zmagod	27b7aff3ea	fixed bug with assigned repository items [fixes SCI-2040]	2018-02-12 10:49:35 +01:00
zmagod	bd1345d560	fixes bug with assets upload on task result page, ... adds ctrl+v listener to upload images from clipboard, adds image preview modal	2018-02-06 15:39:19 +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	959eddacda	Clear selected rows when changing pages on samples table[SCI-1329]	2018-01-18 17:41:35 +01:00
okriuchykhin	aef80f86b5	Merge pull request #934 from okriuchykhin/ok_SCI_1931 ... Fix protocol import button [SCI-1931]	2018-01-18 10:30:19 +01:00
Zmago Devetak	b9e56c49ef	Merge pull request #944 from ZmagoD/zd_SCI_1938 ... fixes bug with comment actions dropdown [fixes SCI-1938]	2018-01-17 13:42:36 +01:00
zmagod	5371f5a139	fixes bug with comment actions dropdown [fixes SCI-1938]	2018-01-17 12:54:21 +01:00
Oleksii Kriuchykhin	74a62c41eb	Fix task repository row selector [SCI-1940]	2018-01-17 11:21:41 +01:00
Oleksii Kriuchykhin	deabd39a98	Fix protocol import button [SCI-1931]	2018-01-15 13:43:09 +01:00
Zmago Devetak	4e4cae9a48	Merge pull request #927 from ZmagoD/zd_SCI_1867 ... fix import protocol preview [fixes SCI-1867]	2018-01-08 14:21:44 +01:00
zmagod	7af4816ce8	removes js brakepoint	2018-01-05 17:13:39 +01:00
zmagod	3fae267547	fix import protocol preview [fixes SCI-1867]	2018-01-05 15:30:11 +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
zmagod	0d72851bb5	fixes bug with displaying assign/unassign button [fixes SCI-1870]	2018-01-04 17:20:17 +01:00
okriuchykhin	3d3b1d3a44	Merge pull request #921 from okriuchykhin/ok_SCI_1648 ... Fix assign repository record button in tasks when one record is selected [SCI-1648]	2018-01-03 16:28:34 +01:00
zmagod	1d3881b649	fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]	2018-01-03 13:48:59 +01:00
Oleksii Kriuchykhin	89230bd730	Fix about modal [SCI-1875]	2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin	27008be50e	Fix assign repository record button in tasks when one record is selected [SCI-1648]	2017-12-22 18:05:22 +01:00
okriuchykhin	0a6d0d1a47	Merge pull request #918 from okriuchykhin/ok_SCI_1893 ... Fix invite users dropdown [SCI-1893]	2017-12-22 16:58:49 +01:00
Oleksii Kriuchykhin	917c2cf28e	Fix experiment workflow image update indicator [SCI-1872]	2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin	afb579bef1	Fix invite users dropdown [SCI-1893]	2017-12-21 16:49:10 +01:00
Zanz2	1fc8b2a2b2	quick fix un-needed styling	2017-12-10 01:45:47 +01:00
Zanz2	d0a9198408	Fixed the styling	2017-12-10 01:20:08 +01:00
okriuchykhin	b3b0e367e8	Merge pull request #889 from okriuchykhin/ok_SCI_1747 ... Improve server side assets validation display for steps [SCI-1747]	2017-12-04 14:12:43 +01:00
Oleksii Kriuchykhin	373d7e8aa6	Clear selected files after successful upload [SCI-1747]	2017-12-01 11:51:22 +01:00
Oleksii Kriuchykhin	c4fe2b1c11	Fix jsPlumb library loading [SCI-1839]	2017-12-01 10:48:07 +01:00
Oleksii Kriuchykhin	745dac09a7	Improve clean-up of dropped files [SCI-1747]	2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin	6964ed2dbb	Add initialization of the selectpicker on experiments actions [SCI-1840]	2017-11-28 16:34:30 +01:00
Oleksii Kriuchykhin	e35031dd9a	Small code fixies [SCI-1747]	2017-11-28 11:34:57 +01:00
Zmago Devetak	027f4a5921	Merge pull request #890 from ZmagoD/zd_SCI_1651 ... export and import RTE images	2017-11-24 16:28:28 +01:00
zmagod	d200e355ed	follow @Ducz0r 's suggestions	2017-11-24 11:45:07 +01:00
zmagod	afbeafb137	adds RTE images import, disables turbolinks on edit step actions	2017-11-22 16:28:14 +01:00
Zanz2	f577bf93b5	Fixed pull request review	2017-11-21 19:20:15 +01:00
Oleksii Kriuchykhin	fe8b7d26c1	Improve server side assets validation display for steps [SCI-1747]	2017-11-21 13:48:06 +01:00
Mojca Lorber	ff998a6c98	change text for avatar size on my profile page	2017-11-15 14:21:04 +01:00
mlorb	cd6799d571	Merge pull request #866 from biosistemika/protocols-io-import ... Protocols io import	2017-11-13 11:53:28 +01:00
zmagod	f43492adff	trigger an alert to on canvas save if page reload [fixes SCI-1610]	2017-11-07 15:08:26 +01:00
mlorb	126f278308	Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json ... Scinote protocols IO base branch	2017-11-06 14:53:01 +01:00
Zanz2	4354363215	rubocop refactor css	2017-11-03 16:46:03 +01:00
Zanz2	ac26b17ddf	Rubocop refactor	2017-11-03 16:45:15 +01:00
Luka Murn	8254153bb9	Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock app/models/connection.rb app/models/experiment.rb app/models/my_module.rb	2017-10-23 08:57:57 +02:00
Oleksii Kriuchykhin	631b41cdaa	Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]	2017-10-19 11:38:23 +02:00
okriuchykhin	db9a031581	Merge pull request #813 from okriuchykhin/ok_SCI_1642 ... Refactor canvas [SCI-1642]	2017-10-12 17:45:34 +02:00
Oleksii Kriuchykhin	b26b963e54	Optimize update canvas SQL and remove module group name [SCI-1642]	2017-10-05 16:19:25 +02:00
Zanz2	dd4d4072e8	Made code more aesthetic	2017-09-22 16:02:56 +02:00
Zanz2	4051c0b06b	Deleted old unused files i spotted on github	2017-09-22 13:28:38 +02:00
Zanz2	6a07aa28e4	Accidentally removed this line after reviewing git changes, adding it back	2017-09-22 13:11:49 +02:00
Luka Murn	beae1b05d8	Merge branch 'master' into rails-5.1 ... Conflicts: Gemfile Gemfile.lock	2017-09-21 08:27:38 +02:00
Zanz2	d59234a1e3	minor changes, working on refresh after submit	2017-09-20 16:04:52 +02:00
Zanz2	d85e02730d	Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc	2017-09-15 12:19:58 +02:00
Zanz2	b7432b336a	added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller	2017-09-13 15:15:08 +02:00
Žan Žagar	2a7a2b8fa1	Changed some minor button text and fixed a local error	2017-09-12 09:26:22 +02:00
Žan Žagar	62350d0d42	Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later	2017-09-11 16:03:33 +02:00
Žan Žagar	f668f60237	dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni	2017-09-11 15:22:22 +02:00
Jure Grabnar	b4a13dffe3	init commit, dodav na protocols index gumb z dropdown	2017-09-11 13:07:22 +02:00
Mojca Lorber	a0f7030a70	fix bug with tinyMCE text validaton	2017-09-07 14:54:12 +02:00
Luka Murn	85634b2fb6	Add 'off' before setting export button to 'on'	2017-08-07 14:04:39 +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
Matej Zrimšek	d90ca1b934	Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481]	2017-08-02 16:49:53 +02:00
zmagod	dfc8ea7fbf	don't hide modal [fixes SCI-1487]	2017-07-25 14:33:41 +02:00
Oleksii Kriuchykhin	6c33b46f6a	Improve import of repository records plus tsv file import fixes [SCI-1487]	2017-07-20 11:44:10 +02:00
Zmago Devetak	7b898666da	Merge pull request #745 from ZmagoD/zd_SCI_1485 ... refactor repositories js files [fixes SCI-1485]	2017-07-19 11:17:52 +02:00
zmagod	a2b7bcda4c	refactor repositories js files [fixes SCI-1485]	2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin	036ee390ed	Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]	2017-07-14 16:19:03 +02:00
Zmago Devetak	69919359f1	Merge pull request #738 from ZmagoD/zd_SCI_1452 ... fixes issue with smart annotations in repositories [fixes SCI-1452]	2017-07-12 14:50:29 +02:00
Luka Murn	73a4cd1e4f	Merge pull request #737 from Ducz0r/lm-sci-1450 ... Add versioning modal & support to sciNote [SCI-1450]	2017-07-11 09:47:51 +02:00
zmagod	baaec67399	fixes issue with smart annotations in repositories [fixes SCI-1452]	2017-07-10 16:22:32 +02:00
Oleksii Kriuchykhin	a6b80589f2	Fix default order of the columns in repositories [SCI-1445]	2017-07-10 15:32:18 +02:00
Luka Murn	3e80f761b8	Add "about" modal, prepare hooks, VERSION system for addons ... Also the addon generator is fixed so it properly creates VERSION file for new addons.	2017-07-10 15:27:50 +02:00
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
okriuchykhin	75c887ce7d	Merge pull request #721 from okriuchykhin/ok_SCI_1412 ... Fix activities [SCI-1412]	2017-07-04 10:59:08 +02:00
mlorb	1b2884c1b7	Merge pull request #722 from mlorb/ml-sci-1396 ... Fix bugs on projects page [SCI-1396]	2017-07-03 15:37:16 +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
zmagod	68cfac4a38	adds images into assets folder	2017-06-29 11:04:31 +02:00
Mojca Lorber	21b4ba7627	fix bugs on projects page	2017-06-28 17:15:09 +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
okriuchykhin	d126391940	Merge pull request #710 from okriuchykhin/ok_SCI_1356 ... Add global search in custom repositories [SCI-1356]	2017-06-27 13:41:53 +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
Oleksii Kriuchykhin	fc72453a5b	Fix hound warning [SCI-1356]	2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin	e038bc58fa	Add global search in custom repositories [SCI-1356]	2017-06-23 16:12:56 +02:00
zmagod	819f47b450	setup sciNote for Rails 5.1	2017-06-23 15:19:08 +02:00
zmagod	75507107fd	migrate to 4.2.9	2017-06-23 08:50:12 +02:00
Zmago Devetak	cffac82e88	Merge pull request #704 from ZmagoD/zd_SCI_1392 ... fixes bug with long text in parse records modal [fixes SCI-1392]	2017-06-22 17:47:15 +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
Mojca Lorber	1ba32e19cb	allign no. of pages and showing entries per page	2017-06-22 14:23:03 +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
mlorb	ff02c45f5f	Merge pull request #695 from mlorb/ml_sci_1353 ... Retain the same word case in repositories dropdown [SCI-1353]	2017-06-19 14:48:58 +02:00
zmagod	70fa681519	split the import service	2017-06-19 14:05:37 +02:00
Mojca Lorber	f77b1aa4e8	retain the same word case in repositories dropdown	2017-06-19 10:32:12 +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
Zmago Devetak	4873624cec	Merge pull request #658 from ZmagoD/zd_SCI_1011 ... Multiple file upload with drag & drop capability in steps and results	2017-06-09 10:03:33 +02:00
zmagod	33b996ffee	refactor	2017-06-09 09:49:57 +02:00
Luka Murn	7bb1af3692	Minor JS fix	2017-06-08 15:28:26 +02:00
Mojca Lorber	0004c2b7d5	fix selection of tab after redirection	2017-06-08 14:17:27 +02:00
Mojca Lorber	71c523c406	load tabs with javascript	2017-06-08 13:47:30 +02:00
Luka Murn	2ab31aba2f	Merge pull request #660 from Ducz0r/lm-sci-1270 ... Copy repository functionality [SCI-1270]	2017-06-08 11:45:57 +02:00
Luka Murn	27feb46d8f	Merge pull request #659 from Ducz0r/lm-sci-1279 ... Include repositories in reports [SCI-1279]	2017-06-08 11:24:21 +02:00
Luka Murn	38361e4bb4	Setup initial GUI	2017-06-07 18:43:48 +02:00
Luka Murn	0aee11d6d8	Hound is love, Hound is life #2	2017-06-07 18:26:32 +02:00
Matej Zrimšek	77a225ec31	Added toggle between assigned and all repository records. [SCI-1276]	2017-06-07 18:13:25 +02:00
Luka Murn	02dd6636ba	Allow saving & editing of reports with repository elements ... Closes SCI-1279.	2017-06-07 16:55:00 +02:00
Luka Murn	b5f6d1da94	Allow custom repositories to be added to reports	2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin	ad8dd6d740	PR fixes [SCI-1274]	2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin	8b1190060e	Add custom repository table [SCI-1274]	2017-06-07 15:23:25 +02:00
Zmago Devetak	fcec42ae31	Merge pull request #645 from ZmagoD/zd_SCI_1278 ... generates samples csv file in background job [fixes SCI-1278]	2017-06-07 15:04:24 +02:00
zmagod	c6bb20039b	adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]	2017-06-07 13:29:39 +02:00
Mojca Lorber	51c4eeb106	renaming	2017-06-06 15:50:43 +02:00
Mojca Lorber	39dda1ad5d	refactoring	2017-06-06 13:18:44 +02:00
ajugo	887d9a4f52	Samples - show all/show assigned [SCI-1277] (#644) ... * Samples - show all/show assigned [SCI-1277] * Some fixes in code * Some minor fixes in code * Omit present * Correct missed present * Fixing hound warnings	2017-06-06 12:46:56 +02:00
Mojca Lorber	da98788031	small code fixes	2017-06-06 09:57:50 +02:00
Mojca Lorber	13bf4ad229	create new repository	2017-06-06 09:54:39 +02:00
Luka Murn	f382c04f01	Refactor JS code a bit ... Closes SCI-1323.	2017-06-06 08:02:01 +02:00
Luka Murn	1712fc0611	Fix bug with protocol preview modal not working in protocol repo ... Closes SCI-1323.	2017-06-05 17:10:13 +02:00
Matej Zrimšek	2c6ad4aa05	Refactored modal popups for repositories to make them general. [fix 1269]	2017-06-05 14:13:24 +02:00
zmagod	ab4961ddb1	adds overlay partial	2017-06-05 11:31:05 +02:00
zmagod	67d902db52	refactor	2017-06-05 10:43:58 +02:00
Matej Zrimšek	d8d54232c3	After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]	2017-06-02 19:08:51 +02:00
Matej Zrimšek	c82fd66146	Removed unneeded utility JS function. [SCI-1269]	2017-06-02 17:52:04 +02:00
Matej Zrimšek	f8258812ef	Repository remove and rename refactoring. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	21a72da84f	Added rename logic and improved remove logic. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	cdaac6a01b	Added remove repository modal logic. [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	791bb934ca	Remove repository modal logic (WIP). [SCI-1269]	2017-06-02 17:50:33 +02:00
zmagod	1c021b11db	adds drag and drop files upload to steps [fixes SCI-1310]	2017-06-02 16:34:09 +02:00
ajugo	a9bd86352d	Step: wrong last columns of table [fixes SCI-405] (#600) ... * Step: wrong last two columns of table after add table results [fixes SCI-405] * Changing double quotes to single * Adding empty line back	2017-06-01 15:52:02 +02:00
Luka Murn	fcc3995049	Merge pull request #647 from biosistemika/master ... Bring latest master changes into custom-repositories	2017-05-30 14:18:14 +02:00
zmagod	b527afd12b	generates samples csv file in background job [fixes SCI-1278]	2017-05-29 14:42:55 +02:00
Zmago Devetak	1df6265326	Merge pull request #627 from ZmagoD/zd_SCI_1280 ... prevent to duplicate new step [fixes SCI-1280]	2017-05-29 09:55:22 +02:00
zmagod	5806cb8e67	removes unneeded animateSpinner call	2017-05-29 09:10:11 +02:00
mz3944	9fe3b717c8	Merge pull request #626 from mz3944/mz-SCI-487 ... Simplify "Add contents to report" popup	2017-05-23 09:57:39 +02:00
Oleksii Kriuchykhin	e99e3edb7b	Add repositories dropdown to task navigation [SCI-1273]	2017-05-18 14:21:00 +02:00
ajugo	1abaefce4f	At importing large sample file, error flash message appears [fixes SCI-903] (#625) ... * At importing large sample file, error flash message appears [fixes SCI-903] * Changing double quotes to single * Adding animatedSpinner	2017-05-18 09:19:44 +02:00
Matej Zrimšek	20265ddd69	Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]	2017-05-17 18:18:57 +02:00
Oleksii Kriuchykhin	bbf6d38c50	Fix error handling in result_assets [SCI-1288]	2017-05-17 15:14:35 +02:00
zmagod	b21923cf98	prevent to duplicate new step [fixes SCI-1280]	2017-05-16 11:52:07 +02:00
Matej Zrimšek	79ec3b5e4c	Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	901558c733	Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	ba693c65a8	Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	b97cb91840	Refactoring of modal for adding content to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	27cfd55ea5	Simplified popup modal for adding contents to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
zmagod	9bec7dd96e	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248	2017-05-15 14:49:37 +02:00
zmagod	d34b2520b5	refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]	2017-05-12 15:59:58 +02:00
zmagod	070a829c49	change new results hendlers	2017-05-12 10:02:33 +02:00
zmagod	81a3cb0a41	adds results js code in modules	2017-05-11 16:54:28 +02:00
mlorb	219921ee33	Merge pull request #612 from mlorb/ml_sci_1250 ... Fix sample page bugs when editing column name [SCI-1250]	2017-05-11 13:48:20 +02:00
okriuchykhin	328c9292b1	Merge pull request #606 from okriuchykhin/ok_SCI_1235 ... Fix error messages display during file upload in steps and results [SCI-1235]	2017-05-11 13:00:36 +02:00
Mojca Lorber	86bc6adc2a	fix lost column updated name at sample page and bug with another user not able to view column dropdown	2017-05-11 11:16:12 +02:00
zmagod	2081e0a94b	Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1	2017-05-10 15:14:17 +02:00
zmagod	a4032f5cc6	first run	2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin	52ad5ecdc2	Fix error messages display during file upload in steps and results [SCI-1235]	2017-05-09 17:13:47 +02:00
Oleksii Kriuchykhin	620a989a2f	Improve view of badges on experiment canvas [SCI-152]	2017-05-09 14:07:23 +02:00
okriuchykhin	ccc640f2bc	Merge pull request #593 from okriuchykhin/ok_SCI_1158 ... Add advanced search options [SCI-1158]	2017-05-09 10:23:34 +02:00
okriuchykhin	bd0b930382	Merge pull request #598 from okriuchykhin/ok_SCI_152 ... Add counters for users and comments on canvas [SCI-152]	2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin	bd5a48b9c8	Improve code style [SCI-1158]	2017-05-08 18:00:14 +02:00
Oleksii Kriuchykhin	344b9c290a	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +02:00
okriuchykhin	f292dab3b5	Merge pull request #594 from okriuchykhin/ok_SCI_1029_v2 ... Change color of loading animation in reports [SCI-1029]	2017-05-08 13:35:00 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 ... Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin	3f60439948	Change color of loading animation in reports [SCI-1029]	2017-05-08 11:02:51 +02:00
Oleksii Kriuchykhin	0ee7e11620	Add advanced search options [SCI-1158]	2017-05-05 16:41:23 +02:00
mlorb	4c85ac7bf5	Merge pull request #588 from mlorb/ml_sci_191 ... Add information how many samples are selected [SCI-191]	2017-05-05 15:24:16 +02:00
Zmago Devetak	de3d1172c1	Merge pull request #584 from ZmagoD/zd_SCI_1200 ... add popup for approval to complete the Task [fixes SCI-1200]	2017-05-05 14:57:27 +02:00
Mojca Lorber	45baba1803	fix zmago the hound	2017-05-04 16:46:52 +02:00