3805 commits

Author	SHA1	Message	Date
zmagod	f2c0b3aa92	removes samples, adds list_items	2018-06-13 12:45:48 +02:00
Zmago Devetak	29fe58de80	Merge pull request #1208 from ZmagoD/zd_SCI_2408 ... adds an additional check if some other user has added/removed reposit…	2018-06-13 11:30:43 +02:00
Zmago Devetak	2eb6613c6a	Merge pull request #1206 from ZmagoD/zd_SCI_2442 ... make manage columns page more responsive [fixes SCI-2442]	2018-06-13 11:14:35 +02:00
Zmago Devetak	d457a66996	Merge pull request #1205 from ZmagoD/zd_SCI_2427 ... enables tooltip on long column names [fixes SCI-2427]	2018-06-13 11:14:29 +02:00
Zmago Devetak	a8981d7039	Merge pull request #1201 from ZmagoD/zd_SCI_2421 ... fixes bug with tinymce/at.js [fixes SCI-2421]	2018-06-13 11:14:17 +02:00
Zmago Devetak	673410251d	Merge pull request #1197 from ZmagoD/zd_SCI_2384 ... fixes repository table on sidebar toggle [fixes SCI-2384]	2018-06-13 09:57:27 +02:00
Zmago Devetak	50c1a712d8	Merge pull request #1204 from ZmagoD/zd_SCI_2434 ... fixes bug with repository items dropdown [fixes SCI-2434]	2018-06-13 08:42:13 +02:00
Zmago Devetak	6cab1746cd	Merge pull request #1202 from ZmagoD/zd_SCI_2392 ... prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-13 08:41:41 +02:00
Zmago Devetak	e06ab02f68	Merge pull request #1192 from ZmagoD/zd_SCI_2435 ... removes visibility toggle from Name column [fixes SCI-2435]	2018-06-13 08:41:25 +02:00
Luka Murn	9a4fdd166e	Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix ... Conflicts: app/views/projects/index.html.erb	2018-06-12 17:44:42 +02:00
zmagod	f8ac083d39	adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]	2018-06-12 15:28:03 +02:00
Luka Murn	a66d65fb28	Fix the sign in halt layout ... ... so it's not dependant on common addon any more.	2018-06-12 14:47:15 +02:00
zmagod	1cff4a5060	make manage columns page more responsive [fixes SCI-2442]	2018-06-12 10:22:48 +02:00
zmagod	a8971b4e20	enables tooltip on long column names [fixes SCI-2427]	2018-06-11 15:22:56 +02:00
Zmago Devetak	a174e186bb	removes unneeded code	2018-06-11 15:00:13 +02:00
zmagod	256e502982	fixes bug with repository items dropdown [fixes SCI-2434]	2018-06-11 14:57:27 +02:00
mlorb	1e1330847f	remove unused code	2018-06-11 14:49:03 +02:00
mlorb	40f3365596	fix bug with truncating string	2018-06-11 14:47:25 +02:00
zmagod	32a09f9780	prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-11 13:03:11 +02:00
zmagod	374a16abad	fixes bug with tinymce/at.js [fixes SCI-2421]	2018-06-11 10:18:35 +02:00
okriuchykhin	acd6efae57	Merge pull request #1200 from okriuchykhin/ok_SCI_2212 ... Add result content hook [SCI-2212]	2018-06-11 09:28:30 +02:00
Zmago Devetak	6ba5c587f7	Merge pull request #1189 from ZmagoD/zd_SCI_2211 ... add data-hook, refactor add user to project modal to support addons	2018-06-08 15:23:26 +02:00
Zmago Devetak	a7dc4f8933	Merge pull request #1194 from ZmagoD/add_data_hook ... adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]	2018-06-08 14:49:48 +02:00
Zmago Devetak	0b5c1e3ecc	Merge pull request #1195 from ZmagoD/zd_SCI_2487 ... fixes assign items flash message [fixes SCI-2487]	2018-06-08 14:40:48 +02:00
Zmago Devetak	eff68aead8	Merge pull request #1193 from ZmagoD/zd_SCI_2481_ ... fixes project validation message [fixes SCI-2481]	2018-06-08 14:40:27 +02:00
Zmago Devetak	74ccaf06b9	Merge pull request #1184 from ZmagoD/zd_SCI_2417 ... adds asset_text_data to global search options	2018-06-08 14:30:52 +02:00
Oleksii Kriuchykhin	87925271e8	Add result content hook [SCI-2212]	2018-06-08 14:22:03 +02:00
Luka Murn	bfaedab4b4	Fix buttons style on tags modal ... Closes SCI-2397.	2018-06-08 13:43:23 +02:00
zmagod	b7ecf09963	fixes repository table on sidebar toggle [fixes SCI-2384]	2018-06-08 10:58:28 +02:00
zmagod	f769215468	fixes assign items flash message [fixes SCI-2487]	2018-06-08 10:02:57 +02:00
zmagod	86c4093bf2	adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]	2018-06-08 09:41:04 +02:00
Luka Murn	eb29c50379	Fix asset link preview, fix inventory item modal window styling	2018-06-08 09:01:59 +02:00
Luka Murn	dbceac7aa4	Style inventories secondary navigation section	2018-06-08 08:31:22 +02:00
zmagod	11ebea573a	fixes project validation message [fixes SCI-2481]	2018-06-07 16:42:11 +02:00
Luka Murn	4cdfe67115	Fix protocol management filter display (css)	2018-06-07 15:57:59 +02:00
zmagod	51e024e3d7	adds data-hooks to reports and search results [fixes SCI-2374]	2018-06-07 14:29:40 +02:00
zmagod	c0b659a252	adds data-hook to repositories/show page	2018-06-07 10:50:48 +02:00
Luka Murn	b324a2dab3	Restyle activities page	2018-06-07 09:29:47 +02:00
Luka Murn	0417af716b	Remove new experiment button from canvas, change edit canvas btn	2018-06-06 17:41:07 +02:00
zmagod	43a60b632a	adds datahook to experiment card [fixes SCI-2373]	2018-06-06 17:28:04 +02:00
Luka Murn	c07fa5adc2	Update blank page for projects	2018-06-06 17:23:22 +02:00
Luka Murn	e0a3b5a941	Fix Save PDF to repository modal window	2018-06-06 16:29:07 +02:00
zmagod	a51ea399f4	removes unneeded empty lines	2018-06-05 16:39:22 +02:00
zmagod	66cac0b676	removes visibility toggle from Name column [fixes SCI-2435]	2018-06-05 16:36:36 +02:00
Luka Murn	3823eb8c74	Merge pull request #1191 from ZmagoD/zd_SCI_2486 ... fixes project duplication [fixes SCI-2486]	2018-06-05 09:49:34 +02:00
zmagod	2def874ffd	fixes project duplication [fixes SCI-2486]	2018-06-05 09:44:03 +02:00
Zmago Devetak	fad67d7730	Merge pull request #1185 from ZmagoD/zd_SCI_2468 ... Limits the max. amount of rows when importing into inventories [fixes…	2018-06-04 16:29:33 +02:00
zmagod	9b9143f145	add hook to tab pane	2018-06-01 16:46:27 +02:00
okriuchykhin	04accc8fc8	Merge pull request #1190 from okriuchykhin/ok_SCI_2478 ... Fix project_tree for non admin users [SCI-2478]	2018-06-01 16:40:05 +02:00
Oleksii Kriuchykhin	8de0e282e3	Fix project_tree for non admin users [SCI-2478]	2018-06-01 16:38:49 +02:00
zmagod	997748561b	adds missing js changes	2018-06-01 16:14:50 +02:00
zmagod	84170f6de0	add data-hook, refactor add user to project modal to support addons	2018-06-01 16:13:22 +02:00
okriuchykhin	5ba60d9f8f	Merge pull request #1188 from okriuchykhin/ok_SCI_2478 ... Improve sidebar rendering performance [SCI-2478]	2018-06-01 15:17:34 +02:00
Luka Murn	4ba07fb082	Merge pull request #1186 from Ducz0r/lm-sci-2477-fix ... Move sign-in flow layout to core [SCI-2477]	2018-06-01 15:08:44 +02:00
Oleksii Kriuchykhin	58d8414f92	Code fixes for sidebar [SCI-2478]	2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin	2ddc0fb561	Improve sidebar rendering performance [SCI-2478]	2018-06-01 13:49:02 +02:00
mlorb	0a8bfdb860	Reposition the arrow for opening/closing of Navigation	2018-06-01 13:18:49 +02:00
Luka Murn	20ffa57583	Move sign-in flow layout to core ... Closes SCI-2477.	2018-06-01 09:11:48 +02:00
zmagod	9abf50e7c5	Limits the max. amount of rows when importing into inventories [fixes SCI-2468]	2018-05-31 10:45:31 +02:00
zmagod	3da098cb60	fixes the issue with extraction of text from file [fixes SCI-2417]	2018-05-31 09:42:57 +02:00
Luka Murn	58e6701b0a	Merge pull request #1181 from Ducz0r/lm-sci-2471-fix ... Fix inventory rows without files not being saved bug [SCI-2471]	2018-05-30 18:33:50 +02:00
Zmago Devetak	28abdf285e	Merge pull request #1183 from ZmagoD/zd_SCI_2451_v2 ... fixes sidebar [fixes SCI-2451]	2018-05-30 18:21:03 +02:00
mlorb	c17a947969	Merge pull request #1182 from mlorb/ml-sci-2459 ... Fix position of navigation bar is not saved [SCI-2459]	2018-05-30 18:10:01 +02:00
mlorb	35badd8bb8	move variable declaration	2018-05-30 17:58:18 +02:00
zmagod	e06ae9b543	fixes sidebar [fixes SCI-2451]	2018-05-30 16:53:08 +02:00
mlorb	100ddf127d	fix position of navigation bar is not saved	2018-05-30 16:46:27 +02:00
Luka Murn	68f5a6bebd	Fix inventory rows without files not being saved bug ... Closes SCI-2471.	2018-05-30 14:41:20 +02:00
mlorb	858b95d851	fix align bullet with a file name	2018-05-30 13:58:16 +02:00
okriuchykhin	3253cac86f	Merge pull request #1178 from okriuchykhin/ok_SCI_2462 ... Add user id tracking when discarding repository [SCI-2462]	2018-05-30 10:23:17 +02:00
Zmago Devetak	332ddd9c10	Merge pull request #1177 from ZmagoD/zd_SCI_2420 ... fixes bug with empty submit of repository row [fixes SCI-2420]	2018-05-29 15:38:45 +02:00
Oleksii Kriuchykhin	6cf9149baa	Add user id tracking when discarding repository [SCI-2462]	2018-05-29 15:33:02 +02:00
zmagod	b74598a748	fixes bug with empty submit of repository row [fixes SCI-2420]	2018-05-29 14:47:40 +02:00
zmagod	89046e9787	fixes items assign flash message [fixes SCI-2395]	2018-05-29 12:54:41 +02:00
okriuchykhin	6deaa7235b	Merge pull request #1136 from okriuchykhin/ok_SCI_2396 ... Handle situation with smart annotations and zero inventories [SCI-2396]	2018-05-28 17:23:29 +02:00
Zmago Devetak	147e74b4a5	Merge pull request #1164 from ZmagoD/zd_SCI_2448 ... adds discard gem, move deletion of repositories in a rake task to run…	2018-05-28 15:04:54 +02:00
Zmago Devetak	ad5114090f	Merge pull request #1165 from ZmagoD/zd_SCI_2433 ... fixes tast description/due-date modal [fixes SCI-2433]	2018-05-28 13:10:15 +02:00
okriuchykhin	0e6c89c3de	Merge pull request #1166 from okriuchykhin/ok_SCI_2342 ... Fix WOPI controller to support repositories [SCI-2342]	2018-05-28 13:07:17 +02:00
okriuchykhin	2e79af3412	Merge pull request #1174 from okriuchykhin/ok_SCI_2458 ... Fix left menu word breaking [SCI-2458]	2018-05-28 13:06:26 +02:00
Luka Murn	80323eaf67	Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle ... Conflicts: app/assets/javascripts/sidebar_toggle.js.erb	2018-05-28 12:39:24 +02:00
Luka Murn	e611e76fae	Fix Hound errors	2018-05-28 11:53:49 +02:00
mlorb	2bce62cab8	Merge branch 'ux-release-1' into ml-sci-2405	2018-05-28 11:43:14 +02:00
mlorb	f791234ec7	changes on Zmago's request	2018-05-28 11:36:37 +02:00
Zmago Devetak	9513efa3f3	Merge pull request #1173 from ZmagoD/zd_SCI_2451 ... fixes sidebar animation [fixes SCI-2451]	2018-05-28 11:18:07 +02:00
Oleksii Kriuchykhin	f0362a0c02	Fix left menu word breaking [SCI-2458]	2018-05-28 10:42:07 +02:00
Zmago Devetak	792b134737	Merge pull request #1170 from ZmagoD/zd_SCI_2437 ... adds flash_message div in manage repository column page	2018-05-28 10:32:06 +02:00
zmagod	485993f2f6	fixes sidebar animation [fixes SCI-2451]	2018-05-28 10:28:35 +02:00
mlorb	099cc29abb	fix tests	2018-05-28 09:29:46 +02:00
Luka Murn	b3ae1d8fa6	Remove some dead code, make sidebar toggle animated	2018-05-27 16:24:47 +02:00
Luka Murn	b86edf20a5	Remove auto-toggling of navigation sidebar depending on width	2018-05-27 15:44:15 +02:00
Luka Murn	8b527d8a5b	Restyle left side menu bar so it also works with lower heights	2018-05-27 15:24:49 +02:00
Luka Murn	6e6b6803e6	Remove session-stored toggle state of navigation bar	2018-05-27 15:24:11 +02:00
Luka Murn	ce4883522a	Merge pull request #1171 from biosistemika/lm-change-login-btn-to-primary ... Change login button color to green	2018-05-25 17:15:57 +02:00
Luka Murn	0fc278a74c	Merge pull request #1169 from biosistemika/lm-remove-report-sidebar-file ... Delete _report_sidebar.html.erb	2018-05-25 17:15:27 +02:00
mlorb	f02363dfce	fix error if user is not assigned to any teams	2018-05-25 17:14:22 +02:00
Luka Murn	23d8dc0b31	Change login button color to green ... What it says, change it to `btn-primary`.	2018-05-25 17:05:00 +02:00
zmagod	6512970b9c	adds flash_message div in manage repository column page	2018-05-25 14:36:15 +02:00
zmagod	c683cfdbd7	triggers the delayed job in the controller action, fixes smart annotations	2018-05-25 11:41:43 +02:00
Luka Murn	c76b926387	Delete _report_sidebar.html.erb ... This file is no longer needed from my research.	2018-05-25 11:04:05 +02:00
Luka Murn	fe3ddb7c65	Update code so it works	2018-05-25 08:50:27 +02:00
Oleksii Kriuchykhin	46d6accf78	Fix search in repositories [SCI-2428]	2018-05-24 17:14:40 +02:00
Oleksii Kriuchykhin	b019ab8f61	Fix WOPI controller to support repositories [SCI-2342]	2018-05-24 16:51:25 +02:00
zmagod	10351bbf83	fixes tast description/due-date modal [fixes SCI-2433]	2018-05-24 16:44:10 +02:00
Zmago Devetak	280a926554	Merge pull request #1159 from ZmagoD/zd_SCI_2372 ... adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]	2018-05-24 16:05:56 +02:00
zmagod	06f1daf7a9	rename data-hook	2018-05-24 16:02:56 +02:00
zmagod	bbbe06e491	fixes reports index for guest users	2018-05-24 15:28:54 +02:00
zmagod	1f8db7bc49	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2340	2018-05-24 15:00:59 +02:00
zmagod	b13e39a0d9	adds discard gem, move deletion of repositories in a rake task to run in background worker [fixes SCI-2448]	2018-05-24 14:39:25 +02:00
Luka Murn	c9f3de9f27	Improve toggle	2018-05-24 13:39:04 +02:00
mlorb	c5e62207eb	fix bug with protocol preview does not open on protocols containing files	2018-05-24 11:51:27 +02:00
mlorb	f972676f8d	Merge pull request #1158 from Ducz0r/lm-sci-2416-fix ... Update software with new logo & new brand [SCI-2416]	2018-05-23 15:47:17 +02:00
mlorb	3368e3b963	Merge branch 'ux-release-1' into ml-sci-2271	2018-05-23 14:06:54 +02:00
mlorb	2bb2f8d193	Merge pull request #1161 from mlorb/ml-sci-2350 ... move the open/close arrow to the bottom of left menu [SCI-2350]	2018-05-23 14:01:12 +02:00
mlorb	00657a78a5	Merge pull request #1162 from mlorb/ml-sci-2440-v2 ... fix toggle button on inventory page [SCI-2440]	2018-05-23 14:01:02 +02:00
okriuchykhin	7b08529e39	Merge pull request #1156 from okriuchykhin/ok_SCI_2342 ... Enable editing office online files in inventories [SCI-2342]	2018-05-23 12:59:12 +02:00
okriuchykhin	f61f069c95	Merge pull request #1157 from okriuchykhin/ok_SCI_2432 ... Init selectpicker for move workflow to another experiment modal [SCI-2432]	2018-05-23 12:58:58 +02:00
mlorb	5e689f6b4d	fix toggle button on inventory page	2018-05-23 11:20:42 +02:00
mlorb	79f1a1c0ad	fix padding and change label colors	2018-05-23 11:13:28 +02:00
mlorb	7b5ec4ae3f	move the open/close arrow to the bottom of left menu	2018-05-23 09:44:46 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
zmagod	e97a98f189	adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]	2018-05-22 14:18:40 +02:00
Luka Murn	31a1641b42	Merge pull request #1155 from Ducz0r/lm-sci-2436-fix ... Update new repository row code so file columns work again [SCI-2436]	2018-05-22 09:27:32 +02:00
mlorb	e3fc0237c1	Merge pull request #1153 from mlorb/ml-sci-2440 ... Final button colour changes [SCI-2440]	2018-05-21 16:29:04 +02:00
Oleksii Kriuchykhin	39b74d6f8a	Init selectpicker for move workflow to another experiment modal [SCI-2432]	2018-05-21 16:12:39 +02:00
Oleksii Kriuchykhin	5c41527b92	Enable editing office online files in inventories [SCI-2342]	2018-05-21 15:48:48 +02:00
Luka Murn	69d1f0511f	Rename sciNote -> SciNote (app/ folder)	2018-05-21 15:19:11 +02:00
Luka Murn	cea18a44d5	Rename sciNote -> SciNote (app/javascript folder)	2018-05-21 15:18:30 +02:00
Luka Murn	6135081a71	Update new repository row code so file columns work again ... Also fix backend code a bit (so update & create of repository rows are more similar in their behavior), and fix line in JS: _initSelectPicker() was called a reduntant amount of times when editing repository row. Closes SCI-2436.	2018-05-21 14:46:30 +02:00
zmagod	ba2aafae39	fix access to public reports [fixes SCI-2340]	2018-05-21 14:45:18 +02:00
Zmago Devetak	2ac04ee476	Merge pull request #1150 from ZmagoD/zd_SCI_2426 ... migrations that fixes the bug with smart annotations [fixes SCI-2426]	2018-05-21 14:15:47 +02:00
Zmago Devetak	67127b4d89	Merge pull request #1151 from ZmagoD/zd_SCI_2344_v2 ... shorten project name [fixes SCI-2344]	2018-05-21 14:15:24 +02:00
Luka Murn	91673afbf3	Merge pull request #1149 from Ducz0r/lm-remove-unnecessary-save-on-notifications ... Remove unnecessary save on notifications	2018-05-21 13:53:23 +02:00
okriuchykhin	6dbb5bc583	Merge pull request #1152 from okriuchykhin/ok_SCI_2403 ... Change remove file button appearence [SCI-2403]	2018-05-18 17:34:56 +02:00
mlorb	0fccc71fc3	fix load protocol wording and UI-style	2018-05-18 16:57:18 +02:00
mlorb	c2cf52bb34	add another toggle button	2018-05-18 16:34:01 +02:00
mlorb	81392362ac	Final button colour changes	2018-05-18 16:24:24 +02:00
Oleksii Kriuchykhin	b79b0b79cf	Change remove file button appearence [SCI-2403]	2018-05-18 14:51:45 +02:00
zmagod	5514683f96	shorten project name [fixes SCI-2344]	2018-05-18 14:12:12 +02:00
zmagod	b8098093ee	migrations that fixes the bug with smart annotations [fixes SCI-2426]	2018-05-18 13:57:52 +02:00
Luka Murn	5e90ae7383	Remove uneccesary save when setting notification settings on user ... These methods should behave as the rest of setters on ActiveRecords, ergo setting the model state, but not saving it. The save is called at the end of the action inside the controller anyway, so this save is redundant.	2018-05-18 13:43:04 +02:00
mlorb	876717e355	add pointer cursor to arrow	2018-05-18 13:34:52 +02:00
mlorb	64cbddb9a0	UI/UX restyle - update colours for navigation	2018-05-18 10:41:32 +02:00
Zmago Devetak	c3d247faae	Merge pull request #1128 from ZmagoD/zd_SCI_2331 ... adds deface hook in support dropdown [fixes SCI-2331]	2018-05-18 09:31:02 +02:00
zmagod	8a99d35a8d	removes datatables.noSearchHidden plugin	2018-05-18 09:24:36 +02:00
zmagod	cf4c33bf92	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371	2018-05-17 15:22:43 +02:00
zmagod	38b0cb742c	removes empty space	2018-05-17 15:21:45 +02:00
mlorb	7bda68b9f4	Merge pull request #1146 from mlorb/ml-sci-2336-v3 ... Add locales [SCI-2336]	2018-05-17 13:29:47 +02:00
zmagod	e019767e90	refactor save_pdf_to_inventory_item service	2018-05-17 13:17:19 +02:00
zmagod	b125863baf	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371	2018-05-17 11:25:33 +02:00
zmagod	ca0c8cbb71	fixes typos, fixes pdf rendering	2018-05-17 11:21:34 +02:00
mlorb	933a98c1f6	fix smart anotation color	2018-05-17 11:01:15 +02:00
Zmago Devetak	5184170a90	Merge pull request #1147 from ZmagoD/zd_SCI_2399 ... fixes ajax error in repositories [fixes SCI-2399]	2018-05-16 20:34:56 +02:00
Zmago Devetak	f73bd18989	Merge pull request #1145 from ZmagoD/zd_SCI_2407 ... fixes column name in columns visibility dropdown tooltip [fixes SCI-2…	2018-05-16 20:34:40 +02:00
zmagod	87369ae16b	fixes ajax error in repositories [fixes SCI-2399]	2018-05-16 15:08:50 +02:00
okriuchykhin	e9d6b26ec6	Merge pull request #1141 from okriuchykhin/ok_SCI_2403 ... Add clear file selector button to repository edit [SCI-2403]	2018-05-16 14:55:53 +02:00
zmagod	b1b259fdbe	fixes column name in columns visibility dropdown tooltip [fixes SCI-2407]	2018-05-16 14:37:58 +02:00
mlorb	06ce285ae2	add locales	2018-05-16 14:32:15 +02:00
Zmago Devetak	8a92f1a499	Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3 ... Adds custom method that generates smart annotations name for repository	2018-05-16 13:23:25 +02:00
Zmago Devetak	9d2303c777	Merge pull request #1115 from ZmagoD/zd_SCI_2321 ... fixes images preview in repository/library [fixes SCI-2321]	2018-05-16 12:05:33 +02:00
zmagod	98baa77846	fixes cursor icon	2018-05-16 12:02:46 +02:00
mlorb	f59ea8c7a6	Merge pull request #1137 from mlorb/ml-sci-2336-v2 ... UI/UX restyle - fixes throughout application - part 2 [SCI-2336]	2018-05-16 11:30:54 +02:00
Oleksii Kriuchykhin	c8094f196c	Add margin to clear button and fix case with new file in the cell [SCI-2403]	2018-05-16 11:25:43 +02:00
zmagod	7e3dbcd92f	hound	2018-05-16 10:43:25 +02:00
zmagod	712a3c7ff6	fixes css, changes spinner in preview modal	2018-05-16 10:40:49 +02:00
Oleksii Kriuchykhin	be5d481cdc	Add clear file selector button to repository edit [SCI-2403]	2018-05-16 10:32:50 +02:00
okriuchykhin	19ed711ce2	Merge pull request #1142 from okriuchykhin/ok_SCI_2411 ... Fix pagination in global search inside repositories [SCI-2411]	2018-05-16 10:19:05 +02:00
okriuchykhin	62f0c21a79	Merge pull request #1140 from okriuchykhin/ok_SCI_2391 ... Re-init file preview modal after inventory row editing [SCI-2391]	2018-05-16 10:18:13 +02:00
okriuchykhin	3e2b455d2c	Merge pull request #1139 from okriuchykhin/ok_SCI_2385 ... Fix task resore permissions [SCI-2385]	2018-05-16 10:17:51 +02:00
okriuchykhin	a7547b9775	Merge pull request #1138 from okriuchykhin/ok_SCI_2404 ... Disable some validations in repository import to improve speed [SCI-2404]	2018-05-16 10:17:10 +02:00
okriuchykhin	ffddf3fd94	Merge pull request #1135 from okriuchykhin/ok_SCI_2394 ... Fix editing of inventory rows with existing files [SCI-2394]	2018-05-16 10:16:26 +02:00
Luka Murn	19e30b4e95	Merge pull request #1143 from Ducz0r/lm-sci-2320-fix ... Write tests for repository table state [SCI-2320]	2018-05-16 09:49:00 +02:00
zmagod	4573655ec8	adds save PDF report to inventory feature [fixes SCI-2371]	2018-05-16 09:31:19 +02:00
Zmago Devetak	b771149477	Merge pull request #1133 from ZmagoD/zd_SCI_2337 ... fixes error message for invalid file type [fixes SCI-2337]	2018-05-16 08:26:11 +02:00
Luka Murn	63b7b937bb	Fix a bug with table order not updating properly with col deletion	2018-05-15 20:44:15 +02:00
Oleksii Kriuchykhin	0ca0884937	Fix pagination in global search inside repositories [SCI-2411]	2018-05-15 17:48:48 +02:00
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
Oleksii Kriuchykhin	1d0536b064	Fix task resore permissions [SCI-2385]	2018-05-15 11:51:53 +02:00
Oleksii Kriuchykhin	39d594b0da	Disable some validations in repository import to improve speed [SCI-2404]	2018-05-15 11:14:43 +02:00
mlorb	dfe65ccaed	UI/UX restyle - fixes throughout application - part 2	2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin	addf4cfe5e	Handle situation with smart annotations and zero inventories [SCI-2396]	2018-05-14 15:34:23 +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	3b4d9fe744	Merge pull request #1132 from okriuchykhin/ok_SCI_2301 ... Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]	2018-05-10 10:46:25 +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
zmagod	4bc01c44e9	add file name to loading image	2018-05-10 10:37:48 +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
zmagod	0fe499d4a1	adds the update action to repository records last_modified_by field when downstreaming assigned records	2018-05-10 09:04:12 +02:00
Oleksii Kriuchykhin	8ec643c54b	Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]	2018-05-09 18:03:16 +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	a6275062b7	Merge pull request #1126 from ZmagoD/zd_SCI_2344 ... adds new string truncation method [fixes SCI-2344]	2018-05-07 16:30:12 +02:00
zmagod	ed6098ece6	adds deface hook in support dropdown [fixes SCI-2331]	2018-05-07 13:09:33 +02:00
zmagod	3e10ff7fc5	add custom method that generates smart annotations name from repository name [fixes SCI-2307]	2018-05-04 10:44:23 +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	fa30278153	change dropdown lenght	2018-05-03 16:25:59 +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
Zmago Devetak	d744f24b85	Merge pull request #1118 from ZmagoD/zd_SCI_2323 ... sign_out user after 7 days [fixes SCI-2323]	2018-05-03 14:36:44 +02:00
Zmago Devetak	19d5c687ef	remove unneeded :rememberable module	2018-05-03 14:35:59 +02:00
Zmago Devetak	9ce071693d	Merge pull request #1116 from ZmagoD/zd_SCI_2310 ... parse smart annotations in repository export [fixes SCI-2310]	2018-05-03 14:34:29 +02:00
zmagod	0b721d86b1	adds new string truncation method [fixes SCI-2344]	2018-05-03 14:24:23 +02:00
Zmago Devetak	4fe4fea4fc	Merge pull request #1122 from ZmagoD/zd_SCI_2339 ... repository when sorting/searching bug fix [SCI-2339]	2018-05-03 12:05:39 +02:00
mlorb	d2c0ae241e	Merge pull request #1121 from mlorb/ml-sci-2244 ... Update buttons positions and wording throughout app [SCI-2244]	2018-05-03 11:05:15 +02:00
mlorb	ca022fead7	rename inventories buttons	2018-05-03 10:39:50 +02:00
zmagod	f04677600b	fix the missing icons on task card [fixes SCI-2347]	2018-05-03 10:05:40 +02:00
zmagod	0584453575	fixes per @okriuchykhin 's request	2018-04-26 17:18:03 +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	e9642cadad	Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304	2018-04-26 14:26:30 +02:00
zmagod	ca539cdce8	remove samples from search	2018-04-26 14:25:02 +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
zmagod	23f8f35a2c	a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339]	2018-04-26 11:05:02 +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
Zmago Devetak	a6b2bb0228	Merge pull request #1120 from ZmagoD/zd_SCI_2338 ... add permission check to repostiory show action [fixes SCI-2338]	2018-04-26 09:41:43 +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
zmagod	12365b3f0f	add permission check to repostiory show action [fixes SCI-2338]	2018-04-25 11:56:30 +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	796e7c9822	sign_out user after 7 days [fixes SCI-2323]	2018-04-24 15:42:31 +02:00
zmagod	3a4df069d7	remove task description info from canvas task card [fixes SCI-2187]	2018-04-24 15:11:48 +02:00
zmagod	7d26ce561c	parse smart annotations in repository export [fixes SCI-2310]	2018-04-24 14:53:49 +02:00
zmagod	c2d19fee52	fixes images preview in repository/library [fixes SCI-2321]	2018-04-24 13:11:55 +02:00
Zmago Devetak	1e4a975304	Merge pull request #1113 from ZmagoD/zd_SCI_2307_v2 ... rename smart annotations icons [fixes SCI-2307]	2018-04-24 10:11:30 +02:00
zmagod	503ad1ba20	removes samples from views [fixes SCI-2304]	2018-04-24 08:26:55 +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	efd1e470f6	rename smart annotations icons [fixes SCI-2307]	2018-04-23 12:38:54 +02:00
zmagod	199a2a23bf	fixes per @mlorb 's request	2018-04-23 12:26:21 +02:00
zmagod	824962c084	propagate assigned repository items in workflow [fixes SCI-2261]	2018-04-23 11:33:16 +02:00
Luka Murn	c0da83c5de	Add some additional nil guards	2018-04-20 12:31:22 +02:00
Luka Murn	d023db16af	Update the destroy_column action so it properly updates all states	2018-04-20 12:31:22 +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	d8ca42aa0c	Refactor repository_table_state and its class methods	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
Zmago Devetak	645e9a19d8	Merge pull request #1108 from ZmagoD/zd_SCI_2313 ... fix file preview [SCI-2313]	2018-04-20 10:38:23 +02:00
Zmago Devetak	76c4202664	Merge pull request #1110 from ZmagoD/zd_SCI_2311 ... fixes controller action in manage_columns	2018-04-20 10:36:31 +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
Zmago Devetak	e94f1ad6aa	Merge pull request #1109 from ZmagoD/zd_SCI_2297_v3 ... add permission to column management [fixes SCI-2297]	2018-04-20 09:57:30 +02:00
zmagod	74f23ee461	fixes controller action in manage_columns	2018-04-20 09:53: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
zmagod	078645332b	add permission to column management [fixes SCI-2297]	2018-04-20 09:34:12 +02:00
zmagod	2a5c4daa9d	fix file preview [SCI-2313]	2018-04-20 09:29:08 +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	ab4a66756e	Merge pull request #1107 from mlorb/ml-sci-2314 ... Fix file preview background [SCI-2314]	2018-04-19 17:59:01 +02:00
Zmago Devetak	6b4d786acc	Merge pull request #1105 from ZmagoD/zd_SCI_2307 ... change repository icon	2018-04-19 17:58:48 +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	bb3e1b4dcf	change repository icon	2018-04-19 15:39:24 +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
mlorb	50a4ae6163	Merge pull request #1104 from mlorb/ml-sci-2312 ... Fix blocked buttons edit and eye icon [SCI-2312]	2018-04-19 15:15:25 +02:00
mlorb	c149b3cc2a	refactoring	2018-04-19 15:12:26 +02:00
mlorb	5f93da27f2	Merge pull request #1102 from mlorb/ml-sci-2308 ... Fix screen responsiveness [SCI-2308]	2018-04-19 14:55:49 +02:00
mlorb	56e00740c1	fix blocked buttons edit and eye icon	2018-04-19 14:40:46 +02:00
mlorb	58bdce557d	Merge pull request #1098 from mlorb/ml-sci-2306 ... Fix project navigation to work with archived pages and… [SCI-2306]	2018-04-19 14:17:32 +02:00
Zmago Devetak	540dff25e7	Merge pull request #1091 from ZmagoD/zd_SCI_2254 ... adds correct preview images to files [fixes SCI-2254]	2018-04-19 14:04:24 +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
zmagod	f3af8f4524	switch current_team to repository.team	2018-04-19 13:04:16 +02:00
zmagod	66cc76f640	add view label in locales	2018-04-19 12:49:32 +02:00
zmagod	c23eacfe13	fixes for_admin action/ test visible_by functlion	2018-04-19 12:41:00 +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	600ec99c82	fix project navigation to work with archived pages and correct current team	2018-04-17 13:52:43 +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
Zmago Devetak	a0f549e935	Merge pull request #1093 from ZmagoD/zd_SCI_2296 ... hides the create new inventory button for non admin users [fixes SCI-…	2018-04-16 16:18:15 +02:00
Zmago Devetak	8803a7ca15	Merge pull request #1092 from ZmagoD/zd_SCI_2297 ... adds edit repository item permission to normal user [fixes SCI-2297]	2018-04-16 16:18:05 +02:00
mlorb	dceef349a4	fix bug and some refectoring	2018-04-16 14:10:49 +02:00
zmagod	9baaad25b6	add current_user to cloned created_by, last_modified_by field	2018-04-16 12:38:25 +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
zmagod	bef166ff30	hides the create new inventory button for non admin users [fixes SCI-2296]	2018-04-13 13:39:58 +02:00
zmagod	0adc06b1a1	adds edit repository item permission to normal user [fixes SCI-2297]	2018-04-13 13:11:29 +02:00
zmagod	4f21833373	changes per @duco 's request	2018-04-13 11:47:33 +02:00
Zmago Devetak	0815111cae	Merge pull request #1090 from ZmagoD/zd_SCI_2293 ... fixes edin/destory button on repository page after redirected from co…	2018-04-13 09:58:01 +02:00
zmagod	9812a9f160	adds correct preview images to files [fixes SCI-2254]	2018-04-13 09:43:14 +02:00
Zmago Devetak	f5127bad99	Merge pull request #1088 from ZmagoD/zd_SCI_2290 ... remove catched views [fixes SCI-2290]	2018-04-13 08:24:28 +02:00
zmagod	f2c314cc85	fix indentation	2018-04-12 17:12:45 +02:00
zmagod	3c5ce09bcd	fixes edin/destory button on repository page after redirected from columns_management page [fixes SCI-2293]	2018-04-12 17:09:53 +02:00
Zmago Devetak	478115bbb0	Merge pull request #1082 from ZmagoD/zd_SCI_2257 ... refactor update protocol keywords action [fixes SCI-2257]	2018-04-12 16:52:04 +02:00
zmagod	d084998906	remove unneeded label in destroy repository record modal [fixes SCI-2292]	2018-04-12 15:00:41 +02:00
zmagod	5f5829bbe4	fix indentation	2018-04-12 14:49:51 +02:00
zmagod	123f3b796b	remove catched views [fixes SCI-2290]	2018-04-12 14:48:14 +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
zmagod	b4deb232c0	rename variable: not_in_repository => display_image_tag	2018-04-12 13:40:17 +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	23653d1d95	refactor	2018-04-11 09:29:08 +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	e4b49e62a3	fixes import limit	2018-04-10 15:45:51 +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
zmagod	b12f6f1b92	set limit on maximum number of dropdown list items [fixes SCI-2259]	2018-04-09 12:50:25 +02:00
mlorb	8a35ce5c58	add locales	2018-04-09 10:53:03 +02:00
mlorb	80fe1dd73b	fix travis	2018-04-06 17:16:04 +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
zmagod	024032faff	refactor update protocol keywords action [fixes SCI-2257]	2018-04-06 15:41:50 +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
Zmago Devetak	e30b2261a8	Merge pull request #1077 from ZmagoD/zd_SCI_2279 ... fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]	2018-04-05 16:52:16 +02:00
Zmago Devetak	71531ebf12	refactor	2018-04-05 16:46:09 +02:00
mlorb	b8e91e91a1	refactor settings into the new navigation bar	2018-04-05 16:30:02 +02:00
Zmago Devetak	cafe042494	Merge pull request #1079 from ZmagoD/zd_SCI_2282 ... fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]	2018-04-05 16:12:23 +02:00
zmagod	218f421dff	fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]	2018-04-05 15:31:25 +02:00
Luka Murn	386ede0400	Add special middleware for handling of Rails 5.1 WOPI errors ... Closes SCI-2266.	2018-04-05 13:26:08 +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	515c95061c	fixes delete column action	2018-04-05 09:56:09 +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
zmagod	d47337fbf3	remove destroy column modal	2018-04-05 08:51:21 +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
mlorb	58433f4218	fix merge bananas	2018-04-04 16:36:26 +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	ab48e4f527	Merge pull request #1072 from ZmagoD/zd_SCI_2239 ... change export model wording [fixes SCI-2239]	2018-04-04 15:40:18 +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
Zanz2	cff2f933a0	removed byebug :D	2018-04-04 15:19:00 +02:00
Zanz2	ec743a7420	fixed the issue	2018-04-04 15:16:31 +02:00
zmagod	6e255a4657	fixes failing specs	2018-04-04 14:44:32 +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	4259fa44f9	Merge pull request #1069 from Zanz2/remotipart_workaround ... Remotipart workaround [SCI-2270]	2018-04-04 11:27:30 +02:00
Zanz2	7f36ab3e5e	deleted require and gemfile entry for remotipart	2018-04-04 11:12:39 +02:00
Zmago Devetak	685255afbc	Merge pull request #1065 from ZmagoD/zd_SCI_2222 ... refactor smart annotation parser, adds repository item to smart annot…	2018-04-04 11:07:29 +02:00
zmagod	8a156ad91e	change method name	2018-04-03 13:05:25 +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
zmagod	3d5137b56f	change export model wording [fixes SCI-2239]	2018-04-03 11:22:23 +02:00
mlorb	e5e92eb215	fix the rest of the constants	2018-04-03 10:28:39 +02:00
zmagod	7dfec94ffc	remove samples from smart annotations	2018-04-03 09:43:12 +02:00
Oleksii Kriuchykhin	d8d2d75631	Fix repository rows permissions [SCI-2265]	2018-04-02 20:48:44 +02:00
Oleksii Kriuchykhin	51860652c1	Refactor smart annotations modal [SCI-2223]	2018-04-02 20:38:56 +02:00
Zanz2	2fab3e4caa	Overlooked a small change #2	2018-04-02 20:05:06 +02:00
Zanz2	25619e5e01	Overlooked a small change	2018-04-02 20:02:59 +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
Oleksii Kriuchykhin	b7c31d704f	Merge branch 'zd_SCI_2222' of git://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_2222	2018-04-01 11:10:18 +02:00
mlorb	6a20c37449	fix travis againnnnn	2018-03-30 17:16:18 +02:00
Oleksii Kriuchykhin	f656ad1561	Fix fa icons [SCI-2217]	2018-03-30 17:03:44 +02:00
mlorb	5f0d33d75e	fix travis again	2018-03-30 16:47:23 +02:00
Zmago Devetak	f5f6fa4a4f	Merge pull request #1066 from ZmagoD/zd_SCI_2235 ... updated repository import modal html [fixes SCI-2235]	2018-03-30 14:32:53 +02:00
okriuchykhin	a6d45fea0a	Merge pull request #1059 from okriuchykhin/ok_SCI_2205 ... Add repository name to record info modal [SCI-2205]	2018-03-30 14:02:53 +02:00
Oleksii Kriuchykhin	cc855cda86	Fix translations [SCI-2205]	2018-03-30 12:48:34 +02:00
okriuchykhin	5e0cf58bc5	Merge pull request #1058 from okriuchykhin/ok_SCI_2111 ... Implement search in file repository cells and improve performance [SCI-2111]	2018-03-30 12:39:47 +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	802e917e69	updated repository import modal html [fixes SCI-2235]	2018-03-30 09:47:27 +02:00
zmagod	fd88104fe2	adds manage repository link in repository actions dropdown	2018-03-29 17:10: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
zmagod	01a548e8b3	fix hound	2018-03-29 16:11:21 +02:00
zmagod	659a088058	refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]	2018-03-29 15:55:26 +02:00
mlorb	4bf9369bc5	refactor buttons	2018-03-29 13:58:14 +02:00
okriuchykhin	31c68ab4bc	Merge pull request #1062 from okriuchykhin/ok_SCI_2201 ... Rescale Linkedin buttons [SCI-2201]	2018-03-28 15:23:05 +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
Luka Murn	c07dc98cc8	Fix Office Online editing of files [SCI-2264] ... Office Online files could not be edited. I believe the reason was that in Rails 5.1, `render nothing: true` was removed. So I replaced this in `wopi_controller` with `render body: nil`. Hopefully this will do the trick. Closes SCI-2264.	2018-03-28 13:22:30 +02:00
okriuchykhin	13fed0411b	Merge pull request #1063 from biosistemika/release-1.12.11 ... merge release 1.12.11 branch to master	2018-03-27 16:19:57 +02:00
Oleksii Kriuchykhin	1ed0b16d12	Rescale Linkedin buttons [SCI-2201]	2018-03-27 15:00:28 +02:00
Oleksii Kriuchykhin	31aed55ffc	Disable turbolinks on tasks navigation [SCI-2251]	2018-03-26 17:55:51 +02:00
okriuchykhin	145f49de2d	Revert "Update turbolinks and fix repository table init [SCI-2251]"	2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin	fac5875cfd	Add repository name to record info modal [SCI-2205]	2018-03-26 16:18:09 +02:00
okriuchykhin	784a4723cc	Merge pull request #1056 from okriuchykhin/ok_SCI_2251 ... Update turbolinks and fix repository table init [SCI-2251]	2018-03-26 14:23:30 +02:00
okriuchykhin	fc06f8c60b	Merge pull request #1055 from okriuchykhin/ok_SCI_2250 ... Skip asset if file is missing in protocol export [SCI-2250]	2018-03-26 14:19:49 +02:00
Oleksii Kriuchykhin	5dc01a3d42	Fix code style [SCI-2251]	2018-03-26 13:59:45 +02:00
Oleksii Kriuchykhin	07070df1b4	Fix users profile edit form [SCI-2251]	2018-03-26 13:47:12 +02:00
okriuchykhin	b1fcdb7474	Merge pull request #1057 from okriuchykhin/ok_SCI_2249 ... Fix sample assign permissions [SCI-2249]	2018-03-26 13:24:38 +02:00
Oleksii Kriuchykhin	e42fc3117b	Implement search in file repository cells and improve performance [SCI-2111]	2018-03-26 13:19: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
Zmago Devetak	2310439088	Merge pull request #1045 from ZmagoD/zd_SCI_2197 ... fixes import protocol bug for guest user [fixes SCI-2197]	2018-03-26 13:08:01 +02:00
zmagod	c61efb0624	rename before_acton hook	2018-03-26 13:07:00 +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
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	1797afa718	Merge branch 'ux-release-1' into ml-sci-2238	2018-03-26 10:44:43 +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
Oleksii Kriuchykhin	aa69624f9f	Fix sample assign permissions [SCI-2249]	2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin	83c7539156	Update turbolinks and fix repository table init [SCI-2251]	2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin	ecd3c73772	Skip asset if file is missing in protocol export [SCI-2250]	2018-03-25 13:36:24 +02:00
mlorb	83741358d1	fix locales	2018-03-23 16:19:06 +01:00
zmagod	baf69461f5	adds edit/create modal and related actions	2018-03-23 16:00:33 +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	5589b27883	improve message for deleting sample/report items	2018-03-23 14:39:09 +01:00
mlorb	9aa87a17e5	remove help helper	2018-03-23 14:26:53 +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
okriuchykhin	5b1951e01e	Merge pull request #1044 from okriuchykhin/ok_SCI_2117 ... Remove Power Up button [SCI-2117]	2018-03-20 09:53:17 +01:00
zmagod	064bd88584	fix assigned query	2018-03-19 17:49:09 +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
Zmago Devetak	8349b08575	Merge pull request #1012 from ZmagoD/zd_SCI_2024_fix_custom_repositores_import ... Fix custom repositories import so it supports "list of values" custom column types [fixes SCI-2024]	2018-03-19 16:41:11 +01:00
okriuchykhin	2356b78044	Merge pull request #1042 from okriuchykhin/ok_SCI_2201 ... Use larger LinkedIn sign-in button [SCI-2201]	2018-03-19 16:23:22 +01:00
zmagod	c46da5cc67	fixes import protocol bug for guest user [fixes SCI-2197]	2018-03-19 16:10:28 +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	3131ed0948	adds permission check to archived project actions dropdown [fixes SCI-2194]	2018-03-16 17:30:49 +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
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
Oleksii Kriuchykhin	27a605d974	Fix failing test [SCI-2148][SCI-2149]	2018-03-16 11:05:38 +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	c2eb6d6900	fixes hound adds specs to repository_list_items controller	2018-03-16 10:53:05 +01:00
Oleksii Kriuchykhin	f3385adb06	Merge branch 'master' into ok_SCI_2148	2018-03-16 10:21:02 +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	9fd845c478	fix failing cucumber tests	2018-03-14 17:55:04 +01:00
mlorb	9de998e85c	code left-side menu bar	2018-03-14 14:33:34 +01:00
Zanz2	bf34d82791	refactored to PR	2018-03-13 17:42:26 +01:00
zmagod	a6a25bbe08	add floating alert message	2018-03-13 16:33:48 +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
Zmago Devetak	f778415321	Merge pull request #1014 from ZmagoD/zd_SCI_2025 ... Fix custom repositories export so it supports "list of values" custom column types [fixes SCI-2025]	2018-03-13 15:20:46 +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	5b56f3dbd6	fix hound	2018-03-13 14:47:35 +01:00
okriuchykhin	503617b42c	Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025	2018-03-13 14:44:20 +01:00
okriuchykhin	f14931f6a8	Update with latest changes on branch	2018-03-13 14:37:12 +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
Oleksii Kriuchykhin	269f7d74fa	Add explicit ordering to samples_tables [SCI-2148][SCI-2149]	2018-03-13 13:16:34 +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
okriuchykhin	dfb0d923b5	Merge pull request #1030 from okriuchykhin/ok_SCI_2016 ... Add annotations migrations and optimize queries [SCI-2016]	2018-03-13 13:07:31 +01:00
Oleksii Kriuchykhin	be1ead22e0	Implement importable selector for repository columns [SCI-2078]	2018-03-13 11:36:05 +01:00
zmagod	51af74071c	remove comments and activity modal	2018-03-13 10:52:53 +01:00
Oleksii Kriuchykhin	21c07371c9	Fix repository export to support file columns [SCI-2079]	2018-03-13 10:40:27 +01:00
Oleksii Kriuchykhin	f5ecbecaf3	Fix bugs [SCI-1849]	2018-03-12 17:00:44 +01:00
zmagod	8fe173e831	re-structure top navigation bar	2018-03-12 16:27:35 +01:00
mlorb	3b9ad2f86f	Merge pull request #1028 from mlorb/ml-sci-2144 ... Add file custom column type to db [SCI-2144]	2018-03-12 15:18:02 +01:00
zmagod	e218cae453	refactor global activities in separate page [fixes SCI-2141]	2018-03-12 11:01:23 +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
Oleksii Kriuchykhin	60e3a836be	Fix typo in regex [SCI-1849]	2018-03-11 22:11:12 +01:00
Oleksii Kriuchykhin	ac009a29cb	Add annotations migrations and optimize queries [SCI-2016]	2018-03-11 22:06:44 +01:00
Zanz2	97c01c386b	pushing fix	2018-03-10 22:48:25 +01:00
Zmago Devetak	d50bc5fde9	Merge pull request #998 from ZmagoD/zd_SCI_2014 ... migration script for migrating samples -> custom repositories [SCI-2014]	2018-03-09 17:19:12 +01:00
okriuchykhin	e0834a57cf	Merge pull request #1027 from okriuchykhin/ok_SCI_2163 ... Hide delete button for guest users in repository [SCI-2163]	2018-03-09 17:16:58 +01:00
mlorb	64e26e1c60	add file custom column type to db	2018-03-09 17:04:54 +01:00
okriuchykhin	707d2a048f	Merge pull request #1024 from okriuchykhin/ok_SCI_2145 ... Fix sample record creation [SCI-2145]	2018-03-09 16:52:38 +01:00
okriuchykhin	7cbfa5936a	Merge pull request #1026 from okriuchykhin/ok_SCI_2148 ... Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]	2018-03-09 16:42:33 +01:00
Oleksii Kriuchykhin	853e1f7657	Fix nil case [SCI-2145]	2018-03-09 16:41:23 +01:00
Oleksii Kriuchykhin	cd9260f439	Hide delete button for guest users in repository [SCI-2163]	2018-03-09 16:19:36 +01:00
zmagod	22eb4121f0	follow @okriuchykhin 's suggestions	2018-03-09 15:44:42 +01:00
Oleksii Kriuchykhin	e4d974aa58	Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]	2018-03-09 15:34:06 +01:00
zmagod	0baa7a1f99	fix hound	2018-03-09 14:43:12 +01:00
zmagod	4f951f6679	adds unit specs for datatable service [fixes SCI-2068]	2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin	940469e41b	Fix user management on project [SCI-2146]	2018-03-09 12:08:34 +01:00
Oleksii Kriuchykhin	804d313f90	Fix sample record creation [SCI-2145]	2018-03-09 11:52:28 +01:00
Oleksii Kriuchykhin	1765d83cd1	Refactor search to support repository list items [SCI-2108]	2018-03-09 11:05:43 +01:00
okriuchykhin	160935cde0	Merge pull request #1022 from okriuchykhin/ok_SCI_2136 ... Fix manage repository permissions [SCI-2136]	2018-03-09 10:15:24 +01:00
okriuchykhin	d0d5481a29	Merge pull request #1021 from okriuchykhin/ok_SCI_2131 ... Fix notification for user removal from a team [SCI-2131]	2018-03-09 10:15:09 +01:00
zmagod	26883af386	fix assigned ordering	2018-03-08 17:36:10 +01:00
okriuchykhin	a306e65093	Merge pull request #1016 from okriuchykhin/ok_SCI_2130 ... Fix edit project's users modal [SCI-2130]	2018-03-07 14:04:26 +01:00
Oleksii Kriuchykhin	bd9f5c1cda	Fix manage repository permissions [SCI-2136]	2018-03-07 13:41:57 +01:00
Oleksii Kriuchykhin	1082f7f93c	Fix notification for user removal from a team [SCI-2131]	2018-03-07 13:20:17 +01:00
okriuchykhin	cae726f5c3	Merge pull request #1020 from okriuchykhin/ok_SCI_2055 ... Fix invite users link on task card [SCI-2055]	2018-03-07 09:41:23 +01:00
okriuchykhin	c0cfa6e7fe	Merge pull request #1019 from okriuchykhin/ok_SCI_2134 ... Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]	2018-03-06 18:10:05 +01:00
Oleksii Kriuchykhin	186780e68f	Fix invite users link on task card [SCI-2055]	2018-03-06 17:56:01 +01:00
Oleksii Kriuchykhin	156a639e4c	Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]	2018-03-06 17:36:40 +01:00
Oleksii Kriuchykhin	b5eb821cfa	Fix sample's custom column permissions [SCI-2135]	2018-03-06 16:40:25 +01:00
zmagod	fb66131e29	setup endpoint for repository_rows paging/search	2018-03-06 16:32:39 +01:00
Oleksii Kriuchykhin	ca66858063	Fix edit project's users modal [SCI-2130]	2018-03-06 15:49:30 +01:00
Oleksii Kriuchykhin	c933030b94	Add team export/import scripts [SCI-1849]	2018-03-06 11:26:30 +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
Matej Zrimšek	c5b0a6525b	Some additional permission calls fixes, minor refactoring.	2018-03-06 06:56:35 +01:00
Zanz2	8f5dd3df38	Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818 ... Table missing scrollbar [SCI-1818]	2018-03-05 17:13:06 +01:00
Zanz2	1e6f1acef5	fixed according to pr	2018-03-05 17:02:37 +01:00
Zanz2	451d14c2e9	Added 4 to constants too, then fixed line too long error	2018-03-05 16:48:18 +01:00
Zanz2	c5728c4018	Merge branch 'master' into null_step_crash_sci2043	2018-03-05 16:37:24 +01:00
Zanz2	e3e7514049	removed redundant return	2018-03-05 16:15:33 +01:00
Zanz2	554b31e0aa	Added constants	2018-03-05 16:09:06 +01:00
Zanz2	bd19c89212	Merge pull request #1013 from Zanz2/step_reorder_fix ... quick fix for if previous guid is unknown format [Protocols.io import]	2018-03-05 15:59:46 +01:00
zmagod	fca01bd54f	refactor repository export [fixes SCI-2025]	2018-03-05 15:54:04 +01:00
mlorb	5e44859ce0	Merge pull request #1010 from mlorb/ml-sci-1826 ... Sign up with linkedIn account [SCI-1826]	2018-03-05 13:24:36 +01:00
mlorb	a19b672a83	change validation again	2018-03-05 13:12:44 +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
Matej Zrimšek	61d1f5374d	Additionaly removed some unneeded code, related to the previous commit.	2018-03-04 15:24:43 +01:00
Matej Zrimšek	fa7710fb80	Forgot to remove unneeded code form permissions after the previous refactoring.	2018-03-04 15:17:46 +01:00
Matej Zrimšek	53f75f3cd6	Minor permissions and their calls refactoring and fixing.	2018-03-04 14:49:41 +01:00
Matej Zrimšek	5724f8ed4d	Minor permissions refactoring, including putting the same checks for multiple permissions before the specific ones, hence preventing further evaluation if those permissions are not met.	2018-03-04 14:19:17 +01:00
mz3944	c04a153652	Merge pull request #1005 from mz3944/mz-SCI-2064 ... At adding file to task, cancel button does not respond [SCI-2064]	2018-03-04 13:34:50 +01:00
Zanz2	ba67446eee	quick fix for if previous guid is unknown format	2018-03-03 22:26:00 +01:00
Zanz2	5bcda7f6de	fixed pr	2018-03-02 23:02:35 +01:00
Zanz2	350f12bdbc	using dig method now	2018-03-02 22:29:51 +01:00
mlorb	d19ca7fbdc	change validation	2018-03-02 16:32:46 +01:00
zmagod	4642d049fa	fix hound	2018-03-02 14:16:31 +01:00
zmagod	2b55cd7090	rename variables	2018-03-02 14:14:27 +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	f5949e9d10	refactor	2018-03-01 17:52:24 +01:00
Luka Murn	070450f813	Merge branch 'release-1.12.11' ... Conflicts: config/initializers/extends.rb	2018-03-01 14:04:57 +01:00
zmagod	83ba412c48	remove unneeded comment	2018-03-01 11:51:39 +01:00
mlorb	08439e7f58	sign up with linkedIn account	2018-02-28 18:12:21 +01:00
zmagod	29a1073a50	refactor queries	2018-02-27 16:34:51 +01:00
zmagod	e3ca782996	add info modal for repository items [fixes SCI-2066]	2018-02-27 16:21:46 +01:00
zmagod	6908368506	refactor	2018-02-27 10:43:57 +01:00
zmagod	3aa28f6d11	assign repository row to task	2018-02-27 10:40:52 +01:00
zmagod	83db7ed01d	adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014]	2018-02-26 17:21:58 +01:00
Oleksii Kriuchykhin	aa933ad1f4	Add extendable file types mappings for icons [PIP-46]	2018-02-26 14:23:02 +01:00
Matej Zrimšek	96a6779d55	Fixed misspelled permission call.	2018-02-22 14:08:12 +01:00
Matej Zrimšek	ff9dff5c10	Fixed reports permissions check calls. Fixed Hound warnings.	2018-02-22 13:51:22 +01:00
Matej Zrimšek	1904099954	Put permissions helper methods inside utility module.	2018-02-21 20:22:13 +01:00
Zanz2	29aea1ebd2	refactored according to PR	2018-02-21 16:17:53 +01:00
mlorb	4d69636dbe	Merge pull request #1002 from mlorb/ml-sci-2031_v2 ... Fix bug with load older activities button not working [SCI-2031]	2018-02-20 13:19:20 +01:00
Zanz2	9c2a2956e3	Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818 ... Merging Biosis master with branch that resizes small tables to atleast 5x5	2018-02-19 17:40:13 +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
mlorb	d2dcb765b4	fix bug with load older activities button not working	2018-02-16 15:42:10 +01:00
Zanz2	5c93bd9676	Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom	2018-02-16 14:14:51 +01:00
Zanz2	673901fb01	Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834 ... Fixed tables getting cut when certain attributes are at max length [SCI-1834]	2018-02-16 12:52:51 +01:00
Matej Zrimšek	7b07e7b347	Fixed protocol in repository permissions, and refactored it a bit.	2018-02-16 12:04:11 +01:00
Matej Zrimšek	6ba226d514	Added missing '?' to the canaid permission calls that were missing it.	2018-02-16 11:12:30 +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	4fe669ca9a	Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions.	2018-02-16 10:53:22 +01:00
Zanz2	b9db39f87d	removing last commit	2018-02-16 00:00:53 +01:00
Zanz2	fab9180b7b	fixed small oversight	2018-02-15 23:40:09 +01:00
Zanz2	c963c948a1	Fixed main issue, bad step structure now gets fixed to empty template	2018-02-15 23:28:20 +01:00
Zanz2	95501eb046	saving work for later	2018-02-15 20:01:36 +01:00
zmagod	5922aa21a8	adds fetch_all_team_samples method/spec	2018-02-15 17:38:45 +01:00
zmagod	c53df21946	adds specs for sample_to_repository migration service	2018-02-15 16:56:38 +01:00
Zanz2	ad8f93b57f	Merge pull request #991 from Zanz2/missplaced_authors_sci1808 ... protocols io authors are now real authors, not user that added the protocol [SCI-1808]	2018-02-15 16:53:39 +01:00
mlorb	9797712561	Merge pull request #997 from mlorb/ml-sci-2045 ... Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]	2018-02-15 14:51:40 +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
Zmago Devetak	0583979cf9	Merge pull request #993 from ZmagoD/zd_SCI_2039 ... fixes errors with form id duplicates [fixes SCI-2039]	2018-02-15 11:10:43 +01:00
zmagod	78e902f316	fixes few Hound alerts	2018-02-15 11:06:59 +01:00
zmagod	e0ac8e8f91	extract helper methods in service	2018-02-15 09:36:09 +01:00
Matej Zrimšek	ac5b65b121	Added some additional comments for checking if project is active in permissions.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	09c5e23adf	Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	d571ab2ed8	Fixed comments permissions for experiment level.	2018-02-14 14:39:10 +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	4c87fb4a55	Fixed permission error when restoring task.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	946f516171	Fixed permission error when moving a freshly cloned task.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	68206cb591	Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling.	2018-02-14 14:39:08 +01:00
Matej Zrimšek	d55734e501	Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view.	2018-02-14 14:39:07 +01:00
Matej Zrimšek	d7108f5a35	Fixed Hound warnings.	2018-02-14 14:39:07 +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	879eda2d8f	Minor experiment level permissions refactoring.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	0706d16020	Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	1182ce5da1	Fixed experiment level permission checks in the controllers.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	7938c2e036	Minor code style changes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	c5b798017e	Minor Hound warning fixes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	d6e7ef465c	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	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	70fdae567c	Forgot to add check whether project is active for archive project permission. Added some additional comments for checking if project is active in permissions.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	c09ffa4043	Project permissions comments change.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d058c371d4	Readded project archive permission.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	900446557b	Fixed mistyped permission checker.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e36ec69ca9	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
Matej Zrimšek	93536afcd5	Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	13e9a2a132	Corrected some project level permissions; minor refactoring.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e5799ee6dc	Some permission fixes.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	a21343a819	Fixing and refactoring project permissions in controllers.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	279da20060	Fixed Hound warnings.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d423700e84	Used permissions where they were missing.	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
mlorb	8d0ac93c80	add check to start work on next task notification if recent changes notification is switched off	2018-02-13 11:01:45 +01:00
zmagod	18eab358c7	generate custom repository when user is created [fixes SCI-2020]	2018-02-13 10:44:50 +01:00
Zmago Devetak	027297d46a	Merge pull request #985 from ZmagoD/zd_SCI_2008 ... fixes bug with assets upload on task result page,	2018-02-12 11:40:44 +01:00
okriuchykhin	e7fb1bc716	Merge pull request #967 from okriuchykhin/ok_SCI_1966 ... Merge gilson-iot-rails4 to master [SCI-1966]	2018-02-12 11:02:17 +01:00
okriuchykhin	5a94b40d9c	Merge pull request #978 from okriuchykhin/ok_SCI_2003 ... Improve files handling in protocol cloning [SCI-2003]	2018-02-12 11:01:59 +01:00