715 commits

Author	SHA1	Message	Date
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	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
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	023b3213e8	fixes email link [fixes SCI-765]	2017-03-24 12:10:07 +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
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	95a0f596b7	adds file link	2017-03-17 16:40:57 +01:00
zmagod	52878e0989	fixed wopi buttons [fixes SCI-1110]	2017-03-16 15:38:11 +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	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
Luka Murn	800df7a26b	Also make button icons work when rendering them via JS ... Closes SCI-1073.	2017-03-08 13:55:10 +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	3599537e42	Fix sample type groups edit color script so it works properly now ... Closes SCI-1078.	2017-03-01 09:09:44 +01:00
Luka Murn	2252b46afc	Canvas should now properly work again ... Closes SCI-1057.	2017-02-28 10:41:55 +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
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
zmagod	151dc79a81	adds hook for lock task action	2017-02-21 16:25:50 +01:00
Mojca Lorber	6b30f097f0	fix visual bug in edit avatar mode	2017-02-21 14:02:42 +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	218e96b1f0	Code style fixes [SCI-999]	2017-02-16 11:45:07 +01:00
Oleksii Kriuchykhin	cf8566df33	Add task complete/uncomplete functionality [SCI-999]	2017-02-10 14:27:20 +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	80dbc669d0	Simplify all teams dt definition [SCI-936]	2017-02-06 17:17:48 +01:00
Oleksii Kriuchykhin	449f4479e9	Fix code style issues [SCI-936]	2017-02-06 17:08:20 +01:00
Oleksii Kriuchykhin	916ed2572a	Fix smart annotation is missing at editing column with smart annotation [SCI-997]	2017-02-03 16:42:38 +01:00
Oleksii Kriuchykhin	62535a01bd	Move teams datatable js code into separate file [SCI-936]	2017-02-03 10:44:42 +01:00
Oleksii Kriuchykhin	db90c5d63b	Add datatable to all teams page [SCI-936]	2017-02-02 09:53:59 +01:00
Mojca Lorber	d3e0eca44e	redesign individual team page	2017-02-01 14:44:47 +01:00
Zmago Devetak	5c9954bb89	Merge pull request #450 from ZmagoD/zd_SCI_939 ... Refactor "organizations" to "teams"	2017-02-01 13:12:02 +01:00
zmagod	be5faad97c	fixes hound	2017-01-31 13:33:55 +01:00
okriuchykhin	9909f9dcff	Merge pull request #456 from okriuchykhin/ok_SCI_951 ... Fix missing preview images in task and protocol management [SCI-951]	2017-01-27 14:42:41 +01:00
okriuchykhin	53e09bd50a	Merge pull request #457 from okriuchykhin/ok_SCI_955 ... Fix comments re-initialization after edit of the results [SCI-955]	2017-01-27 11:50:52 +01:00
zmagod	e59b2e039a	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939	2017-01-27 11:15:31 +01:00
Luka Murn	2c3be391a8	Merge pull request #462 from ZmagoD/zd_SCI_962_vol2 ... fix edit action	2017-01-26 17:25:57 +01:00
Luka Murn	36f25e98f1	Merge pull request #459 from okriuchykhin/ok_SCI_943 ... Fix RTF toolbar init after eding new step [SCI-943]	2017-01-26 17:25:41 +01:00
zmagod	30912c514e	fix edit action	2017-01-26 17:24:24 +01:00
zmagod	cec5f1333d	fixes RTE bug for new text results [fixes SCI-962]	2017-01-26 16:54:43 +01:00
Oleksii Kriuchykhin	100cc700c6	Fix RTF toolbar init after eding new step [SCI-943]	2017-01-26 16:37:44 +01:00
Oleksii Kriuchykhin	ff86184b24	Fix comments re-initialization after edit of the results [SCI-955]	2017-01-26 15:24:37 +01:00
Oleksii Kriuchykhin	0f860496a7	Fix image preview after saving of report [SCI-951]	2017-01-26 14:42:14 +01:00