418 commits

Author	SHA1	Message	Date
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
zmagod	9939d8df06	refactor	2017-03-09 10:51:54 +01:00
zmagod	49f91184da	fixes locals	2017-03-09 09:55:15 +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
Oleksii Kriuchykhin	4868ec5331	Remove task completion duplicated code [SCI-1075]	2017-02-28 17:07:59 +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	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
zmagod	836baa7412	fixes bug with user teams table [fixes SCI-987]	2017-02-15 10:06:21 +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
Oleksii Kriuchykhin	f97c20e9b5	Fix hound warnings [SCI-999]	2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin	78d5cbb223	Add links to task completion notification [SCI-999]	2017-02-13 14:51:21 +01:00
Oleksii Kriuchykhin	cf8566df33	Add task complete/uncomplete functionality [SCI-999]	2017-02-10 14:27:20 +01:00
Luka Murn	3eb4faa44b	Fix task restore action ... Closes SCI-991.	2017-02-10 14:08:56 +01:00
Luka Murn	280b7a0e75	Minor fix	2017-02-09 15:10:45 +01:00
Luka Murn	2a9f975c13	Some minor fixes	2017-02-09 14:58:11 +01:00
Luka Murn	f7bd62547e	Refactor teams settings into its own controllers	2017-02-09 14:37:59 +01:00
Luka Murn	5cb3eb5e09	Refactor preferences -> move them to subcontroller, subroute	2017-02-09 11:07:16 +01:00
okriuchykhin	c2a69982aa	Merge pull request #471 from okriuchykhin/ok_SCI_936 ... Adds datatable to all teams page [SCI-936]	2017-02-07 10:33:33 +01:00
Oleksii Kriuchykhin	cc6b518c7f	Check that user is a member of a team when switching to it [SCI-984]	2017-02-03 16:10:37 +01:00