1348 commits

Author	SHA1	Message	Date
Oleksii Kriuchykhin	f8388d4bcd	Merge branch 'ok_SCI_2729' into ok_SCI_2730	2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin	80e73bfb97	Implement Projects view - navigation bar (tabs) [SCI-2729]	2018-09-24 16:25:04 +02:00
Oleksii Kriuchykhin	84428b37c2	Add project view JSON endpoints [SCI-2728]	2018-09-21 10:39:20 +02:00
Zanz2	0efaf827b8	Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2 ... Replaced image icon with paperclip on scinote [SCI-2712]	2018-09-11 09:36:47 +02:00
Zanz2	15c124f3fd	replaced image icon with paperclip, to represent files, removed all image icons	2018-08-27 13:07:18 +02:00
Alex Kriuchykhin	151d1cf44d	Merge pull request #1270 from okriuchykhin/ok_SCI_2651 ... Refactor invite users modal initialization [SCI-2651]	2018-08-23 14:34:42 +02:00
Alex Kriuchykhin	75a48291e1	Merge pull request #1272 from okriuchykhin/ok_SCI_2654 ... Fix report elements sorting [SCI-2654]	2018-08-22 14:20:54 +02:00
Zanz2	0ed62b7375	refactored according to PR review	2018-08-21 11:35:22 +02:00
Oleksii Kriuchykhin	62d99a4372	Fix report elements sorting [SCI-2654]	2018-08-20 14:46:23 +02:00
Oleksii Kriuchykhin	6795b08a91	Refactor invite users modal initialization [SCI-2651]	2018-08-20 13:13:34 +02:00
Zanz2	dfcaa40f1a	Merge branch 'master' into zz_refactor_icons_sci_2445_v2	2018-08-14 13:33:43 +02:00
Zanz2	45a4c1c598	changed the icons as per last comment in jira issue	2018-08-14 13:26:48 +02:00
mlorb	a6dd577b4e	fix time zone selector	2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin	38c36ab798	Fix modals handling with Turbolinks [SCI-2253]	2018-08-02 11:25:14 +02:00
Oleksii Kriuchykhin	5c999300b5	Fix avatar upload validators [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	10b86a9d05	Add data hook to settings/team page [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	b2bd1cb849	Upgrade to Turbolinks 5 [SCI-2253]	2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
Luka Murn	f23cc36803	Merge pull request #1224 from ZmagoD/zd_SCI_2429 ... fixes setting sidebar teams link[fixes SCI-2429]	2018-07-13 14:55:24 +02:00
Luka Murn	de29ab1b11	Merge pull request #1234 from ZmagoD/zd_SCI_2581 ... adds missing js in experiment canvas view [fixes SCI-2581]	2018-07-13 14:54:59 +02:00
Oleksii Kriuchykhin	3aceb12f03	Fix delete button in inventories [SCI-2594]	2018-07-08 21:59:02 +02:00
Oleksii Kriuchykhin	a169639b3c	Fix uploaded file max size validation in JS [SCI-2590]	2018-07-05 15:23:26 +02:00
zmagod	185657c626	adds missing js in experiment canvas view [fixes SCI-2581]	2018-07-05 14:36:54 +02:00
zmagod	eb75f6c03d	fixes bug with checkAvailableColumns function [fixes SCI-2578]	2018-06-29 10:28:46 +02:00
Zmago Devetak	7fd3eec195	Merge pull request #1219 from ZmagoD/zd_SCI_2415 ... move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-26 18:43:16 +02:00
Luka Murn	9637af51e6	Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout ... Fix the sign in halt layout	2018-06-26 17:51:18 +02:00
zmagod	1a15ac7acf	fixes setting sidebar teams link[fixes SCI-2429]	2018-06-26 13:09:56 +02:00
zmagod	db1944cc90	move maximum file size limit to an ENV variable [fixes SCI-2415]	2018-06-19 14:15:14 +02:00
zmagod	2f141e9217	disable buttons on new/edit repository_item action [fixes SCI-2410]	2018-06-15 11:37:01 +02:00
okriuchykhin	801d0a4a22	Merge pull request #1212 from okriuchykhin/ok_SCI_2377 ... Add hooks to new report modal [SCI-2377]	2018-06-14 15:48:43 +02:00
Oleksii Kriuchykhin	13c374d9b3	Add hooks to new report modal [SCI-2377]	2018-06-14 15:26:06 +02:00
zmagod	bb62fc3715	adds data-hook	2018-06-14 12:42:49 +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	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
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	32a09f9780	prevents asset preview modal to close on click [fixes SCI-2392]	2018-06-11 13:03:11 +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
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	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	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