188 commits

Author	SHA1	Message	Date
Zmago Devetak	13570ba5cb	Merge pull request #602 from ZmagoD/zd_SCI_1247 ... fixes pdf export and image size [fixes SCI-1247]	2017-05-10 09:31:55 +02:00
Zmago Devetak	cd503580b2	Merge pull request #599 from ZmagoD/zd_SCI_1241 ... fix samples bug [SCI-1241]	2017-05-09 15:55:43 +02:00
Mojca Lorber	7ca62a16bb	fix hound	2017-05-09 14:55:23 +02:00
Mojca Lorber	e1475fbfef	fix bug with avatar in system log	2017-05-09 14:40:02 +02:00
zmagod	2d69896897	fixes pdf export and image size [fixes SCI-1247]	2017-05-09 13:59:59 +02:00
zmagod	df13478186	fix samples bug [SCI-1241]	2017-05-09 11:25:00 +02:00
Zmago Devetak	4b816f5322	Merge pull request #568 from ZmagoD/zd_SCI_1119 ... Add images to fields with rich text formatting	2017-05-08 13:06:58 +02:00
zmagod	d6f303581f	refactor	2017-05-08 12:56:33 +02:00
Zmago Devetak	e47bf8f013	Merge pull request #582 from ZmagoD/zd_SCI_1051 ... fix reports pdf for user annotation [SCI-1051]	2017-05-08 10:24:40 +02:00
zmagod	b22350136f	adds label to step in report [fixes SCI-488]	2017-05-05 09:45:18 +02:00
zmagod	289a148332	refactor	2017-05-03 15:33:23 +02:00
zmagod	5b58824ec0	refactor	2017-05-03 15:30:08 +02:00
zmagod	1b618e88e5	fix reports pdf for user annotation [SCI-1051]	2017-05-03 10:50:43 +02:00
osboxes.org	21a39fc704	Code indentation corrected [fixes SCI-1214]	2017-04-28 10:31:14 +01:00
osboxes.org	f72802f9f2	Tab Teams is highlighted when in Audit trails [fixes SCI-1214]	2017-04-26 16:31:44 +01:00
zmagod	1fefeee3d1	adds team space related methods	2017-04-25 13:44:31 +02:00
zmagod	66f43803c0	refactor, fix user annotation bug	2017-04-24 16:22:25 +02:00
zmagod	55c8c498e2	add image upload functionality to result text	2017-04-24 12:28:27 +02:00
zmagod	550f563666	working version for steps first run	2017-04-21 16:09:04 +02:00
zmagod	c25df63a14	add tinymce img importer and refactor input sanitize helper	2017-04-19 09:11:52 +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
Oleksii Kriuchykhin	07d658ab82	Improve speed of search [SCI-1157]	2017-04-11 14:55:44 +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
zmagod	9bb1bb3f9b	refactor [fixes SCI-825]	2017-04-06 15:08:03 +02:00
zmagod	d331911ffe	completed step annotations	2017-04-06 08:42:16 +02:00
Mojca Lorber	a0fe47a05d	change helper method for user info popover	2017-04-04 15:22:41 +02:00
zmagod	99c116f257	first run	2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin	2faa137f67	Add user popover method for users [SCI-1127]	2017-04-03 15:10:00 +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
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	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	b821fff4a5	adds non breaking space between file name and buttons	2017-03-13 14:14:44 +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
Mojca Lorber	1ba5f1748f	fix permissions for experiment actions	2017-03-09 17:45:34 +01:00
zmagod	1d42d46c02	fixes bug with step comments	2017-03-09 16:02:52 +01:00
zmagod	9939d8df06	refactor	2017-03-09 10:51:54 +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
Oleksii Kriuchykhin	0f8336e5a5	Refactoring of the comments using STI [SCI-1090]	2017-03-08 13:18:20 +01:00
Mojca Lorber	f84611f558	fix report - checklist items are in separate row than checkboxes	2017-02-22 15:51:26 +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
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
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	c6ed73bc82	Allow team admins to see all projects, even hidden ones	2017-02-13 13:42:53 +01:00