1692 commits

Author	SHA1	Message	Date
zmagod	ed24448817	adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203]	2017-04-25 14:24:05 +02:00
zmagod	1fefeee3d1	adds team space related methods	2017-04-25 13:44:31 +02:00
Mojca Lorber	49574e7a06	remove behavior of not allowing the empty tables in steps	2017-04-25 10:21:16 +02:00
rekonder	b93edac3b9	My profile - avatar size fixes [SCI-1088]	2017-04-25 10:02:00 +02:00
zmagod	86c6ae3b03	display tinyMCE images in reports	2017-04-25 09:53:35 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +02:00
rekonder	dc46a7b650	Fix error with close on reports	2017-04-24 16:02:30 +02:00
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +02:00
mlorb	54f1c7b3e8	Merge pull request #566 from mlorb/ml_sci_365 ... New experiment redirection [SCI-365]	2017-04-24 08:55:55 +02:00
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00
Mojca Lorber	3aa1225e16	fix hound	2017-04-20 18:14:12 +02:00
Mojca Lorber	cf00ecd62e	new experiment redirection	2017-04-20 17:55:28 +02:00
Mojca Lorber	0bae4657f6	add experiment level to user smart annotation notification	2017-04-20 13:21:02 +02:00
Mojca Lorber	b1e939e715	add experiment to activities	2017-04-20 13:16:11 +02:00
Mojca Lorber	c13b8ab270	styling	2017-04-20 13:16:11 +02:00
Mojca Lorber	1606e2163c	add experiment level to notifications	2017-04-20 13:16:11 +02:00
Matej Zrimšek	314e8fcbd2	Added :inverse_of reference for all specific comment models. [fixes SCI-1207]	2017-04-19 23:38:23 +02:00
zmagod	0757563d02	adds step tiny_mce asset relation	2017-04-19 17:22:57 +02:00
mz3944	a0b5a94d67	Merge pull request #564 from mz3944/mz-SCI-856 ... Case insensitive email invitation	2017-04-19 09:36:46 +02:00
zmagod	37be04c09c	add tiny_mce controller	2017-04-19 09:13:16 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +02:00
Luka Murn	9479b65140	Hopefully fixes the encoding issues with audit trails ... Closes SCI-1175.	2017-04-19 08:35:04 +02:00
Matej Zrimšek	bafdbf4082	Email is now case insensitive when inviting users by it. [fixes SCI-856]	2017-04-18 18:01:29 +02:00
Matej Zrimšek	57b6b9402d	Experiment description is inside of box for every supported browser. [fixes SCI-860]	2017-04-18 16:44:01 +02:00
Luka Murn	6a7e383316	Please the Hound	2017-04-18 15:38:11 +02:00
mz3944	0ebf294844	Merge pull request #562 from mz3944/mz-SCI-1187 ... Added general locale for cases when a name is optional and is not spe…	2017-04-18 15:26:35 +02:00
Matej Zrimšek	a889174938	Name of result tables should be nil, as it can't be specified. [fixes SCI-1187]	2017-04-18 15:08:13 +02:00
okriuchykhin	3d805d529d	Merge pull request #554 from okriuchykhin/ok_SCI_877 ... Add image preview to protocol repository [SCI-877]	2017-04-18 08:58:39 +02:00
Oleksii Kriuchykhin	4fac6484b5	Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]	2017-04-14 16:05:35 +02:00
Zmago Devetak	e1a30cc17c	Merge pull request #558 from ZmagoD/zd_SCI_1192 ... fixes broken users search method for smart annotation [fixes SCI-1192]	2017-04-14 15:38:33 +02:00
zmagod	8af3858209	fix hound	2017-04-14 11:13:58 +02:00
Luka Murn	9c28608fbf	Fix encoding when cloning tables ... Closes SCI-1175.	2017-04-13 17:00:27 +02:00
zmagod	9ee971c24b	fixes broken users search method for smart annotation [fixes SCI-1192]	2017-04-13 16:14:12 +02:00
Zmago Devetak	cb1ad9e0be	Merge pull request #555 from ZmagoD/zd_SCI_1103 ... adds additional explanations [fixes SCI-1103]	2017-04-13 15:15:08 +02:00
zmagod	0987cf8abc	fixes hound alerts	2017-04-13 14:55:18 +02:00
Zmago Devetak	40af0df882	Merge pull request #551 from ZmagoD/zd_SCI_1189 ... fixes the user_name field in csv export [fixes SCI-1189]	2017-04-13 14:36:44 +02:00
zmagod	a6183af63d	fix method_missing again	2017-04-13 14:34:58 +02:00
mlorb	ddc0e86c92	Merge pull request #556 from mlorb/ml_sci_1174 ... Fix bug with changing user own role from admin to normal user [SCI-1174]	2017-04-13 14:33:58 +02:00
Zmago Devetak	ec60044949	Merge pull request #548 from ZmagoD/zd_SCI_1129_v2 ... Disables annimateSpiner in result assets actions	2017-04-13 14:06:50 +02:00
zmagod	0534bce1ed	adds super in method_missing	2017-04-13 14:03:56 +02:00
zmagod	241af0620a	fixes hound alerts	2017-04-13 13:27:43 +02:00
zmagod	b6daf2648b	refactor zip_export	2017-04-13 13:01:05 +02:00
zmagod	f104444a0c	adds additional explanations [fixes SCI-1103]	2017-04-12 16:56:47 +02:00
Mojca Lorber	27c661d7c4	fix bug with changing user own role from admin to normal user	2017-04-12 16:56:10 +02:00
Oleksii Kriuchykhin	181d981a51	Add image preview to protocol repository [SCI-877]	2017-04-12 16:05:38 +02:00
mlorb	2932052628	Merge pull request #549 from mlorb/ml_sci_1172 ... Fix overlapping text in audit trail table [SCI-1172, SCI-1181]	2017-04-12 15:10:48 +02:00
okriuchykhin	0fe84c4e24	Merge pull request #550 from okriuchykhin/ok_SCI_1157 ... Improve speed of search [SCI-1157]	2017-04-12 13:11:26 +02:00
Zmago Devetak	9c31239318	Merge pull request #552 from biosistemika/release-1.9.0 ... Release 1.9.1	2017-04-12 13:08:37 +02:00
zmagod	f4fdb840d8	fixes the user_name field in csv export [fixes SCI-1189]	2017-04-12 09:05:54 +02:00
Oleksii Kriuchykhin	07d658ab82	Improve speed of search [SCI-1157]	2017-04-11 14:55:44 +02:00
Mojca Lorber	b09c18a9bc	fix overlaping text in audit trail table	2017-04-11 14:29:31 +02:00
zmagod	929d8aab5e	disables annimateSpiner in result assets actions	2017-04-10 15:40:36 +02:00
Zmago Devetak	91793c295a	Merge pull request #542 from ZmagoD/zd_SCI_825 ... Smart annotations and Notifications	2017-04-10 15:10:17 +02:00
zmagod	90faeec410	fixes typos and protocol step links	2017-04-10 11:21:28 +02:00
Zmago Devetak	ccb6cd0c8c	Merge pull request #546 from ZmagoD/zd_SCI_1185 ... adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-10 09:12:03 +02:00
Luka Murn	cd4664e4d0	Merge pull request #544 from Ducz0r/lm-sci-794-fix ... Only require jquery-ui-sortable on samples page [SCI-794]	2017-04-10 07:44:57 +02:00
mz3944	2c78d10768	Merge pull request #532 from biosistemika/mz-SCI-1150 ... Fixed so that file deletion callbacks are triggered	2017-04-07 15:18:43 +02:00
zmagod	122e638b7e	adds input_sanitizer helper in app mailer [fixes SCI-1185]	2017-04-07 15:01:26 +02:00
Luka Murn	becdd687a6	Only require jquery-ui-sortable on samples page ... (hopefully) closes SCI-794.	2017-04-07 13:05:22 +02:00
zmagod	9610c5f5a0	fix info dropdown links [fixes SCI-1141]	2017-04-07 11:31:09 +02:00
Matej Zrimšek	1447a34dc7	Files didn't get deleted in previous commit. [fixes SCI-1150]	2017-04-06 16:59:34 +02:00
okriuchykhin	aa776aaa71	Merge pull request #541 from okriuchykhin/ok_SCI_615 ... Fix moving of the steps after adding a new one [SCI-615]	2017-04-06 15:50:01 +02:00
zmagod	e77df92017	fix samples_controller	2017-04-06 15:26:24 +02:00
zmagod	9bb1bb3f9b	refactor [fixes SCI-825]	2017-04-06 15:08:03 +02:00
zmagod	439cd0cd89	add notification to experiments	2017-04-06 14:55:18 +02:00
zmagod	046b608018	add notification for my_module/project comments	2017-04-06 14:07:22 +02:00
zmagod	b398bb7516	add step annotations methods in steps_action concerns	2017-04-06 13:06:20 +02:00
zmagod	f16607579f	refactor steps annotation	2017-04-06 13:03:13 +02:00
Oleksii Kriuchykhin	5c0197220d	Fix moving of the steps after adding a new one [SCI-615]	2017-04-06 12:53:21 +02:00
Matej Zrimšek	e72184d10d	Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150]	2017-04-06 11:34:03 +02:00
mlorb	4855111dcb	Merge pull request #540 from mlorb/ml_sci_1089_v2 ... Remove ERROR from message [SCI-1089]	2017-04-06 10:44:20 +02:00
zmagod	bb437bd8c5	adds notification to results annotation	2017-04-06 09:33:49 +02:00
zmagod	d331911ffe	completed step annotations	2017-04-06 08:42:16 +02:00
mlorb	e9441559d3	Merge pull request #538 from mlorb/ml_sci_1044_vol3 ... Change helper method for user info popover	2017-04-05 17:04:30 +02:00
Mojca Lorber	5e62046627	remove ERROR from message	2017-04-05 14:40:55 +02:00
mlorb	7730493ef4	Merge pull request #535 from biosistemika/ml_sci_1044_vol2 ... Fix bug with constants	2017-04-04 15:46:50 +02:00
Mojca Lorber	b222a34a97	fix hound	2017-04-04 15:38:16 +02:00
Mojca Lorber	a0fe47a05d	change helper method for user info popover	2017-04-04 15:22:41 +02:00
okriuchykhin	8cff0a9a5b	Merge pull request #534 from okriuchykhin/ok_SCI_1127_v2 ... Add user popover method for users [SCI-1127]	2017-04-04 14:36:16 +02:00
zmagod	99c116f257	first run	2017-04-04 09:19:43 +02:00
Mojca Lorber	715fafe58c	fix bug with constants	2017-04-03 17:07:58 +02:00
Oleksii Kriuchykhin	2faa137f67	Add user popover method for users [SCI-1127]	2017-04-03 15:10:00 +02:00
zmagod	e1ee53eeb5	generates query in background worker	2017-04-03 13:37:54 +02:00
mlorb	317739af1e	Merge pull request #530 from biosistemika/ml_sci_1044 ... Add data-hook and yadcf-filter plug-in [SCI-1044]	2017-03-31 14:00:23 +02:00
Mojca Lorber	a2c1ed6994	fix constants	2017-03-31 13:53:18 +02:00
Mojca Lorber	503ee5b62e	change place of data-hook	2017-03-30 17:21:29 +02:00
Oleksii Kriuchykhin	42ccefe2ce	Remove logs table and old unused logging code [SCI-1127]	2017-03-30 11:47:57 +02:00
Mojca Lorber	9458f391e5	add data-hook and yadcf-filter plug-in	2017-03-29 15:59:51 +02:00
Zmago Devetak	2b35b34eb8	Merge pull request #529 from ZmagoD/zd_SCI_1135 ... fixes alert messages in samples [fixes SCI-1135]	2017-03-29 14:57:11 +02:00
Zmago Devetak	0019fd19ea	Merge pull request #525 from ZmagoD/zd_SCI_765 ... Export large files - utility class	2017-03-29 11:55:51 +02:00
zmagod	0096f9dc14	refactor	2017-03-29 09:32:23 +02:00
okriuchykhin	05a49e5a82	Merge pull request #528 from okriuchykhin/ok_SCI_1133 ... Fix secondary navigation on Mac [SCI-1133]	2017-03-29 09:30:34 +02:00
zmagod	9ce95470b3	fixes alert messages in samples [fixes SCI-1135]	2017-03-28 15:14:05 +02:00
Oleksii Kriuchykhin	391c5af267	Fix secondary navigation on Mac [SCI-1133]	2017-03-28 14:36:52 +02:00
zmagod	7039420f99	add hook to canvas module actions	2017-03-28 10:43:39 +02:00
zmagod	0996c14449	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765	2017-03-27 10:41:58 +02:00
zmagod	2235fd3fb7	adds view if download expires	2017-03-27 10:38:28 +02:00
mlorb	3beb179f87	Merge pull request #514 from biosistemika/ml_sci_1089 ... Add error messages to sample group/type edit/delete actions [SCI-1089]	2017-03-27 09:57:32 +02:00
zmagod	239a44c26b	change send to public_send	2017-03-24 16:25:50 +01:00
zmagod	4635a3320d	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-24 16:09:28 +01:00
okriuchykhin	71dc6921fb	Merge pull request #524 from okriuchykhin/ok_SCI_1046 ... Add team_id field to assets and tables [SCI-1046]	2017-03-24 14:48:16 +01:00
Oleksii Kriuchykhin	d2c8e9a395	Set team for assets and tables in generators [SCI-1046]	2017-03-24 14:46:20 +01:00
Zmago Devetak	804fb2fec9	Merge pull request #519 from ZmagoD/zd_SCI_1092_v2 ... adds hooks in team switch [fixes SCI-1092]	2017-03-24 12:56:52 +01:00
zmagod	b352ef1600	removed unneeded method	2017-03-24 12:53:33 +01:00
zmagod	023b3213e8	fixes email link [fixes SCI-765]	2017-03-24 12:10:07 +01:00
zmagod	94732c6d18	adds delayed zip generator	2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin	2edebb282a	Add team_id field to assets and tables [SCI-1046]	2017-03-23 10:36:55 +01:00
zmagod	4385c68f5f	adds zip_export utility first run	2017-03-21 16:15:11 +01:00
okriuchykhin	33544ec91d	Merge pull request #521 from okriuchykhin/ok_SCI_1087 ... Move flash message creation JS code to helper method [SCI-1087]	2017-03-20 15:35:21 +01:00
Zmago Devetak	38299d9f67	Merge pull request #522 from ZmagoD/zd_SCI_1111 ... fixes breadcrumbs in office file [fixes SCI-1111]	2017-03-20 13:53:29 +01:00
zmagod	d8955d1a78	fixes breadcrumbs in office file [fixes SCI-1111]	2017-03-20 13:48:45 +01:00
Oleksii Kriuchykhin	c715902058	Move flash message creation JS code to helper method [SCI-1087]	2017-03-17 17:58:53 +01:00
Mojca Lorber	83fa8570d7	refactoring	2017-03-17 17:52:15 +01:00
zmagod	c244e69e81	fixed report comments bug [fixes SCI-1100]	2017-03-17 16:59:40 +01:00
zmagod	5cc6cd094e	refactor	2017-03-17 16:47:58 +01:00
zmagod	95a0f596b7	adds file link	2017-03-17 16:40:57 +01:00
zmagod	70f17a924e	adds hooks in team switch [fixes SCI-1092]	2017-03-17 16:10:22 +01:00
zmagod	52878e0989	fixed wopi buttons [fixes SCI-1110]	2017-03-16 15:38:11 +01:00
zmagod	307fef17d8	fixes owner id if empty	2017-03-15 18:01:15 +01:00
Zmago Devetak	1afb4c9a42	Merge pull request #515 from ZmagoD/file_owner_id_bug ... fixes bug with wopi contorller	2017-03-15 17:40:07 +01:00
zmagod	c5156f5ca3	fixes bug with wopi contorller	2017-03-15 17:33:36 +01:00
Mojca Lorber	4792bd87b9	fix error message when editing custom column on locked task	2017-03-15 14:09:44 +01:00
Mojca Lorber	7a4e3201e7	add error messages to sample group/type edit/delete actions	2017-03-14 17:32:25 +01:00
zmagod	5d372851d3	fixes reports comment bug [fixes SCI-1100]	2017-03-14 16:24:02 +01:00
zmagod	856a4611c6	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends	2017-03-14 15:58:08 +01:00
zmagod	15b1712a3d	fixes bug with organization	2017-03-14 13:29:59 +01:00
zmagod	b821fff4a5	adds non breaking space between file name and buttons	2017-03-13 14:14:44 +01:00
zmagod	df2abe5d17	fixed typo	2017-03-13 13:51:31 +01:00
zmagod	7b16e5643e	fix assets preprocesor for wopi files	2017-03-13 13:20:49 +01:00
zmagod	0c2523beca	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-03-10 16:21:43 +01:00
mlorb	39e1ac4b26	Merge pull request #512 from biosistemika/ml_sci_1074 ... Fix permissions for experiment actions [SCI-1074]	2017-03-10 11:44:27 +01:00
okriuchykhin	2a33391f4b	Merge pull request #511 from okriuchykhin/ok_SCI_1090 ... Refactoring of the comments using STI [SCI-1090]	2017-03-10 10:50:43 +01:00
Mojca Lorber	1ba5f1748f	fix permissions for experiment actions	2017-03-09 17:45:34 +01:00
Oleksii Kriuchykhin	456934464a	Remove unneeded validation calls [SCI-1090]	2017-03-09 17:20:27 +01:00
zmagod	1d42d46c02	fixes bug with step comments	2017-03-09 16:02:52 +01:00
Luka Murn	ae96223437	Fix rake db:add_user task	2017-03-09 15:37:15 +01:00
zmagod	3057965940	fix bug with filenames	2017-03-09 11:48:50 +01:00
zmagod	9939d8df06	refactor	2017-03-09 10:51:54 +01:00
Luka Murn	1e3a697a91	Merge pull request #508 from biosistemika/lm-sci-838-fix ... Open edit/view Office files in new browser tab/window [SCI-838]	2017-03-09 10:39:16 +01:00
zmagod	49f91184da	fixes locals	2017-03-09 09:55:15 +01:00
Luka Murn	a4bf5516a5	Merge pull request #505 from Ducz0r/lm-sci-1082-fix ... Minor change [SCI-1082]	2017-03-09 08:58:14 +01:00
Luka Murn	0e8f5f8e99	Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix ... Conflicts: app/views/my_modules/_state_buttons.html.erb	2017-03-09 08:44:09 +01:00
zmagod	f78ef8c82a	fixes hound	2017-03-08 14:41:42 +01:00
zmagod	5c2e9a4b04	adds extends and fixes report methods	2017-03-08 14:14:03 +01:00
Luka Murn	800df7a26b	Also make button icons work when rendering them via JS ... Closes SCI-1073.	2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin	0f8336e5a5	Refactoring of the comments using STI [SCI-1090]	2017-03-08 13:18:20 +01:00
Luka Murn	7c9aa2e476	Hide complete&uncomplete task buttons if user cannot do it ... Closes SCI-1091.	2017-03-06 16:01:04 +01:00
Luka Murn	86a800a84e	Open edit/view Office files in new browser tab/window ... Closes SCI-838.	2017-03-06 14:12:18 +01:00
Luka Murn	473487faec	Add HTML <head><title> to edit, view file pages ... Closes SCI-1049.	2017-03-06 13:55:07 +01:00
Luka Murn	4ddb139911	Fix padding of state buttons ... Closes SCI-1073.	2017-03-03 16:36:52 +01:00
Luka Murn	42b773f180	Merge pull request #504 from Ducz0r/lm-sci-1078-fix ... Fix sample type groups edit color script [SCI-1078]	2017-03-02 13:09:51 +01:00
Luka Murn	043613782e	Minor change	2017-03-02 13:04:13 +01:00
Luka Murn	808fdf6744	Merge pull request #502 from Ducz0r/lm-sci-1073-fix ... Fix protocol state buttons a bit [SCI-1073]	2017-03-02 09:02:52 +01:00
Luka Murn	7a48da2e94	Merge pull request #501 from Ducz0r/lm-sci-1057-fix ... Canvas should now properly work again [SCI-1057]	2017-03-02 09:01:51 +01:00
Luka Murn	3599537e42	Fix sample type groups edit color script so it works properly now ... Closes SCI-1078.	2017-03-01 09:09:44 +01:00
Oleksii Kriuchykhin	4868ec5331	Remove task completion duplicated code [SCI-1075]	2017-02-28 17:07:59 +01:00
Luka Murn	3d7f09bde6	Fix protocol state buttons a bit ... Closes SCI-1073.	2017-02-28 14:35:12 +01:00
Luka Murn	2252b46afc	Canvas should now properly work again ... Closes SCI-1057.	2017-02-28 10:41:55 +01:00
zmagod	e1b3dcc2ba	adds enum extends to report element part of SCI-1003	2017-02-27 13:53:46 +01:00
Luka Murn	fecfc9e41d	Merge pull request #498 from biosistemika/release-1.8.1 ... Release 1.8.1	2017-02-23 14:57:30 +01:00
Luka Murn	dc89c160be	Fix a bug with team page not working from user task modal	2017-02-23 14:45:00 +01:00
Luka Murn	87599dca88	Merge branch 'lm-sci-1026-fix' into release-1.8.1	2017-02-23 13:55:41 +01:00
mlorb	a72a072fac	Merge pull request #495 from mlorb/ml_sci_948 ... Fix report - checklist items are in separate row than checkboxes [SCI-948]	2017-02-23 10:50:48 +01:00
okriuchykhin	986ad051a1	Merge pull request #496 from okriuchykhin/ok_SCI_873 ... Improve image scaling in image preview [SCI-873]	2017-02-23 09:30:56 +01:00
Oleksii Kriuchykhin	cb588ed378	Improve image scaling in image preview [SCI-873]	2017-02-22 16:55:57 +01:00
okriuchykhin	d30e149936	Merge pull request #493 from okriuchykhin/ok_SCI_739 ... Lower z-index value for notification count icon [SCI-739]	2017-02-22 16:48:39 +01:00
okriuchykhin	75792cde14	Merge pull request #492 from okriuchykhin/ok_SCI_759 ... Add more extensive explanation when project name is already taken [SCI-759]	2017-02-22 16:25:16 +01:00
Mojca Lorber	f84611f558	fix report - checklist items are in separate row than checkboxes	2017-02-22 15:51:26 +01:00
Oleksii Kriuchykhin	a326fa374f	Lower z-index value for notification count icon [SCI-739]	2017-02-22 14:35:07 +01:00
Zmago Devetak	58f97fdb5b	Merge pull request #489 from ZmagoD/zd_SCI_1002_add_hook ... adds hook for lock task action	2017-02-22 14:24:01 +01:00
Oleksii Kriuchykhin	35b0b33ddf	Add more extensive explanation when project name is already taken [SCI-759]	2017-02-22 14:18:48 +01:00
mlorb	b65c716b79	Merge pull request #491 from biosistemika/ml_sci_1028_v2 ... Fix repeat tutorial is always created on the same team [SCI-1028]	2017-02-22 13:52:46 +01:00
Mojca Lorber	330fe9c291	fix repeat tutorial is always created on the same team ... Closes SCI-1028.	2017-02-22 13:43:03 +01:00
mlorb	42e6a99911	Merge pull request #487 from mlorb/ml_sci_1032 ... Fix visual bug in edit avatar mode [SCI-1032]	2017-02-22 10:59:18 +01:00
mlorb	8c111db31a	Merge pull request #486 from mlorb/ml_sci_1033 ... Fix user has no teams view [SCI-1033]	2017-02-22 10:58:39 +01:00
zmagod	151dc79a81	adds hook for lock task action	2017-02-21 16:25:50 +01:00
Mojca Lorber	ac0988ef32	add data-hooks for remove manage teams button	2017-02-21 15:39:08 +01:00
Mojca Lorber	0fd41e8a6d	remove changes on user has no teams view	2017-02-21 15:12:58 +01:00
Oleksii Kriuchykhin	53ba9437b2	Fix circular dependency while loading Settings [SCI-1004]	2017-02-21 14:38:13 +01:00
mlorb	ea1711be83	Merge pull request #485 from mlorb/ml_sci_1001 ... Add data-hook for E-signature manifestation/display [SCI-1001]	2017-02-21 14:25:08 +01:00
mlorb	01d9f306a5	change div to span	2017-02-21 14:22:28 +01:00
Mojca Lorber	6b30f097f0	fix visual bug in edit avatar mode	2017-02-21 14:02:42 +01:00
okriuchykhin	95af5001ab	Merge pull request #484 from okriuchykhin/ok_SCI_1004 ... Add global settings base class [SCI-1004]	2017-02-21 13:20:24 +01:00
Mojca Lorber	90864a45a0	fix user has no teams view	2017-02-21 13:08:06 +01:00
Oleksii Kriuchykhin	7703db3386	Change implementation of the Settings base class [SCI-1004]	2017-02-21 13:07:10 +01:00
Luka Murn	6f1c19ae2d	Fix _user_dropdown.html.erb	2017-02-21 09:27:42 +01:00
Mojca Lorber	cb2127ee7f	add data-hook for E-signature manifestation/display	2017-02-20 18:03:55 +01:00
okriuchykhin	8e18ff44a6	Merge pull request #479 from okriuchykhin/ok_SCI_999 ... Add task complete/uncomplete functionality [SCI-999]	2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin	2aba0f46a6	Add global settings base class [SCI-1004]	2017-02-20 15:11:57 +01:00
Luka Murn	573f3c8d42	Merge pull request #483 from Ducz0r/lm-sci-1026-fix ... Fix manage project users modal bug [SCI-1026]	2017-02-20 08:22:03 +01:00
Luka Murn	ce617894c5	Fix manage project users modal bug ... Closes SCI-1026.	2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin	4fb5fa79af	Move task completion activity and notification creation to separate methods [SCI-999]	2017-02-16 13:36:05 +01:00
Oleksii Kriuchykhin	218e96b1f0	Code style fixes [SCI-999]	2017-02-16 11:45:07 +01:00
Zmago Devetak	c963674e49	Merge pull request #482 from ZmagoD/zd_SCI_987_vol2 ... fixes bug with user teams table [fixes SCI-987]	2017-02-15 13:30:25 +01:00
Luka Murn	164bd787e9	Merge pull request #481 from Ducz0r/lm-sci-958-fix ... Team administrators are Viewers of all Projects in Team [SCI-958]	2017-02-15 10:40:52 +01:00
zmagod	836baa7412	fixes bug with user teams table [fixes SCI-987]	2017-02-15 10:06:21 +01:00
Nbernot	97584aabb3	Updated the lists of office online file extensions ... Extended the list of file extensions that receive office online icons and 'open in' text.	2017-02-14 16:44:03 +01:00
Luka Murn	d097f0dd15	Merge pull request #477 from Ducz0r/lm-sci-928 ... Refactor, merge, unify, improve, update, beautify settings page [SCI-928]	2017-02-13 16:42:57 +01:00
Luka Murn	1b6f50647c	Please Hound	2017-02-13 16:40:27 +01:00
Luka Murn	b369177d1f	Merge pull request #480 from Ducz0r/lm-sci-964-fix ... Fix system notification email links not working bug [SCI-964]	2017-02-13 16:31:04 +01:00