2548 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Oleksii Kriuchykhin	1abd7fc574	Added xml schemas and zip gem [SCI-742]	2017-01-23 17:34:02 +01:00
Oleksii Kriuchykhin	69f31a62e7	Initial code commit [SCI-742]	2017-01-23 17:33:10 +01:00
Zmago Devetak	674999f987	Merge pull request #436 from ZmagoD/zd_SCI_922 ... fixed user without permissions bug [fixes SCI-922]	2017-01-23 17:25:07 +01:00
Zmago Devetak	386c379602	Merge pull request #435 from ZmagoD/zd_SCI_907 ... fixes checklist item user popover bug [fixes SCI-907]	2017-01-23 17:07:44 +01:00
zmagod	20cde2654b	fixed user without permissions bug [fixes SCI-922]	2017-01-23 10:53:42 +01:00
zmagod	9c3bc8dac7	fixes checklist item user popover bug [fixes SCI-907]	2017-01-23 09:47:04 +01:00
mz3944	fd63a1de12	Merge pull request #432 from mlorb/ml-sci-fix-847 ... Add dynamic length for sample type/group field when adding new sample [SCI-847]	2017-01-20 15:46:34 +01:00
mlorb	2d073c8c04	Merge pull request #430 from mlorb/ml_sci_826 ... Display smart annotations in reports [SCi-826]	2017-01-20 13:49:40 +01:00
Mojca Lorber	8e02c2e025	add locale - fix	2017-01-20 13:37:07 +01:00
mz3944	18a2e4c423	Merge pull request #433 from mz3944/mz-sci-914 ... Edit of a sample in sample table does not work	2017-01-20 13:02:05 +01:00
Zmago Devetak	c1e7cc83a7	Merge pull request #434 from ZmagoD/zd_SCI_915 ... Text is deleted when entering smart annotation in rich text editor	2017-01-20 13:01:29 +01:00
Zmago Devetak	7bd368e002	Merge pull request #431 from ZmagoD/zd_add_code_highlight ... Fixes code highlight and smart annotations experiments bug	2017-01-20 12:59:21 +01:00
mz3944	209189cd9b	Merge pull request #429 from mz3944/mz-sci-894 ... Smart annotations - no hits notification	2017-01-20 11:50:00 +01:00
mlorb	9a3c56de97	Merge pull request #421 from mlorb/ml_sci_540 ... Protocol steps/results - adding titles for tables [SCI-540]	2017-01-20 11:41:49 +01:00
zmagod	71453398b1	bugfix	2017-01-20 11:33:49 +01:00
zmagod	4f7d62e79d	removes unneeded annotations [fixes SCI-915]	2017-01-20 11:33:10 +01:00
Matej Zrimšek	5d65627808	Fixed sample editing in samples table. [SCI-914]	2017-01-20 11:10:17 +01:00
Mojca Lorber	3789769af3	add dynamic length for sample type/group field when adding new sample	2017-01-20 09:53:44 +01:00
zmagod	9550c6dd35	fixes highlight.js	2017-01-19 17:09:25 +01:00
Mojca Lorber	6653f0d4c1	small fixes	2017-01-19 16:42:14 +01:00
Mojca Lorber	6de83ff53b	fix hound	2017-01-19 15:58:40 +01:00
Mojca Lorber	4ea154410a	add to fields with rich text formatting	2017-01-19 15:27:24 +01:00
Matej Zrimšek	54f8b01341	Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]	2017-01-19 15:26:28 +01:00
Mojca Lorber	44de927cf4	display smart annotations in reports - without rich text fields	2017-01-19 14:22:54 +01:00
mz3944	1793e2a8f4	Merge pull request #428 from mz3944/ok_SCI_886_v2 ... Add “no results found” message in smart annotation [SCI-886]	2017-01-19 13:53:47 +01:00
Oleksii Kriuchykhin	890c5e3c3d	Add “no results found” message in smart annotation [SCI-886]	2017-01-19 13:42:58 +01:00
Luka Murn	94809013ab	Update reprocess Paperclip rake task	2017-01-19 13:26:43 +01:00
Zmago Devetak	039a8d7da6	Merge pull request #426 from ZmagoD/zd_add_tinyMCE ... Add tiny mce	2017-01-19 12:57:55 +01:00
zmagod	2cbb8ba41a	removed unneeded comments	2017-01-19 12:54:48 +01:00
mz3944	da604d2619	Merge pull request #427 from mz3944/mz-sci-908 ... Some smart annotations refactoring [SCI-908]	2017-01-19 12:15:20 +01:00
zmagod	f2d5066dc7	fix some bugs	2017-01-19 11:37:59 +01:00
Matej Zrimšek	5d86bbb812	Smart annotations improved documentation. [SCI-908]	2017-01-19 10:56:02 +01:00
Matej Zrimšek	fec83e8c45	Smart annotations refactoring. [SCI-908]	2017-01-19 10:55:43 +01:00
zmagod	2ccafdd670	bug fix	2017-01-19 10:12:01 +01:00
zmagod	27d3868f37	fix bugs	2017-01-19 09:40:39 +01:00
zmagod	88d7cb200e	removed quill	2017-01-18 23:06:14 +01:00
zmagod	65fa631b1c	adding tinyMce first run	2017-01-18 22:40:08 +01:00
okriuchykhin	18d329fb42	Merge pull request #423 from okriuchykhin/ok_SCI_896 ... Make search work for full names in smart annotations [SCI-896]	2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin	6555fd02b6	Make search work for full names in smart annotations [SCI-896]	2017-01-18 16:57:51 +01:00
okriuchykhin	7f6ceef9e9	Merge pull request #422 from okriuchykhin/ok_SCI_897 ... Remove sample type and group from smart annotation [SCI-897]	2017-01-18 16:26:25 +01:00
mz3944	b5e38afb64	Merge pull request #416 from mz3944/mz-sci-884 ... Smart annotation bug fixes [SCI-884, SCI-889] [WIP]	2017-01-18 16:13:19 +01:00
Matej Zrimšek	dbbb709bf2	Smart annotations minor refactoring. [SCI-884, SCI-889]	2017-01-18 16:04:39 +01:00
Matej Zrimšek	24458fe590	Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889]	2017-01-18 15:29:48 +01:00
okriuchykhin	6f3378e554	Merge pull request #411 from okriuchykhin/ok_SCI_873 ... Add truncation of image description in the preview [SCI-873]	2017-01-18 15:11:03 +01:00
Oleksii Kriuchykhin	e45749d3b2	Remove sample type and group from smart annotation [SCI-897]	2017-01-18 14:46:53 +01:00
Mojca Lorber	f656a1093d	fix hound	2017-01-18 14:40:24 +01:00
Mojca Lorber	6155a458e7	update search	2017-01-18 14:22:19 +01:00
Mojca Lorber	dde9854bf1	update protocol import/export and clone	2017-01-18 14:22:19 +01:00
Mojca Lorber	3b92ab9f36	add names to tables from protocol steps in reports	2017-01-18 14:22:19 +01:00
Mojca Lorber	b3c423c582	add table name in protocol step	2017-01-18 14:22:18 +01:00