440 commits

Author	SHA1	Message	Date
mlorb	54f1c7b3e8	Merge pull request #566 from mlorb/ml_sci_365 ... New experiment redirection [SCI-365]	2017-04-24 08:55:55 +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
mz3944	a0b5a94d67	Merge pull request #564 from mz3944/mz-SCI-856 ... Case insensitive email invitation	2017-04-19 09:36:46 +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
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
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
zmagod	9ee971c24b	fixes broken users search method for smart annotation [fixes SCI-1192]	2017-04-13 16:14:12 +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
zmagod	90faeec410	fixes typos and protocol step links	2017-04-10 11:21:28 +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
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
zmagod	99c116f257	first run	2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin	42ccefe2ce	Remove logs table and old unused logging code [SCI-1127]	2017-03-30 11:47:57 +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
zmagod	0096f9dc14	refactor	2017-03-29 09:32:23 +02:00
zmagod	9ce95470b3	fixes alert messages in samples [fixes SCI-1135]	2017-03-28 15:14:05 +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	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
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
zmagod	d8955d1a78	fixes breadcrumbs in office file [fixes SCI-1111]	2017-03-20 13:48:45 +01:00
Mojca Lorber	83fa8570d7	refactoring	2017-03-17 17:52:15 +01:00
zmagod	5cc6cd094e	refactor	2017-03-17 16:47:58 +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
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	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
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
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
zmagod	3057965940	fix bug with filenames	2017-03-09 11:48:50 +01:00