3238 commits

Author	SHA1	Message	Date
Luka Murn	38361e4bb4	Setup initial GUI	2017-06-07 18:43:48 +02:00
Matej Zrimšek	77a225ec31	Added toggle between assigned and all repository records. [SCI-1276]	2017-06-07 18:13:25 +02:00
Luka Murn	02dd6636ba	Allow saving & editing of reports with repository elements ... Closes SCI-1279.	2017-06-07 16:55:00 +02:00
Luka Murn	b5f6d1da94	Allow custom repositories to be added to reports	2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin	8b1190060e	Add custom repository table [SCI-1274]	2017-06-07 15:23:25 +02:00
Zmago Devetak	fcec42ae31	Merge pull request #645 from ZmagoD/zd_SCI_1278 ... generates samples csv file in background job [fixes SCI-1278]	2017-06-07 15:04:24 +02:00
zmagod	c6bb20039b	adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]	2017-06-07 13:29:39 +02:00
Mojca Lorber	51c4eeb106	renaming	2017-06-06 15:50:43 +02:00
Mojca Lorber	39dda1ad5d	refactoring	2017-06-06 13:18:44 +02:00
ajugo	887d9a4f52	Samples - show all/show assigned [SCI-1277] (#644) ... * Samples - show all/show assigned [SCI-1277] * Some fixes in code * Some minor fixes in code * Omit present * Correct missed present * Fixing hound warnings	2017-06-06 12:46:56 +02:00
Mojca Lorber	acdea2198d	code changes after rebasing	2017-06-06 11:10:55 +02:00
Mojca Lorber	da98788031	small code fixes	2017-06-06 09:57:50 +02:00
Mojca Lorber	13bf4ad229	create new repository	2017-06-06 09:54:39 +02:00
Matej Zrimšek	419d638163	Renamed reposiotry edit and destroy permission helper. [fix 1269]	2017-06-05 17:36:26 +02:00
zmagod	ab4961ddb1	adds overlay partial	2017-06-05 11:31:05 +02:00
zmagod	67d902db52	refactor	2017-06-05 10:43:58 +02:00
Matej Zrimšek	d8d54232c3	After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]	2017-06-02 19:08:51 +02:00
Matej Zrimšek	73aaef0949	Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]	2017-06-02 17:52:04 +02:00
Matej Zrimšek	5c9a453439	Added permissions for deleting and renaming of repositories. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	9a7048cc7a	Code formatting updated for repositories. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	f8258812ef	Repository remove and rename refactoring. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	21a72da84f	Added rename logic and improved remove logic. [SCI-1269]	2017-06-02 17:50:34 +02:00
Matej Zrimšek	cdaac6a01b	Added remove repository modal logic. [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	791bb934ca	Remove repository modal logic (WIP). [SCI-1269]	2017-06-02 17:50:33 +02:00
Matej Zrimšek	b92a760a5c	Added dropdown GUI for editing repository. [SCI-1269]	2017-06-02 17:47:28 +02:00
zmagod	1c021b11db	adds drag and drop files upload to steps [fixes SCI-1310]	2017-06-02 16:34:09 +02:00
okriuchykhin	c88fc84538	Merge pull request #633 from okriuchykhin/ok_SCI_960_v2 ... Add smart annotations in sample info modal [SCI-960]	2017-05-31 11:31:14 +02:00
Luka Murn	fcc3995049	Merge pull request #647 from biosistemika/master ... Bring latest master changes into custom-repositories	2017-05-30 14:18:14 +02:00
zmagod	6e1f93dd11	minor fix	2017-05-29 14:47:05 +02:00
zmagod	b527afd12b	generates samples csv file in background job [fixes SCI-1278]	2017-05-29 14:42:55 +02:00
Zmago Devetak	1df6265326	Merge pull request #627 from ZmagoD/zd_SCI_1280 ... prevent to duplicate new step [fixes SCI-1280]	2017-05-29 09:55:22 +02:00
Mojca Lorber	c3051421b2	change truncate function	2017-05-25 11:01:24 +02:00
Mojca Lorber	8540f88b7e	small fix - renaming of ids and hrefs	2017-05-25 10:06:48 +02:00
mlorb	872f712be8	Merge branch 'custom-repositories' into ml_sci_1266_v2	2017-05-23 11:05:25 +02:00
mz3944	6b8c8deb16	Merge pull request #634 from mz3944/mz-SCI-414 ... Uncompleted steps not added to Reports	2017-05-23 09:58:05 +02:00
Oleksii Kriuchykhin	b223646f07	Small improvements [SCI-1273]	2017-05-23 08:53:53 +02:00
Mojca Lorber	a716a0b1db	change breadcrumbs on protocol managements page	2017-05-22 17:58:42 +02:00
Mojca Lorber	9ae615264d	add global repositories screen - tab control	2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin	e99e3edb7b	Add repositories dropdown to task navigation [SCI-1273]	2017-05-18 14:21:00 +02:00
Matej Zrimšek	20265ddd69	Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]	2017-05-17 18:18:57 +02:00
Matej Zrimšek	f78c80b148	Added possibility to add uncompleted steps to report. [closes SCI-414]	2017-05-17 13:25:21 +02:00
Oleksii Kriuchykhin	7f713b4293	Add smart annotations in sample info modal [SCI-960]	2017-05-17 13:06:21 +02:00
zmagod	b21923cf98	prevent to duplicate new step [fixes SCI-1280]	2017-05-16 11:52:07 +02:00
Matej Zrimšek	2c6f888cbc	Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]	2017-05-15 18:56:41 +02:00
Matej Zrimšek	901558c733	Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	ba693c65a8	Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]	2017-05-15 18:20:42 +02:00
Matej Zrimšek	dbb79ebab1	Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	b97cb91840	Refactoring of modal for adding content to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
Matej Zrimšek	27cfd55ea5	Simplified popup modal for adding contents to report. [fixes SCI-487]	2017-05-15 17:43:12 +02:00
zmagod	9bec7dd96e	Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248	2017-05-15 14:49:37 +02:00
zmagod	d34b2520b5	refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]	2017-05-12 15:59:58 +02:00
zmagod	070a829c49	change new results hendlers	2017-05-12 10:02:33 +02:00
Oleksii Kriuchykhin	bb8c7c342c	Add additional info to samples info modal [SCI-960]	2017-05-11 22:20:06 +02:00
zmagod	81a3cb0a41	adds results js code in modules	2017-05-11 16:54:28 +02:00
okriuchykhin	15f19b73fb	Merge pull request #610 from okriuchykhin/ok_SCI_1253 ... Add notifications counter badge to project card [SCI-1253]	2017-05-11 11:11:09 +02:00
okriuchykhin	000ca26452	Merge pull request #607 from okriuchykhin/ok_SCI_1243 ... Add specific classes to task card for analytics [SCI-1243]	2017-05-11 11:10:05 +02:00
Oleksii Kriuchykhin	a5926726ce	Add notifications counter badge to project card [SCI-1253]	2017-05-10 17:28:37 +02:00
zmagod	2081e0a94b	Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1	2017-05-10 15:14:17 +02:00
Oleksii Kriuchykhin	08e7f09d07	Add specific classes to task card for analytics [SCI-1243]	2017-05-10 10:33:34 +02:00
okriuchykhin	ccc640f2bc	Merge pull request #593 from okriuchykhin/ok_SCI_1158 ... Add advanced search options [SCI-1158]	2017-05-09 10:23:34 +02:00
okriuchykhin	bd0b930382	Merge pull request #598 from okriuchykhin/ok_SCI_152 ... Add counters for users and comments on canvas [SCI-152]	2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin	344b9c290a	Add counters for users and comments on canvas [SCI-152]	2017-05-08 17:32:55 +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
Oleksii Kriuchykhin	0ee7e11620	Add advanced search options [SCI-1158]	2017-05-05 16:41:23 +02:00
Zmago Devetak	de3d1172c1	Merge pull request #584 from ZmagoD/zd_SCI_1200 ... add popup for approval to complete the Task [fixes SCI-1200]	2017-05-05 14:57:27 +02:00
Zmago Devetak	28042d11e1	Merge pull request #589 from ZmagoD/zd_SCI_488 ... adds label to step in report [fixes SCI-488]	2017-05-05 14:56:01 +02:00
zmagod	b22350136f	adds label to step in report [fixes SCI-488]	2017-05-05 09:45:18 +02:00
zmagod	8d0c22327b	adds asc order to checklists [fixes SCI-1228]	2017-05-04 15:17:34 +02:00
zmagod	acc5594f1b	add popup for approval to complete the Task [fixes SCI-1200]	2017-05-04 12:41:22 +02:00
Mojca Lorber	f8f6a5f63a	fix bug edit canvas not working and fix positioning of cloned task/workflow	2017-05-04 10:54:50 +02:00
Matej Zrimšek	a5cffd06f3	Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]	2017-04-25 16:03:50 +02:00
zmagod	86c6ae3b03	display tinyMCE images in reports	2017-04-25 09:53:35 +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	3d805d529d	Merge pull request #554 from okriuchykhin/ok_SCI_877 ... Add image preview to protocol repository [SCI-877]	2017-04-18 08:58:39 +02:00
Oleksii Kriuchykhin	4fac6484b5	Hide office edit buttons in protocol preview and fix image preview in protocol edit [SCI-877]	2017-04-14 16:05:35 +02:00
zmagod	f104444a0c	adds additional explanations [fixes SCI-1103]	2017-04-12 16:56:47 +02:00
Oleksii Kriuchykhin	181d981a51	Add image preview to protocol repository [SCI-877]	2017-04-12 16:05:38 +02:00
Zmago Devetak	9c31239318	Merge pull request #552 from biosistemika/release-1.9.0 ... Release 1.9.1	2017-04-12 13:08:37 +02:00
zmagod	9610c5f5a0	fix info dropdown links [fixes SCI-1141]	2017-04-07 11:31:09 +02:00
zmagod	f16607579f	refactor steps annotation	2017-04-06 13:03:13 +02:00
mlorb	317739af1e	Merge pull request #530 from biosistemika/ml_sci_1044 ... Add data-hook and yadcf-filter plug-in [SCI-1044]	2017-03-31 14:00:23 +02:00
Mojca Lorber	503ee5b62e	change place of data-hook	2017-03-30 17:21:29 +02:00
Mojca Lorber	9458f391e5	add data-hook and yadcf-filter plug-in	2017-03-29 15:59:51 +02:00
Zmago Devetak	0019fd19ea	Merge pull request #525 from ZmagoD/zd_SCI_765 ... Export large files - utility class	2017-03-29 11:55:51 +02:00
zmagod	0096f9dc14	refactor	2017-03-29 09:32:23 +02:00
okriuchykhin	05a49e5a82	Merge pull request #528 from okriuchykhin/ok_SCI_1133 ... Fix secondary navigation on Mac [SCI-1133]	2017-03-29 09:30:34 +02:00
Oleksii Kriuchykhin	391c5af267	Fix secondary navigation on Mac [SCI-1133]	2017-03-28 14:36:52 +02:00
zmagod	7039420f99	add hook to canvas module actions	2017-03-28 10:43:39 +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
Zmago Devetak	804fb2fec9	Merge pull request #519 from ZmagoD/zd_SCI_1092_v2 ... adds hooks in team switch [fixes SCI-1092]	2017-03-24 12:56:52 +01:00
zmagod	023b3213e8	fixes email link [fixes SCI-765]	2017-03-24 12:10:07 +01:00
Mojca Lorber	83fa8570d7	refactoring	2017-03-17 17:52:15 +01:00
zmagod	c244e69e81	fixed report comments bug [fixes SCI-1100]	2017-03-17 16:59:40 +01:00
zmagod	70f17a924e	adds hooks in team switch [fixes SCI-1092]	2017-03-17 16:10:22 +01:00
Mojca Lorber	7a4e3201e7	add error messages to sample group/type edit/delete actions	2017-03-14 17:32:25 +01:00
zmagod	5d372851d3	fixes reports comment bug [fixes SCI-1100]	2017-03-14 16:24:02 +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	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
Luka Murn	1e3a697a91	Merge pull request #508 from biosistemika/lm-sci-838-fix ... Open edit/view Office files in new browser tab/window [SCI-838]	2017-03-09 10:39:16 +01:00
Luka Murn	0e8f5f8e99	Merge branch 'lm-sci-1091-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-1091-fix ... Conflicts: app/views/my_modules/_state_buttons.html.erb	2017-03-09 08:44:09 +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
Luka Murn	7c9aa2e476	Hide complete&uncomplete task buttons if user cannot do it ... Closes SCI-1091.	2017-03-06 16:01:04 +01:00
Luka Murn	86a800a84e	Open edit/view Office files in new browser tab/window ... Closes SCI-838.	2017-03-06 14:12:18 +01:00
Luka Murn	473487faec	Add HTML <head><title> to edit, view file pages ... Closes SCI-1049.	2017-03-06 13:55:07 +01:00
Luka Murn	4ddb139911	Fix padding of state buttons ... Closes SCI-1073.	2017-03-03 16:36:52 +01:00
Luka Murn	3d7f09bde6	Fix protocol state buttons a bit ... Closes SCI-1073.	2017-02-28 14:35:12 +01:00
Luka Murn	fecfc9e41d	Merge pull request #498 from biosistemika/release-1.8.1 ... Release 1.8.1	2017-02-23 14:57:30 +01:00
Luka Murn	dc89c160be	Fix a bug with team page not working from user task modal	2017-02-23 14:45:00 +01:00
mlorb	a72a072fac	Merge pull request #495 from mlorb/ml_sci_948 ... Fix report - checklist items are in separate row than checkboxes [SCI-948]	2017-02-23 10:50:48 +01:00
Mojca Lorber	f84611f558	fix report - checklist items are in separate row than checkboxes	2017-02-22 15:51:26 +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
mlorb	42e6a99911	Merge pull request #487 from mlorb/ml_sci_1032 ... Fix visual bug in edit avatar mode [SCI-1032]	2017-02-22 10:59:18 +01:00
mlorb	8c111db31a	Merge pull request #486 from mlorb/ml_sci_1033 ... Fix user has no teams view [SCI-1033]	2017-02-22 10:58:39 +01:00
zmagod	151dc79a81	adds hook for lock task action	2017-02-21 16:25:50 +01:00
Mojca Lorber	ac0988ef32	add data-hooks for remove manage teams button	2017-02-21 15:39:08 +01:00
Mojca Lorber	0fd41e8a6d	remove changes on user has no teams view	2017-02-21 15:12:58 +01:00
mlorb	ea1711be83	Merge pull request #485 from mlorb/ml_sci_1001 ... Add data-hook for E-signature manifestation/display [SCI-1001]	2017-02-21 14:25:08 +01:00
mlorb	01d9f306a5	change div to span	2017-02-21 14:22:28 +01:00
Mojca Lorber	6b30f097f0	fix visual bug in edit avatar mode	2017-02-21 14:02:42 +01:00
Mojca Lorber	90864a45a0	fix user has no teams view	2017-02-21 13:08:06 +01:00
Luka Murn	6f1c19ae2d	Fix _user_dropdown.html.erb	2017-02-21 09:27:42 +01:00
Mojca Lorber	cb2127ee7f	add data-hook for E-signature manifestation/display	2017-02-20 18:03:55 +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
Luka Murn	ce617894c5	Fix manage project users modal bug ... Closes SCI-1026.	2017-02-16 15:29:58 +01:00
Oleksii Kriuchykhin	218e96b1f0	Code style fixes [SCI-999]	2017-02-16 11:45:07 +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	f93cc89624	Fix system notification email links not working bug ... Closes SCI-964.	2017-02-10 15:13:33 +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	7bee3a4ea0	Move user profile to settings	2017-02-09 11:34:52 +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
zmagod	c99a540eb3	adds hook to team name in the invitation template [fixes SCI-930]	2017-02-03 16:53:42 +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	8b105aa030	Add override hooks [SCI-936]	2017-02-02 23:35:47 +01:00
Zmago Devetak	65bbd81497	Merge pull request #469 from ZmagoD/zd_SCI_929 ... Adds hook in user settings navigation	2017-02-02 15:01:37 +01:00
mlorb	970d99e6e3	Merge pull request #465 from mlorb/ml_sci_937 ... Redesign of individual team page [SCI-937]	2017-02-02 11:15:55 +01:00
mlorb	5510fa7751	rename data-hooks in team view	2017-02-02 10:36:23 +01:00
Oleksii Kriuchykhin	db90c5d63b	Add datatable to all teams page [SCI-936]	2017-02-02 09:53:59 +01:00
zmagod	bb42bd04a5	adds hook in user settings navigation	2017-02-01 17:10:22 +01:00
Mojca Lorber	86351ce17d	add data-hooks for billing	2017-02-01 15:01:54 +01:00
Mojca Lorber	d3e0eca44e	redesign individual team page	2017-02-01 14:44:47 +01:00
Oleksii Kriuchykhin	031741d122	Disable protocols link if user has no teams [SCI-934]	2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin	c119b7c014	Make sciNote work for users without any teams [SCI_934]	2017-02-01 14:16:26 +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
okriuchykhin	067b9452a4	Merge pull request #464 from okriuchykhin/ok_SCI_935 ... Add config option to enable/disable users registration [SCI-935]	2017-02-01 09:36:36 +01:00
Luka Murn	db75231617	Update URLs to sciNote support pages ... Closes SCI-978.	2017-01-31 15:48:56 +01:00
Oleksii Kriuchykhin	d1e69438de	Add config option to enable/disable users registration [SCI-935]	2017-01-30 15:04:02 +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	0baaf12de3	Re-display images & checkboxes in PDF reports ... Closes SCI-953.	2017-01-26 10:46:58 +01:00
Luka Murn	8c5a52417c	Merge pull request #445 from okriuchykhin/ok_SCI_940 ... Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:49:38 +01:00
okriuchykhin	648d256dff	Merge pull request #448 from okriuchykhin/ok_SCI_945 ... Fix openning of protocol preview with images [SCI-945]	2017-01-25 17:27:01 +01:00
Oleksii Kriuchykhin	c55f3cb99c	Add flag to disable simple_format in custom_auto_link [SCI-940]	2017-01-25 17:18:19 +01:00
Oleksii Kriuchykhin	310d8c1920	Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:18:19 +01:00
zmagod	afd8328e9c	rename ortanizations -> teams	2017-01-25 14:22:06 +01:00
Mojca Lorber	6905fc8c08	remove letter f	2017-01-25 13:20:11 +01:00
Oleksii Kriuchykhin	90e4b26c69	Fix openning of protocol preview with images [SCI-945]	2017-01-25 13:06:12 +01:00
zmagod	72e13beee3	renamed organizations in views	2017-01-25 12:01:23 +01:00
Mojca Lorber	2277af534c	fix table titles	2017-01-25 11:01:35 +01:00
Luka Murn	53699193a2	Merge branch 'smart-annotations' ... Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb	2017-01-24 14:33:23 +01:00
zmagod	6e7fa21dd3	adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]	2017-01-24 10:51:12 +01:00
Oleksii Kriuchykhin	d555ba7905	Add export to protocol management page and code style improvements [SCI-742]	2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin	14a6705b55	Implemented protocol export through Zip::OutputStream [SCI-742]	2017-01-23 17:43:48 +01:00
Mojca Lorber	8e02c2e025	add locale - fix	2017-01-20 13:37:07 +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
Mojca Lorber	6653f0d4c1	small fixes	2017-01-19 16:42:14 +01:00
Mojca Lorber	4ea154410a	add to fields with rich text formatting	2017-01-19 15:27:24 +01:00
Mojca Lorber	44de927cf4	display smart annotations in reports - without rich text fields	2017-01-19 14:22:54 +01:00
zmagod	2cbb8ba41a	removed unneeded comments	2017-01-19 12:54:48 +01:00
zmagod	f2d5066dc7	fix some bugs	2017-01-19 11:37:59 +01:00
zmagod	27d3868f37	fix bugs	2017-01-19 09:40:39 +01:00
zmagod	65fa631b1c	adding tinyMce first run	2017-01-18 22:40:08 +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
Oleksii Kriuchykhin	a490a12fb1	Add truncation of image description in the preview [SCI-873]	2017-01-18 13:28:56 +01:00
Luka Murn	cf72da5635	Merge branch 'improved-files-handling' into 'master' ... Conflicts: app/assets/javascripts/protocols/steps.js.erb app/helpers/assets_helper.rb db/schema.rb	2017-01-18 11:29:40 +01:00
Zmago Devetak	1b9f7db385	Merge pull request #405 from ZmagoD/zd_SCI_832 ... Visualization of User smart annotation after saving the field	2017-01-18 09:36:42 +01:00
Luka Murn	a2935c6620	Add sample info modal popup to sample smart annotations ... This MR also loads datatables.js globally (as it's required by the modal), so I removed it everywhere in code, and it shouldn't be used anymore (e.g. '//= require datatables'). Closes SCI-892.	2017-01-16 15:52:02 +01:00
okriuchykhin	02bfd19d1c	Merge pull request #385 from okriuchykhin/ok_SCI_102 ... Fix XSS on activites and throghout the rest of app [SCI-102]	2017-01-16 11:41:38 +01:00
Luka Murn	1acf258c70	Fix minor Zmagohound comment	2017-01-14 10:00:52 +01:00
zmagod	1b2fa78e42	adds user preview to user smart annotation [fixes SCI-832]	2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin	75031e17b9	Remove double sanitization from views [SCI-102]	2017-01-12 16:54:15 +01:00
Luka Murn	bc03a26d4b	Also fix this new year issue on comments display	2017-01-12 15:06:12 +01:00
Luka Murn	8b01f912a0	Fix new year problems with activities ... Closes SCI-876.	2017-01-12 14:47:15 +01:00
Oleksii Kriuchykhin	0350f2f792	Add html escaping to name filelds in the views [SCI-102]	2017-01-12 11:03:14 +01:00
Oleksii Kriuchykhin	d05c16b0ba	Added auto_link wrapper with custom sanitization [SCI-102]	2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin	0546716a0b	Improve user input sanitization, fix bugs [SCI-102]	2017-01-11 15:50:11 +01:00
zmagod	3a1ec0eb5e	refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]	2017-01-11 14:56:47 +01:00
Matej Zrimšek	30a9c283fb	Added back bullets to images in protocol preview in protocol repository.	2017-01-11 14:15:07 +01:00
Matej Zrimšek	852dc2eb7e	Added file downloading to protocol preview in protocol repository. [SCI-878]	2017-01-11 14:14:12 +01:00
zmagod	a4aa933151	refactor smart annotation parser helper	2017-01-11 10:34:14 +01:00
zmagod	a903772de8	style dropdown	2017-01-10 17:05:32 +01:00
zmagod	fc76a4ae6d	Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834	2017-01-10 14:22:04 +01:00
zmagod	89e8946a47	expand smart annotation	2017-01-10 14:14:21 +01:00
zmagod	e0e998a0d8	add smart annotation parser helper	2017-01-10 14:14:21 +01:00
zmagod	94262b56ef	prepare data for atwho	2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin	4c9c9037ed	Enable image preview after editing protocol and disable preview modal animation [SCI-868]	2017-01-09 17:19:46 +01:00
okriuchykhin	3f930ccfce	Merge pull request #392 from okriuchykhin/ok_SCI_858 ... Fixes wrong samples info modals being shown in samples datatable [SCI-858]	2017-01-09 12:49:38 +01:00
mz3944	ef431da2db	Merge pull request #389 from mz3944/mz-sci-848 ... Unable to delete samples [SCI-848]	2017-01-09 11:57:48 +01:00
mlorb	f14ad0f762	Merge pull request #387 from mlorb/ml_sci_732 ... Add protocol preview to search results [SCI-732]	2017-01-09 11:28:04 +01:00
Oleksii Kriuchykhin	bc8db28746	Fixes wrong samples info modals being shown in samples datatable [SCI-858]	2017-01-09 09:38:42 +01:00
Oleksii Kriuchykhin	aa2b573278	Enable image preview while editing steps and code style improvements [SCI-694]	2017-01-06 15:58:23 +01:00
Matej Zrimšek	ec7a1cb4c0	Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848]	2017-01-06 14:23:20 +01:00
Luka Murn	7835753d3c	Add atwho-users URL to <body>	2017-01-06 12:48:37 +01:00
Mojca Lorber	aad2eadeae	syntax fix	2017-01-06 10:46:36 +01:00
Mojca Lorber	4e7e261225	fix protocol preview	2017-01-06 10:10:33 +01:00
Mojca Lorber	356edba1b3	add protocol preview to search results	2017-01-05 18:08:59 +01:00
Matej Zrimšek	4b0f47675a	Fixes experiment button not being clicable in project overview page. [SCI-849]	2017-01-05 14:42:52 +01:00
Oleksii Kriuchykhin	cd3924afd3	Sanitize .html_safe marked strings which contain tags [SCI-102]	2017-01-05 13:04:19 +01:00
Oleksii Kriuchykhin	9c4191a1e0	Initial code commit [SCI-102]	2017-01-05 13:04:19 +01:00
mlorb	59751ec41e	Merge pull request #373 from mlorb/ml_sci_709 ... Add Protocol Preview to Protocol repository [SCI-709]	2017-01-04 11:28:55 +01:00
Luka Murn	3bee9d2e12	Save an (yet unworking) version of user smart annotations ... Used so other devs can start working on smart annotations.	2017-01-04 10:54:02 +01:00
Luka Murn	6402acc102	Merge pull request #377 from Ducz0r/lm-sci-820-fix ... Fix 2 bugs with comments editing [SCI-820]	2017-01-04 10:47:29 +01:00
Luka Murn	37cd6417c8	Merge pull request #374 from Ducz0r/lm-sci-808-814-fix ... Fix some bugs on sample groups & types page [SCI-808, SCI-814]	2017-01-04 09:50:26 +01:00
Mojca Lorber	a0704cd873	remove duplicated includes of css and js	2017-01-03 17:33:01 +01:00
zmagod	a434649f42	Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration	2017-01-03 16:35:25 +01:00
Mojca Lorber	e555535dfb	add edit button to protocol preview modal	2017-01-03 10:04:14 +01:00
okriuchykhin	68ac3486c7	Merge pull request #381 from okriuchykhin/ok_SCI_275 ... Add task name to project activity [SCI-275]	2016-12-30 15:32:08 +01:00
okriuchykhin	cce57d066c	Merge pull request #370 from okriuchykhin/ok_SCI_817 ... Fix issue with long samples column names in import modal [SCI-817]	2016-12-30 15:29:32 +01:00
okriuchykhin	e8955b0304	Merge pull request #375 from okriuchykhin/ok_SCI_361 ... Add sorting to Project's experiments overview [SCI-361]	2016-12-30 15:28:53 +01:00
Oleksii Kriuchykhin	f076226b3f	Add task name to project activity [SCI-275]	2016-12-29 16:31:48 +01:00
Oleksii Kriuchykhin	d798f1b120	Fix XSS vulnerability in protocol keywords [SCI-632]	2016-12-29 15:15:29 +01:00
Luka Murn	b931b20f02	Fix 2 bugs with comments editing ... Closes SCI-820.	2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin	4d3e002c81	Add sorting to Project's experiments overview [SCI-361]	2016-12-23 15:40:01 +01:00
Luka Murn	4b50c73474	Merge pull request #363 from Ducz0r/lm-sci-546-fix ... Restyle step table display in reports [SCI-546]	2016-12-23 12:57:54 +01:00
Luka Murn	3922be2b17	Change String in sample types & groups ... Closes SCI-808.	2016-12-23 11:48:57 +01:00
Mojca Lorber	40e3240a99	add content to preview modal	2016-12-22 11:43:11 +01:00
zmagod	e554fdf805	code refactor	2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin	53ea09c3de	Fix issue with long samples column names in import modal [SCI-817]	2016-12-21 14:34:53 +01:00
Oleksii Kriuchykhin	00ea3a027c	Fix generation of preview url for new steps and results [SCI-694]	2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin	cbef971d85	Fix timeouts when fetching images from S3 [SCI-694]	2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin	d2b76d8385	Improved image preview modal [SCI-694]	2016-12-19 17:36:18 +01:00
Luka Murn	a48eaf662e	Restyle step table display in reports so ... Closes SCI-546.	2016-12-19 15:09:49 +01:00
zmagod	efe41817f2	removes sample group/type link in new sample form [fixes SCI-809]	2016-12-19 10:49:21 +01:00
Oleksii Kriuchykhin	b537feb8a0	Added large preview [SCI-694]	2016-12-16 17:07:08 +01:00
Oleksii Kriuchykhin	8738b3e09d	Added image preview to Results [SCI-694]	2016-12-16 15:55:46 +01:00
Oleksii Kriuchykhin	0541253ffa	Added modal for images preview [SCI-694]	2016-12-16 15:53:16 +01:00
Zmago Devetak	c8631077df	Merge pull request #361 from biosistemika/improved-sample-table ... Improved sample table	2016-12-16 15:37:54 +01:00
zmagod	ba58ac2a77	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_781_796	2016-12-15 09:26:12 +01:00
zmagod	4d6a85ed7c	fixed sample groups colorpicker [fixes SCI-781]	2016-12-15 09:23:38 +01:00
zmagod	b07f9fae59	fixes new sample group/type link in sample row [fixes SCI-796]	2016-12-15 09:23:38 +01:00
zmagod	6d2fb3b02c	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790	2016-12-14 17:05:00 +01:00
okriuchykhin	c4ff12be51	Merge pull request #349 from okriuchykhin/ok_SCI_783 ... Fix columns ordering when deleting custom fields [SCI-783]	2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin	fa1cf1f04d	Better handling of columns deleting with fixing columns ordering [SCI-783]	2016-12-14 15:23:00 +01:00
zmagod	1ff98bb6df	adds tooltip to samples dropdown and column names	2016-12-14 13:36:10 +01:00
zmagod	9037ab3f48	fixed navigation link	2016-12-14 10:35:48 +01:00
Mojca Lorber	2cfcba0ceb	add protocol preview modal	2016-12-13 10:39:18 +01:00
zmagod	4b0e2baa3f	fixes breadcrumbs in secondary nav	2016-12-12 16:03:14 +01:00
zmagod	8dd8a7e7cd	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777	2016-12-12 15:52:25 +01:00
zmagod	5176f8b459	clean unneeded code [fixes SCI-778] refactor js	2016-12-12 15:40:13 +01:00
zmagod	d9025a9601	changes create/edit mode buttons [fixes SCI-777]	2016-12-12 14:42:06 +01:00
zmagod	8bb452e4f7	trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]	2016-12-12 10:30:03 +01:00
zmagod	de3099e4d1	removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository	2016-12-09 13:59:49 +01:00
Luka Murn	1a8b141b95	Add delete custom field functionality	2016-12-09 13:49:19 +01:00
Luka Murn	da630ac2cb	Make edit, delete buttons clickable & hide them if neccesary	2016-12-09 13:18:59 +01:00
Mojca Lorber	0e3526c9ad	Merge branch 'mlorb-ml-sci-696' into improved-sample-table ... Conflicts: app/assets/javascripts/samples/sample_datatable.js	2016-12-08 15:44:50 +01:00
zmagod	40fdfef67f	setup delayed_paperclip gem	2016-12-08 15:24:14 +01:00
zmagod	ac52e643be	cleanup direct upload	2016-12-08 11:26:13 +01:00
okriuchykhin	cb2abfa7a9	Merge pull request #325 from okriuchykhin/ok_SCI_712 ... Added form for adding new columns to samples table into dropdown [SCI-712]	2016-12-06 15:00:01 +01:00
zmagod	dd85b128d2	fixed glyphicon-ok position	2016-12-06 14:47:16 +01:00
Oleksii Kriuchykhin	da7e86c7c2	Fix save/delete buttons after updating datatable and added permissions check [SCI-712]	2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin	f6dd64772a	Add columns to samples table without page reload [SCI-712]	2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin	40db8310fd	Move code to sample_datatable.js and removed unused modal [SCI-712]	2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin	22dabd2177	Added form for adding new columns to samples table into dropdown [SCI-712]	2016-12-06 13:17:05 +01:00
Oleksii Kriuchykhin	94866e8994	Initial code commit for samples columns dropdown [SCI-712]	2016-12-06 13:16:05 +01:00
zmagod	787b8b1600	fixed new sample type/group form	2016-12-06 12:01:02 +01:00
Mojca Lorber	849f78b4df	implement reordering of columns in the samples table and change from local to database storage	2016-12-05 11:34:36 +01:00
Zmago Devetak	a376118cd8	Merge pull request #334 from ZmagoD/zd_SCI_746 ... fixes bug with deleted team name	2016-12-05 10:47:39 +01:00
Zmago Devetak	91f29745c4	Merge pull request #314 from ZmagoD/zd_SCI_643 ... adds autolink	2016-12-05 10:47:23 +01:00
zmagod	6274cd413e	fixes bug with deleted team name [fixes SCI-746]	2016-12-02 16:07:00 +01:00
zmagod	7725374c42	refactor sample types/groups [fixes SCI-700]	2016-12-02 09:58:35 +01:00
zmagod	83aae59eed	adds sample groups index page	2016-12-02 09:33:09 +01:00
Luka Murn	6a770f6a7e	Fix inviting users not working ... Closes SCI-750, SCI-751. Probably reopens parts of SCI-746.	2016-12-01 15:46:37 +01:00
Luka Murn	c0a03d9f2d	Merge pull request #322 from Ducz0r/lm-add-show-version-var ... Add an environmental variable to toggle version display in navbar	2016-11-30 09:49:40 +01:00
Luka Murn	84d0cf4620	Use rails helpers as per @ZmagoD's request	2016-11-30 09:48:57 +01:00
Luka Murn	76ec77fce4	Merge pull request #329 from biosistemika/simplify-signup ... Merge simplify-signup into master	2016-11-30 09:41:20 +01:00
Luka Murn	d685ac939b	Merge pull request #326 from Ducz0r/lm-sci-746-fix ... Fix some recaptcha form submit errors for signup pages	2016-11-30 09:35:16 +01:00
zmagod	a2e13441e5	removes create_sample_type modal and related js actions	2016-11-30 09:02:34 +01:00
zmagod	4e4a48620c	adds validation to input fields	2016-11-29 18:08:29 +01:00
zmagod	12848f15fa	adds sample_type index view with all crud actions	2016-11-29 17:15:54 +01:00
Luka Murn	e099a279b1	Remove link to "Resend confirmation instructions" if not neccesary ... Closes SCI-747.	2016-11-29 16:12:35 +01:00
Luka Murn	b5d0a39827	Fix some recaptcha form submit errors for signup pages ... Closes SCI-746.	2016-11-29 15:53:58 +01:00
zmagod	5c0b2d7b24	init sample_types page	2016-11-29 08:57:12 +01:00
Zmago Devetak	1e870a6e7c	Merge pull request #320 from ZmagoD/zd_SCI_698 ... adds new samples columns dropdown [fixes SCI-698]	2016-11-28 16:30:16 +01:00
Luka Murn	9f998d6fed	Add an environmental variable to toggle version display in navbar ... The variable is called NAVBAR_SHOW_VERSION. If not specified, it defaults to the current behavior (version is hidden on production, but visible on development & test environments).	2016-11-28 10:52:17 +01:00
Luka Murn	d142fa96d9	Merge pull request #317 from Ducz0r/lm-sci-735-fix ... Add Deface hooks to sign up & confirm invitation forms	2016-11-28 10:22:46 +01:00
zmagod	9d91d2ce28	adds new samples columns dropdown [fixes SCI-698]	2016-11-25 17:29:30 +01:00
Luka Murn	a16bbe8fd2	Typo fix	2016-11-25 11:52:33 +01:00
Luka Murn	cb16ab3c75	Add Deface hooks to signup & confirm invitation forms	2016-11-25 11:50:20 +01:00
Oleksii Kriuchykhin	3fdb20b92c	Add full name field to accept invitation form [SCI-738]	2016-11-25 11:15:10 +01:00
Luka Murn	b1b095910c	Merge pull request #309 from Ducz0r/lm-remove-unused-files ... Brace for impact...	2016-11-25 10:00:29 +01:00
Oleksii Kriuchykhin	592ed802b2	Switched to use of recaptcha_input_tag helper method [SCI-706]	2016-11-24 14:19:44 +01:00
Oleksii Kriuchykhin	698e07a3b5	Enable reCaptcha and auto log in on confirm invitation form [SCI-706]	2016-11-24 14:11:02 +01:00
Mojca Lorber	beae54e278	remove already_authenticated alert flash	2016-11-23 14:55:41 +01:00
zmagod	32eea3dbdd	adds autolink to result comments	2016-11-23 14:24:51 +01:00
zmagod	fafecce264	adds autolink to comments, tast desc., step desc., experiment desc., samples table 'only custom fields', checklists [fixes SCI-643]	2016-11-23 14:18:50 +01:00
Mojca Lorber	48ac289b6e	put recaptcha in helper method	2016-11-22 17:57:42 +01:00
Mojca Lorber	60f23b109b	integrate reCaptcha into sciNote	2016-11-22 14:57:41 +01:00
mz3944	c5bc3a4dc6	Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2 ... Added additional tutorial step for showing protocol link. Tutorial st…	2016-11-21 16:06:45 +01:00
Luka Murn	59eb1c1d18	Remove unused new, edit user_projects views	2016-11-19 17:01:10 +01:00
Luka Murn	911b7ba72f	Remove unused new user_my_module view	2016-11-19 16:59:24 +01:00
Luka Murn	008b31df0c	Finish removing new comment forms	2016-11-19 16:54:55 +01:00
Luka Murn	595b213b1a	Changes up to samples in views folder	2016-11-19 16:51:40 +01:00
Mojca Lorber	086f937fbb	fix empty space and blockquote padding - rich text editing	2016-11-18 12:43:57 +01:00
Matej Zrimšek	f13cc5be0e	Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way).	2016-11-17 18:03:49 +01:00
Luka Murn	26d04b1f3c	Merge branch 'rich-text-formatting' into 'master' ... Conflicts: Gemfile.lock app/assets/stylesheets/themes/scinote.scss	2016-11-17 16:39:33 +01:00
Luka Murn	9d3685f872	Merge branch 'gamification' into 'master' ... Conflicts: app/controllers/users/invitations_controller.rb app/controllers/users/settings_controller.rb	2016-11-17 16:30:18 +01:00
Matej Zrimšek	c8eb82cc85	Fixed tutorial step numbers and changed getting next page reference on protocols page.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	c64146904a	Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count.	2016-11-17 14:46:04 +01:00
Luka Murn	d1701bd7ae	Merge pull request #276 from Ducz0r/lm-sci-637 ... Automatically resize textarea elements [SCI-637]	2016-11-17 09:58:36 +01:00
zmagod	da54d779ec	Merge branch 'rich-text-formatting' of https://github.com/biosistemika/scinote-web into zd_SCI_687	2016-11-17 08:48:40 +01:00
Luka Murn	a3bbf94643	Add a smart_text_area tag & implement it throughout application ... This fixes the mentioned issues @mlorb mentioned. Closes SCI-637.	2016-11-16 17:57:01 +01:00
Luka Murn	aadcdde417	Merge pull request #294 from Ducz0r/lm-sci-674-fix ... Import protocol steps' rich text styling when importing protocols [SCI-674]	2016-11-16 16:59:18 +01:00
Oleksii Kriuchykhin	d2e29935cf	Improved tutorial styling [SCI-685]	2016-11-16 15:44:06 +01:00
zmagod	b781db9667	fixed bullets	2016-11-16 15:30:14 +01:00
Zmago Devetak	d3234bc52f	Merge pull request #284 from biosistemika/zd_SCI_662 ... fixes description label [fixes SCI-662]	2016-11-16 14:16:57 +01:00
zmagod	7953372d83	add description label	2016-11-16 13:59:35 +01:00
Luka Murn	83160a487b	Fix importer so it supports rendering & importing rich text format ... Closes SCI-674.	2016-11-15 16:57:53 +01:00
Luka Murn	04749c3b2c	Allow inviting of existing, unconfirmed users ... Closes SCI-676.	2016-11-15 15:04:31 +01:00
Mojca Lorber	c089832909	add validation for result text field	2016-11-15 12:55:32 +01:00
okriuchykhin	01b01939f3	Merge pull request #277 from okriuchykhin/ok_SCI_571 ... Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-15 12:05:20 +01:00
Mojca Lorber	607f1381d0	fix mobile view	2016-11-15 10:58:15 +01:00
Mojca Lorber	6afc5c5a4b	fix position of buttons in text result	2016-11-14 16:31:48 +01:00
zmagod	67c508a891	fixes description label [fixes SCI-662]	2016-11-14 13:47:20 +01:00
Oleksii Kriuchykhin	2fb3041784	Fixes edit avatar link area [SCI-649]	2016-11-11 13:17:44 +01:00
mlorb	b0b2484fdf	Merge pull request #279 from mlorb/ml_sci_638_vol2 ... Fix validation problems for rich text fields [SCI-638]	2016-11-11 12:37:02 +01:00
mlorb	1ca452db7b	Merge pull request #273 from mlorb/ml_sci_640 ... Add rich text formatting on results and remove markdown [SCI-640]	2016-11-11 12:06:13 +01:00
mlorb	d42adff77e	Merge pull request #275 from mlorb/ml_sci_642 ... Add formatted text in reports [SCI-642]	2016-11-11 12:04:19 +01:00
Oleksii Kriuchykhin	b9f982ead7	Additional steps added to tutorial and numbering of the steps fixed [SCI-571]	2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin	d2491a18a4	Tutorial Save Protocol step added [SCI-571]	2016-11-11 10:06:18 +01:00
Luka Murn	b42922d32c	Add autosize functionality to all textareas ... Closes SCI-637	2016-11-11 09:09:41 +01:00
Luka Murn	acd8ce8932	Merge pull request #270 from Ducz0r/lm-sci-644 ... Convert all large text input fields into text areas (10000 characters)	2016-11-11 09:07:25 +01:00
Mojca Lorber	1facd2cefe	fix validation problems	2016-11-10 17:20:17 +01:00
Mojca Lorber	fbaffbcaab	add formatted text in reports	2016-11-10 15:20:40 +01:00
Mojca Lorber	3e162b3a93	remove redcarpet gem - markdown	2016-11-10 14:11:32 +01:00
Mojca Lorber	456c6d1ad6	Copy rich text functionality to text results	2016-11-10 12:19:59 +01:00
Mojca Lorber	ab0879e8d6	Integrate library with default settings	2016-11-09 13:09:53 +01:00
Luka Murn	c88f834ba9	Merge pull request #269 from Ducz0r/lm-sci-569 ... Add a refactored invite users modal that can be reused throughout application	2016-11-08 16:57:05 +01:00
Luka Murn	b246853117	Code styling (use link_to, %w)	2016-11-08 16:43:25 +01:00
Zmago Devetak	82a12f0fce	Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants ... Enables notifications to be extended	2016-11-08 13:08:15 +01:00
Luka Murn	d44a757b25	Add textareas to checklist name & items ... Closes SCI-644	2016-11-08 11:50:29 +01:00
Luka Murn	55d8fea359	Make all comment edit fields textareas	2016-11-08 11:29:55 +01:00
Luka Murn	9438ba7e10	Fix a bug	2016-11-08 09:00:00 +01:00
Luka Murn	9260ed31f3	Add Deface hooks to main navbar	2016-11-07 16:57:18 +01:00
Luka Murn	0ab62576a2	Add new modal to organization page, remove old modal code	2016-11-07 09:43:10 +01:00
Luka Murn	a188984ede	Allow strings of modal to be replaced	2016-11-07 09:43:10 +01:00
Luka Murn	6fe0d6b3df	A working invite modal!	2016-11-07 09:43:10 +01:00
Luka Murn	ccf8932611	Add first version of invite users modal	2016-11-07 09:43:09 +01:00
Matej Zrimšek	0fe5822825	Added profile statistics data hook.	2016-11-03 17:50:32 +01:00
Mojca Lorber	a234c4c9d9	fix merge conflict problem with avatar on profile page	2016-11-03 15:23:09 +01:00
zmagod	1d6b93829c	added hooks in notifications preview	2016-11-03 14:48:01 +01:00
Mojca Lorber	44b51d087a	merging	2016-11-02 14:06:20 +01:00
Zmago Devetak	6e022699eb	Merge pull request #256 from ZmagoD/add_getting_started_flash_hook ... Added getting started hoot to layout/application.html	2016-10-28 16:19:20 +02:00
zmagod	01b27e9e6d	added getting started hoot to layout/application.html	2016-10-28 10:36:15 +02:00
Mojca Lorber	91ec201fd0	make image clickable	2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin	d28edfb488	Added statistics block in users profile [SCI-566]	2016-10-27 13:44:27 +02:00
Mojca Lorber	8309df0aaf	fix hound	2016-10-26 13:51:05 +02:00
Mojca Lorber	878952f072	change edit avatar in profile	2016-10-26 13:41:17 +02:00
zmagod	24b81c96f6	sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608]	2016-10-24 21:20:41 +02:00
Luka Murn	b13fd22408	Add back the release notes URL to navbar ... Closes SCI-604	2016-10-24 16:59:32 +02:00
Zmago Devetak	12c77df883	Merge pull request #237 from ZmagoD/zd_SCI_593_v2 ... Styled global team switch and search [fixes SCI-593]	2016-10-21 16:28:50 +02:00
Luka Murn	388e092bbf	Merge pull request #238 from Ducz0r/lm-sci-596-fix ... SCI-596 fix	2016-10-21 11:59:01 +02:00
zmagod	49d3879642	fixes padding on mobile, added separator on team switch dropdown, focus search input	2016-10-21 11:46:59 +02:00
Zmago Devetak	4f5b7ad8ad	Merge pull request #228 from ZmagoD/zd_SCI_585 ... Removes archived projects from index page [fixes SCI-585]	2016-10-21 11:33:01 +02:00
Luka Murn	7b825a217f	Closes SCI-596	2016-10-21 11:08:47 +02:00
zmagod	c642e208dd	styled global team switch and search [fixes SCI-593]	2016-10-21 09:33:18 +02:00
zmagod	db806f3c10	hide private projects	2016-10-21 09:06:19 +02:00
Zmago Devetak	f615b3da41	Merge pull request #230 from ZmagoD/zd_SCI_586 ... Adds new team button to team switch dropdown [fixes SCI-586]	2016-10-21 08:29:05 +02:00
zmagod	f21c9e394f	adds new team button to team switch dropdown [fixes SCI-586]	2016-10-20 13:47:41 +02:00
zmagod	4c086a6fc1	removes archived projects from index page [fixes SCI-585]	2016-10-20 13:13:44 +02:00
zmagod	8aaf58f75f	removes org selector form project archive [fixes SCI-587]	2016-10-20 12:50:55 +02:00
Luka Murn	640a575a3a	Merge pull request #222 from biosistemika/modular-tasks ... Merge global team switch into master	2016-10-18 11:39:09 +02:00
zmagod	54a3237994	displays org name on the project index page if no project	2016-10-17 15:21:19 +02:00
zmagod	8a6899aeea	restyled team switch dropdown	2016-10-17 15:21:19 +02:00
zmagod	a116feac9c	fixed typos and added truncation to org name	2016-10-17 15:21:19 +02:00
zmagod	1614cbc2b2	fixes repeat tutorial button and localization typos	2016-10-17 15:16:22 +02:00
zmagod	fa36488397	fixed new project form	2016-10-17 15:10:26 +02:00
zmagod	8f24d0d80c	fixed new user registration	2016-10-17 15:10:26 +02:00
zmagod	bb9c03df24	fixes controllers	2016-10-17 15:10:26 +02:00
zmagod	d7f514db09	fixes search	2016-10-17 15:10:26 +02:00
zmagod	efe031d766	setup current_organization in all controllers	2016-10-17 15:10:26 +02:00
zmagod	d86a4dd311	setup global team switch view and controller action	2016-10-17 15:10:26 +02:00
Oleksii Kriuchykhin	0ec7c019b3	Fix issue with pop-up windows and turbolinks [SCI-463]	2016-10-17 14:25:54 +02:00
Matej Zrimšek	a6a2a237aa	Removed unneeded ERB tags, which caused error. Minor refactoring.	2016-10-17 11:57:47 +02:00
Matej Zrimšek	ece89da391	Removed ruby constants duplicates in JS, because of caching problems.	2016-10-17 11:57:47 +02:00
Matej Zrimšek	778ed8814b	Removed some unneeded code.	2016-10-17 11:57:46 +02:00
Matej Zrimšek	0780bd2416	Ruby constants are now automatically available in JS. Refactoring was needed.	2016-10-17 11:57:37 +02:00
Matej Zrimšek	a3dfb59558	Added remaining constants.	2016-10-17 11:30:05 +02:00
Matej Zrimšek	21ec05d541	Refactored searches (user and globals earch) and used constants.	2016-10-17 11:17:59 +02:00
Luka Murn	02d3e03f75	Bugfix for notification emails ... The URLs in notification emails didn't get server URL prepended, so users could not click on them.	2016-10-13 12:12:28 +02:00
mlorb	78f7879c04	Merge pull request #216 from mlorb/ml_sci_555 ... Adding update notifications in settings [SCI-555]	2016-10-13 08:53:55 +02:00
Mojca Lorber	8f783f87f7	fixes hound	2016-10-12 15:32:40 +02:00
Mojca Lorber	42f6b679f8	Adding system notifications email function in settings	2016-10-12 11:50:26 +02:00
Mojca Lorber	6bea0a9e1a	fixes merge conflicts	2016-10-12 10:55:40 +02:00
Luka Murn	cccabcdd7b	Remove invitation_to_organization email ... This email is no longer needed, because if user enables assignment notifications, he/she will already receive an email whenever he/she is added to a new organization/team (via notifications email).	2016-10-12 10:54:36 +02:00
Mojca Lorber	4f1cbad7da	adding update notifications in settings	2016-10-12 10:42:07 +02:00
Zmago Devetak	f25767fdc3	Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup ... Removed introductory popup [fixes SCI-534]	2016-10-12 08:13:46 +02:00
Zmago Devetak	b225dc1e29	Merge pull request #210 from ZmagoD/zd_SCI_548_protocol_steps_not_visible ... Fixes protocol steps [fixes SCI-548]	2016-10-12 08:13:28 +02:00
Oleksii Kriuchykhin	4c6a60c249	Added html_safe to notification email template	2016-10-11 16:46:20 +02:00
Oleksii Kriuchykhin	90c853743c	Additional fixes to email markup and logic [SCI-443]	2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin	5399033fce	Added user settings for email notifications [SCI-443]	2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin	8dc956010c	Initial code commit [SCI-443]	2016-10-11 16:43:17 +02:00
zmagod	ea305b356a	fixes protocol steps [fixes SCI-548]	2016-10-11 09:10:12 +02:00
zmagod	42a30576e3	removed introductory popup [fixes SCI-534]	2016-10-11 08:33:50 +02:00
Luka Murn	448daab7c8	Merge pull request #207 from biosistemika/add-deface-hotfix ... Merge hotfix 1.3.1 into master	2016-10-07 18:26:13 +02:00
zmagod	32f03ec94c	Add Deface hooks	2016-10-06 16:47:36 +02:00
zmagod	de00a19dd9	fixes styling in settings preferences [SCI-553]	2016-10-06 13:22:44 +02:00
zmagod	5b3889c172	notification index images [fixes SCI-554]	2016-10-06 12:09:01 +02:00
Luka Murn	5c80c8a817	Add "no notifications" to dropdown & notifications index page	2016-10-05 16:58:21 +02:00
Luka Murn	877574e853	Add link to settings from both notification lists	2016-10-05 16:26:26 +02:00
Oleksii Kriuchykhin	083a09c2f7	Add link to notifications index page	2016-10-05 16:13:05 +02:00
okriuchykhin	50f28fe883	Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442 ... Global notifications screen [SCI-442]	2016-10-05 16:01:41 +02:00
Oleksii Kriuchykhin	4e2ad1d5e6	Fix the issues after code review [SCI-442]	2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin	246dae4f46	Code style improvements according to hound [SCI-442]	2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin	8907e54b49	Global notifications index page added [SCI-442]	2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin	8b5b0723d1	Initial code commit	2016-10-05 15:51:11 +02:00
Zmago Devetak	f3708bcac0	Merge pull request #191 from ZmagoD/zd_SCI_469_ver2 ... Comments date duplication	2016-10-05 15:47:42 +02:00
Zmago Devetak	eea310514a	Merge pull request #194 from ZmagoD/zd_SCI_531_533 ... Notification style fixes	2016-10-05 15:27:36 +02:00
Zmago Devetak	71ad5bf034	Merge pull request #190 from ZmagoD/zd_SCI_529 ... Prepare settings screen for notifications	2016-10-05 14:54:47 +02:00
zmagod	9c7a690944	fixed type, fixed settings controller, fixes setting view on mobile devices	2016-10-05 14:33:22 +02:00
zmagod	5bf278298b	fixed navbar on sceens smaller than 1000px	2016-10-05 12:22:27 +02:00
zmagod	d7a4f85ba1	added links to notification project name and task	2016-10-05 09:40:44 +02:00
Jure Grabnar	62356c36a1	Add file extension to global search	2016-10-04 19:04:08 +02:00
zmagod	6229e6a3a1	styled notification settings button [fixes SCI-529]	2016-10-04 16:12:56 +02:00
zmagod	a68e7abc57	first run notification settings	2016-10-04 15:52:48 +02:00
Jure Grabnar	0c7cd52dba	Add WOPI icons/buttons to files	2016-10-04 12:34:43 +02:00
Luka Murn	61cb9651c7	Merge pull request #188 from biosistemika/global-notifications ... Global notifications	2016-10-04 08:30:50 +02:00
zmagod	c9bbab1004	added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users	2016-10-03 20:31:00 +02:00
mlorb	00b0f6ab07	Merge pull request #184 from mlorb/ml_sci_472 ... Protocol steps/results - change title for comment section, remove info tab [SCI-472]	2016-10-03 17:20:45 +02:00
Jure Grabnar	03567d6208	Prevent archive of locked result asset	2016-10-03 17:07:57 +02:00
mlorb	153b692c0c	Merge pull request #181 from mlorb/ml_sci_321 ... Displaying more information for individual samples in Sample table [SCI-321]	2016-10-03 16:37:35 +02:00
Mojca Lorber	3b0185a45b	change title of modal	2016-10-03 16:33:58 +02:00
zmagod	0d23f05698	Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440	2016-10-03 16:14:22 +02:00
zmagod	36fb2713b3	start fixing comments dates	2016-10-03 16:10:20 +02:00
Zmago Devetak	91c7d8a952	Merge pull request #176 from ZmagoD/zd_SCI_474 ... Unify the comments	2016-10-03 15:26:17 +02:00
zmagod	ea17182372	generate notifications [fixes SCI-440]	2016-10-03 11:37:29 +02:00
Mojca Lorber	5b32be2137	adding subtitle in modal	2016-10-03 09:28:58 +02:00
zmagod	2ee02ec472	mark all seen notifications	2016-10-03 08:20:23 +02:00
Jure Grabnar	1e14955ade	Prevent deleting asset on step update	2016-10-01 18:47:05 +02:00
Jure Grabnar	d9fa882d6a	Add check for locked files on step delete	2016-10-01 14:51:55 +02:00
Jure Grabnar	a2d6d9a29a	Add WOPI controlls to result	2016-10-01 11:23:32 +02:00
Luka Murn	49c5474219	Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2 ... Fixed wrong CSS formatting and added release notes link to help link.	2016-09-30 08:27:57 +02:00
Mojca Lorber	35477b1005	Remove Info tab and change comment title on results view	2016-09-29 16:43:19 +02:00
zmagod	60a503f115	added assignment image	2016-09-29 16:05:43 +02:00
zmagod	e1a1b93d44	fixed migrations	2016-09-29 14:49:58 +02:00
Mojca Lorber	c9fbf845f1	Remove Info tab and change comment title	2016-09-29 14:37:29 +02:00
Matej Zrimšek	a6324d61c5	Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab.	2016-09-29 14:27:26 +02:00
Mojca Lorber	5d905f0094	refactoring	2016-09-29 14:18:04 +02:00
Luka Murn	f1b74f1906	Fix image names in introductory popup ... This will make sure browsers don't display old, cached images to clients.	2016-09-29 13:44:38 +02:00
Jure Grabnar	ed8df3cc62	Add favicon url to iframe	2016-09-29 12:19:29 +02:00
zmagod	cab1e9b521	start implement toolbar view	2016-09-28 16:03:52 +02:00
Mojca Lorber	efa7a1d7b5	add sample information in pop-up	2016-09-28 15:46:41 +02:00
zmagod	2a86aaf7e4	changed popout content [fixes SCI-520]	2016-09-28 15:12:30 +02:00
Jure Grabnar	e96e8486ea	Add check file permissions to assets controller ... SCI-502 #close	2016-09-28 09:33:44 +02:00
Jure Grabnar	5aea0fbb19	Refactor the rest of WOPI logic from Nejc	2016-09-28 09:33:44 +02:00
Jure Grabnar	0e9756ad94	Fix bad step view rebase	2016-09-28 09:33:44 +02:00
Nejc Bernot	1b260785ec	First working version of office integration ... Only works on scinote-preview	2016-09-28 09:33:44 +02:00
zmagod	2235778110	fixed project and task comments + fixed date issue	2016-09-27 16:19:31 +02:00
zmagod	1eb9f772f4	refactor sciNote comments js and unified all comments behavior [fixes SCI-474]	2016-09-27 10:30:48 +02:00
zmagod	980ff63104	fixed task comments	2016-09-27 09:18:46 +02:00
zmagod	02bfa1949e	fixed project comments	2016-09-27 09:00:02 +02:00
Mojca Lorber	cc5cdf2577	Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321	2016-09-26 09:39:05 +02:00
Mojca Lorber	c2b742374f	adding popup sample info	2016-09-23 17:45:02 +02:00
mz3944	1c1a7c231e	Merge pull request #169 from mz3944/mz_help_button_SCI_13 ... Added help dropdown. [SCI-13]	2016-09-23 13:04:38 +02:00
okriuchykhin	4f0fb7074b	Merge pull request #167 from okriuchykhin/ok_SCI-470 ... Fix issue with long tags in dropdown list [fixes SCI-470]	2016-09-23 13:00:06 +02:00
Matej Zrimšek	fc86b7b1fd	Added help dropdown. [SCI-13]	2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin	e8ac754829	Fix issue with long tags in dropdown list [fixes SCI-470]	2016-09-23 11:05:17 +02:00
okriuchykhin	b5c861583d	Merge pull request #157 from okriuchykhin/ok_SCI_430 ... Fixes issue with unneeded sort icon [fixes SCI-430]	2016-09-22 16:39:26 +02:00
okriuchykhin	37eedf17a0	Merge pull request #155 from okriuchykhin/ok_SCI-451 ... Fixes issue with zoom buttons on canvas [fixes SCI-451]	2016-09-22 16:11:45 +02:00
Matej Zrimšek	234918a76d	Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.	2016-09-21 19:48:18 +02:00
zmagod	06b1992e94	Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436	2016-09-21 19:20:55 +02:00
zmagod	9f56df02d2	removes comment tab and add comment in the info tab [fixes SCI-436]	2016-09-20 18:53:51 +02:00
zmagod	42bbc47f5f	first working version	2016-09-20 17:06:07 +02:00
zmagod	da86208441	styled step comments	2016-09-20 14:13:40 +02:00
Oleksii Kriuchykhin	411ee4ee77	Fixes issue with unneeded sort icon [fixes SCI-430]	2016-09-20 11:30:11 +02:00
zmagod	cd64e035c0	set form validations	2016-09-20 09:50:03 +02:00
zmagod	f48553e807	fixed ajax call	2016-09-19 16:12:07 +02:00
Oleksii Kriuchykhin	a3b00d0ff8	Fixes issue with zoom buttons on canvas [fixes SCI-451]	2016-09-16 16:27:54 +02:00
Matej Zrimšek	20ca37f185	Readded client-side result's comment validation.	2016-09-16 15:57:54 +02:00
zmagod	938aa32190	js tweaks	2016-09-16 15:22:24 +02:00
Zmago Devetak	431227c0a4	Merge pull request #147 from maslick/resultCommentsError1000Chars ... Fixed: Comments in results have no error message if the text exceeds 1000 characters	2016-09-16 09:38:38 +02:00
zmagod	b9b466cd8e	Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas	2016-09-16 09:28:19 +02:00
zmagod	e90f0bd3d5	refactor step view	2016-09-16 09:04:21 +02:00
mlorb	587369e7a6	Merge pull request #152 from mlorb/ml_sci_428 ... fixes responsiveness on mobile phone for sample view [SCI-428]	2016-09-15 12:11:48 +02:00
zmagod	0a2ab57e28	styled new comments layout	2016-09-15 11:45:51 +02:00
zmagod	e3ae22763e	removed comments tab in protocol step	2016-09-15 08:46:14 +02:00
mlorb	098e17c0d8	Merge pull request #149 from mlorb/ml_sci_420 ... fixes links and missing experiment level in search results [SCI-420]	2016-09-14 15:42:16 +02:00
Zmago Devetak	d0a180a1e8	Merge pull request #148 from ZmagoD/zd_SCI_342 ... fixes sidebar expanded elements when adding new experiments	2016-09-14 13:48:34 +02:00
Mojca Lorber	a9029e0928	fixes responsiveness on mobile phone for sample view	2016-09-14 11:08:40 +02:00
Mojca Lorber	36378d03e2	fixes links and missing experiment level in search results	2016-09-13 17:13:58 +02:00
Zmago Devetak	b26bf7b183	Merge pull request #136 from ZmagoD/zd_SCI_370 ... Enabled to delete results in task archive [fixes SCI-370]	2016-09-13 15:22:08 +02:00
zmagod	691ae94d2c	enabled to delete results in task archive [fixes SCI-370]	2016-09-13 13:26:04 +02:00
zmagod	65383f1824	fixes sidebar expanded elements when adding new experiments [fixes SCI-342]	2016-09-13 13:09:57 +02:00
Pavel Maslov	15ea8fc0dc	Bug fixed: comments in results have no error message if the text exceeds 1000 characters.	2016-09-13 12:01:56 +02:00
Zmago Devetak	d37c7b853b	Merge pull request #140 from ZmagoD/zd_SCI_341 ... adds label to current project in clone experiment modal [fixes SCI-341]	2016-09-13 11:59:01 +02:00
Jure Grabnar	6519e8dbb1	Add e-notation preprocessing to formulas ... SCI-350 #close	2016-09-13 09:46:22 +02:00
Jure Grabnar	fa3515d2eb	Add formulas to reports	2016-09-13 09:46:21 +02:00
Jure Grabnar	3b364be70b	Add formulas to steps tables	2016-09-13 09:44:17 +02:00
Jure Grabnar	e096f936f9	Add formulas to results	2016-09-13 09:44:17 +02:00
Zmago Devetak	1368716aa0	Merge pull request #130 from ZmagoD/zd_SCI_348 ... project overview - updating (or creating new) experiment details	2016-09-08 12:49:35 +02:00
mlorb	f4029a04fd	Merge pull request #142 from mlorb/ml_sci_415 ... fixes navbar size when resizing window [SCI-415]	2016-09-08 12:46:36 +02:00
Mojca Lorber	302a777615	fixes button collision	2016-09-08 12:37:06 +02:00
Luka Murn	0c1759c15a	Merge pull request #135 from Ducz0r/lm-sci-397 ... Resize archived experiment panels	2016-09-07 11:14:53 +02:00
zmagod	d482dff2e6	adds label to current project in clone experiment modal [fixes SCI-341]	2016-09-07 08:26:36 +02:00
Matej Zrimšek	b0ad6d0753	Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407].	2016-09-06 23:26:00 +02:00
zmagod	b44a284b54	sets edit experiment validation	2016-09-06 11:46:28 +02:00
zmagod	9d469f9092	sets front end validation for new experiment modal [fixes SCI-348]	2016-09-06 11:44:03 +02:00
zmagod	de6c03a73b	setup experiment modal input validation	2016-09-06 11:44:03 +02:00
Zmago Devetak	9440371f3f	Merge pull request #131 from ZmagoD/zd_SCI_400 ... Sets front end validation for experiment move action [fixes SCI-400]	2016-09-06 11:39:38 +02:00
Luka Murn	bda5120548	Resize archived experiment panels ... Closes SCI-397.	2016-09-06 10:55:05 +02:00
Mojca Lorber	47983812e7	minimize buttons on mobile phone	2016-09-06 10:10:49 +02:00
Luka Murn	81883911c4	Merge pull request #132 from Ducz0r/lm-sci-228 ... Updates to invite users to team modal window	2016-09-05 15:53:15 +02:00
mlorb	aea288371f	Merge pull request #129 from mlorb/ml_sci_310 ... adds tasks, experiment and project category in protocol search results [SCI-310]	2016-09-05 15:31:35 +02:00
Mojca Lorber	6a802e9fa7	fixes redirection to project page for all categories in search results	2016-09-05 11:40:49 +02:00
Mojca Lorber	740392c687	optimization	2016-09-05 10:58:37 +02:00
zmagod	667fb67052	sets front end validation for experiment move action [fixes SCI-400]	2016-09-02 16:31:17 +02:00
Zmago Devetak	ea26a532e4	Merge pull request #126 from ZmagoD/zd_SCI_332 ... By default all experiments should be collapsed	2016-09-02 15:58:03 +02:00
Mojca Lorber	83034f705d	adds tasks, experiment and project category in protocol search results	2016-09-02 11:45:54 +02:00
Luka Murn	61f4fbd1d4	Remove warning info when removing pending user from organization	2016-09-01 13:23:53 +02:00
zmagod	ac7ac95da8	[fixes SCI-332]	2016-09-01 10:38:20 +02:00
zmagod	e8f971829a	added project to session storage	2016-08-31 15:13:17 +02:00
zmagod	eb394ce209	fixes searching tables bug [fixes SCI-402]	2016-08-31 11:01:10 +02:00
zmagod	b05c3df4d3	adds toggle id only to elements with modules	2016-08-31 10:25:40 +02:00
zmagod	eb39eedfdf	[fixes SCI-398] again	2016-08-31 08:46:51 +02:00
Zmago Devetak	375a72db18	Merge pull request #114 from ZmagoD/zd_SCI_294_vol2 ... fixes reports file name [fixes SCI-294]	2016-08-30 14:59:07 +02:00
Mojca Lorber	43c3a0bb81	fixes merge again	2016-08-30 12:54:08 +02:00
Mojca Lorber	81f9e59dcd	fixes merge	2016-08-30 12:14:15 +02:00
Mojca Lorber	e8d187b5f6	Merge branch 'ml_sci_395' ... Conflicts: app/views/canvas/edit/modal/_move_module.html.erb app/views/canvas/edit/modal/_move_module_group.html.erb	2016-08-30 11:41:25 +02:00
zmagod	f356acb882	fixes reports file name [fixes SCI-294]	2016-08-30 11:36:39 +02:00
Zmago Devetak	6878adda46	Merge pull request #112 from ZmagoD/zd_SCI_338_vol2 ... Tutorial	2016-08-30 11:07:51 +02:00
jbargu	fa357dd54f	Merge pull request #110 from jbargu/jg_SCI_328_move_task_no_experiment ... Remove move on empty experiments	2016-08-30 11:06:16 +02:00
Mojca Lorber	596d403d5f	change position of buttons	2016-08-30 09:16:53 +02:00
zmagod	5518d1cd1e	fixed 16 step of tutorial	2016-08-30 08:52:44 +02:00
Jure Grabnar	0c184dcdcf	Remove Move button on empty experiments ... SCI-328 #close.	2016-08-30 08:26:59 +02:00
zmagod	2ac20d1af1	adds new image + new panel title [fixes SCI-336]	2016-08-29 09:28:29 +02:00
Luka Murn	a0311970f8	Add missing commits for showing image and not able to preview	2016-08-26 16:49:32 +02:00
zmagod	d886d05ccb	Merge branch 'zd_SCI_338'	2016-08-26 16:32:49 +02:00
Matej Zrimšek	e3a7f45fdf	Merge branch 'master' into mz_file_upload_and_client_side_upgrade ... Conflicts: app/assets/javascripts/application.js app/views/results/_result_asset.html.erb app/views/steps/_step.html.erb	2016-08-26 11:13:40 +02:00
Zmago Devetak	0cfc758f43	Merge pull request #102 from ZmagoD/zd_SCI_336 ... implement first time popup logic	2016-08-26 09:19:36 +02:00
zmagod	2031c42920	fixed confirmation text	2016-08-26 09:13:45 +02:00
zmagod	1738ca66d2	one-time introductory popup [fixes SCI-336]	2016-08-25 18:44:21 +02:00
Luka Murn	8018cff02e	Merge pull request #103 from Ducz0r/bb_edit_delete_comments ... Edit&delete comments	2016-08-25 17:18:48 +02:00
Zmago Devetak	1b21e55fea	Merge pull request #100 from ZmagoD/zd_SCI_381 ... Adds experiment and team to tag search resuls [fixes SCI-381]	2016-08-25 15:43:50 +02:00
zmagod	8ff645fb89	disabled experiment dropdown actions	2016-08-25 15:16:51 +02:00
Zmago Devetak	b090fd8d5b	Merge pull request #95 from ZmagoD/zd_SCI_374 ... adds edit workflow link if no workflow [fixes SCI-374]	2016-08-25 14:07:33 +02:00
Luka Murn	6d86a02d7c	Add individual permission checks in dropdowns ... Closes SCI-258.	2016-08-25 13:51:50 +02:00
Luka Murn	24dd25d9f5	Add edit/delete result comment functionality ... Lessons learned during this fix: Don't use dependant: :destroy on both ends of association between 2 ActiveRecords, or you will run into stack overflow.	2016-08-25 13:51:31 +02:00
Luka Murn	bac0455435	Add edit&delete functionality to step comments ... This commit also: * fixes a bug in permission_helper.rb, * fixes comments.js a bit, * adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.	2016-08-25 13:51:31 +02:00
Luka Murn	c92d016f65	Add edit&delete module/task comments functionality ... This required a minor fix of comments.js.	2016-08-25 13:51:31 +02:00
Luka Murn	f0d9cb96fa	Add edit project comments functionality	2016-08-25 13:51:30 +02:00
Luka Murn	15c0baeee8	Add delete project comment functionality ... This commit also removes the old code from @bberic.	2016-08-25 13:51:30 +02:00
Luka Murn	5569a1e6d2	Revert 2 files that contained no changes	2016-08-25 13:51:30 +02:00
scibb	a76d82d188	delete and edit comments for projects, protocols, results, and workflow elements	2016-08-25 13:51:30 +02:00
zmagod	5fabe06b8d	implement first time popup logic	2016-08-25 11:44:49 +02:00
Mojca Lorber	4a5d720724	change position of overview and samples	2016-08-25 11:19:53 +02:00
zmagod	1120ef1407	adds experiment and team to tag search resuls [fixes SCI-381]	2016-08-25 10:40:03 +02:00
mlorb	c38a4e2614	Merge pull request #94 from mlorb/ml_sci_375 ... add move experiment instructions [SCI-375]	2016-08-25 09:45:16 +02:00
mlorb	0a066f436f	Merge pull request #96 from mlorb/ml_sci_369 ... buttons update on experiment overview [SCI-369]	2016-08-25 08:54:16 +02:00
zmagod	dbdbff12eb	add experiment level tutorial step [fixes SCI-338]	2016-08-24 19:03:58 +02:00
Mojca Lorber	2a897432e1	update buttons on canvas view	2016-08-24 17:00:27 +02:00
jbargu	5c104ac050	Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error ... Fix 404 move experiment error	2016-08-24 16:35:29 +02:00
Zmago Devetak	0de7ea31ea	Merge pull request #90 from ZmagoD/zd_SCI_376 ... fixes cloned experiment protocol [fixes SCI-376]	2016-08-24 14:12:19 +02:00
zmagod	9393a96302	adds edit workflow link if no workflow [fixes SCI-374]	2016-08-24 14:10:50 +02:00
Mojca Lorber	0558d49e26	buttons update on experiment overview	2016-08-24 13:50:25 +02:00
Jure Grabnar	00da7efb44	Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' ... Conflicts: app/models/experiment.rb SCI-328 #close	2016-08-24 13:11:10 +02:00
Zmago Devetak	afaeab492d	Merge pull request #87 from ZmagoD/zd_SCI_371 ... hide the dropdown if user has no permissions(technician) [fixes SCI-371]	2016-08-24 11:56:29 +02:00
jbargu	180efac87b	Merge pull request #92 from jbargu/jg_exp_overview_navbar_sci_353 ... Show whole tree structure for experiment in sidebar	2016-08-24 11:50:39 +02:00
Mojca Lorber	f554dc6018	add move experiment instructions	2016-08-24 11:36:50 +02:00
Jure Grabnar	3e5e9aed22	Fix 404 on move experiment ... [fixes SCI-378]	2016-08-24 11:09:03 +02:00
zmagod	27d77bc73f	added new permission for dropdown actions	2016-08-24 10:56:30 +02:00
Jure Grabnar	e60533af57	Add whole tree structure for experiment ... SCI-353 #close	2016-08-24 10:47:30 +02:00
Jure Grabnar	a41d851830	Fix secondary navigation for experiment level (overview)	2016-08-24 08:54:02 +02:00
Zmago Devetak	9dc7708b73	Merge pull request #85 from ZmagoD/zd_SCI_360 ... fixes project overview style and add no description link [fixes SCI-360]	2016-08-23 16:24:22 +02:00
Zmago Devetak	d67997fa8b	Merge pull request #83 from ZmagoD/zd_SCI_347 ... Fixes search result link for experiment [fixes SCI-347]	2016-08-23 16:23:41 +02:00
Zmago Devetak	aa650bbc65	Merge pull request #82 from ZmagoD/zd_SCI_359 ... Add plus button at the bottom of project overview page [fixes SCI-359]	2016-08-23 16:23:20 +02:00
Zmago Devetak	7e2db66f42	Merge pull request #79 from ZmagoD/zd_SCI_345 ... Adds font-awesome to pdf [fixes SCI-345]	2016-08-23 16:22:30 +02:00
zmagod	0429816154	deleted commented code	2016-08-23 16:21:11 +02:00
zmagod	2bbb439745	fixes cloned experiment protocol [fixes SCI-376]	2016-08-23 16:15:45 +02:00
Jure Grabnar	0d56cea3e4	Add placeholders for empty experiments	2016-08-23 10:37:48 +02:00
Jure Grabnar	358f2b1c47	Add moving for newly created modules	2016-08-23 10:00:34 +02:00
zmagod	f918746946	hide the dropdown if user has no permissions(technician) [fixes SCI-371]	2016-08-23 09:26:52 +02:00
zmagod	03a3759cf5	fixes project overview style and add no description link [fixes SCI-360]	2016-08-23 08:52:53 +02:00
zmagod	9a05935067	fixed search result link for experiment [fixes SCI-347]	2016-08-22 15:35:47 +02:00
zmagod	bb11999566	adds plus button at the bottom of project overview page [fixes SCI-359]	2016-08-22 15:22:05 +02:00
zmagod	eab05eb9db	adds font-awesome to pdf [fixes SCI-345]	2016-08-22 14:40:09 +02:00
zmagod	d38f29d207	set ajax loading of experiments images [fixes SCI-349]	2016-08-22 11:29:19 +02:00
Jure Grabnar	5bb99adb25	Add frontend logic for moving workflows from canvas	2016-08-19 17:11:17 +02:00
zmagod	cac5033eba	set ajax for workflow img	2016-08-19 15:36:12 +02:00
Jure Grabnar	80498260e5	Add backend for moving task from canvas	2016-08-19 13:53:43 +02:00
zmagod	6bb8d075e0	truncate asset name in task step and result [fixes SCI-294]	2016-08-18 09:22:12 +02:00
Zmago Devetak	4897e2da0c	Merge pull request #68 from ZmagoD/zd_SCI_330 ... Zd sci 330	2016-08-18 08:10:20 +02:00
Zmago Devetak	f2e08db106	Merge pull request #67 from ZmagoD/zd_SCI_337 ... Zd sci 337	2016-08-18 08:06:38 +02:00
Matej Zrimšek	27a9dac412	File permissions corrected, with some refactoring.	2016-08-17 18:23:24 +02:00
Matej Zrimšek	ccdccc5cf1	Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.	2016-08-17 18:11:13 +02:00
Matej Zrimšek	951cf67b3d	A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.	2016-08-17 18:08:21 +02:00
Matej Zrimšek	01aad1764c	Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring.	2016-08-17 17:54:45 +02:00
Matej Zrimšek	e2f94caa96	Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done.	2016-08-17 17:54:06 +02:00
Jure Grabnar	0cdea0b51a	Add modal for moving task on canvas	2016-08-17 15:46:30 +02:00
zmagod	9fd68c7bd5	fixes 'new experiment' button bug on smaller screens	2016-08-17 14:27:59 +02:00
zmagod	ca0ba1403d	set flask icon to experiment [fixes SCI-330]	2016-08-17 14:17:29 +02:00
zmagod	cc2ed32ccb	fixes canvas bug when no actions are available for the viewer	2016-08-17 13:29:22 +02:00
zmagod	8d69ca0b88	adds active class to experiment name in sidebar [fixes SCI-331]	2016-08-17 11:21:48 +02:00
Zmago Devetak	da735a51f4	Merge pull request #62 from ZmagoD/zd_SCI_318 ... Zd sci 318	2016-08-17 10:01:10 +02:00
zmagod	7abc8f3a90	Merge branch 'master' into experiment-level	2016-08-17 09:28:35 +02:00
Jure Grabnar	275106c27c	Add check for empty projects on move experiments	2016-08-16 10:20:36 +02:00
Jure Grabnar	e55c66b3d0	Add query for moveable projects	2016-08-16 08:47:04 +02:00
zmagod	852fe499fb	clean up linked protocol	2016-08-12 16:31:40 +02:00
Jure Grabnar	c387439fb2	Fix projects query for experiments ... Remove unneeded word in view	2016-08-12 11:36:52 +02:00
Jure Grabnar	d7341d0383	Set actions/routes/view for move experiment	2016-08-12 11:26:18 +02:00
Jure Grabnar	555ed05ae6	Refactor/DRY dropdown actions code for experiment	2016-08-12 10:18:35 +02:00
Jure Grabnar	9173c83502	Select current project in clone modal	2016-08-11 17:20:06 +02:00
Jure Grabnar	5c40d04eb2	Add missing clone modal	2016-08-11 16:59:56 +02:00
Jure Grabnar	6e8e9ecf21	Fix activities and the dreaded no project for modules error	2016-08-11 16:57:29 +02:00
Jure Grabnar	7f21ae138a	Set clone actions/routes/view ... DRY code for showing AJAX on project#show page	2016-08-11 09:46:15 +02:00
zmagod	c866e90b33	Merge branch 'zd_add_image_to_project_preview' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_add_image_to_project_preview	2016-08-10 11:33:37 +02:00
Jure Grabnar	7b0f323576	Add expiring URL to experiment img	2016-08-09 16:37:44 +02:00
zmagod	5f3a5cb845	fixed project overview	2016-08-09 14:26:08 +02:00
Jure Grabnar	9f7df0af76	Fix checkbox in experiment reports	2016-08-09 13:13:50 +02:00
Jure Grabnar	208e85e7e0	Remove archived experiments from reports	2016-08-09 11:17:25 +02:00
Jure Grabnar	1a7a7a1d1a	Add info to experiment archive cards ... Also add addtional check for due date on archive experiment	2016-08-09 11:04:46 +02:00
Jure Grabnar	a0fe31479f	Fix permissions for archived experiments	2016-08-09 10:00:44 +02:00
zmagod	1a56396eb5	add workflow image to project overview page [fixes SCI-41]	2016-08-08 16:02:17 +02:00
Jure Grabnar	5c858ee577	Add missing experiment archive page	2016-08-08 15:04:38 +02:00
Jure Grabnar	2bd74866e0	Fix my_modules archive page	2016-08-08 15:04:02 +02:00
Jure Grabnar	5a023483d7	Prepare views for experiment archive	2016-08-08 14:19:35 +02:00
Zmago Devetak	4bd489d29c	Merge pull request #46 from ZmagoD/zd_SCI_303 ... update sidebar v2 [fixes SCI-303]	2016-08-08 08:56:01 +02:00
jbargu	3f91e7a476	Merge pull request #47 from biosistemika/jg_explvl_reports ... Update reports with experiment level [Fixes SCI-35].	2016-08-08 08:51:23 +02:00
zmagod	04d171997e	Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41	2016-08-05 15:56:21 +02:00
zmagod	9c5c4f0a3a	Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44	2016-08-05 15:23:01 +02:00
Jure Grabnar	8b2b134614	Migrate old reports to new experiment level reports	2016-08-04 13:19:46 +02:00
zmagod	a4ec558596	start to implement project overview page	2016-08-04 12:57:33 +02:00
zmagod	45dac782ca	update sidebar [fixes SCI-303]	2016-08-03 16:09:45 +02:00
Jure Grabnar	9092dd6914	Replace all occurences of module_elements	2016-08-03 12:52:52 +02:00
Jure Grabnar	ff081cd844	Simplify project contents dialog	2016-08-03 12:52:51 +02:00
Jure Grabnar	dc82830a8f	Add checkbox behaviour to experiment contents	2016-08-03 12:52:51 +02:00
Jure Grabnar	3f33ebe59a	Fix wrong closure in experiment contents	2016-08-03 12:52:51 +02:00
Jure Grabnar	acc41dae40	Add experiment content report dialog ... Adding still has to be implemented	2016-08-03 12:52:51 +02:00
Jure Grabnar	41e8c54aa5	Rename _module_element_controls to element_controls	2016-08-03 12:52:06 +02:00
Jure Grabnar	d82ba163ed	Add experiment to report screen ... Only placeholder for now, JS still needs fixing.	2016-08-03 12:52:06 +02:00
Jure Grabnar	ac708e7497	Remove no module group from reports	2016-08-03 12:52:06 +02:00
Jure Grabnar	797685fbf0	Remove workflows from project content dialog (report)	2016-08-03 12:52:06 +02:00
Jure Grabnar	daca739262	Add new line to selector for readability	2016-08-03 12:52:06 +02:00
Jure Grabnar	598c5a63fd	Add experiment level to project report contents modal	2016-08-03 12:52:05 +02:00
zmagod	caa80642c0	[fixes SCI-304], [fixes SCI-37]	2016-08-03 09:34:10 +02:00
Mojca Lorber	ffa64445df	fixes issue SCI-223	2016-08-02 16:30:07 +02:00
Zmago Devetak	43230384b5	Merge pull request #40 from ZmagoD/zd_SCI_261 ... Fixed search query [fixes SCI-261]	2016-08-02 11:44:00 +02:00
zmagod	9581e2751f	fixes samples page for experiment level [fixes SCI-44]	2016-08-02 08:44:07 +02:00
zmagod	6e3ce92348	add checking for step content	2016-08-01 11:23:22 +02:00
Luka Murn	4d57479cf9	Remove comment ... Closes SCI-38.	2016-07-29 16:40:42 +02:00
zmagod	25b99b6570	fixed search [fixes SCI-261]	2016-07-29 16:32:54 +02:00
Luka Murn	8a2b54819a	More fixes on secondary navigation	2016-07-29 16:20:35 +02:00
Luka Murn	bed8687dbd	Remove some unused commented code	2016-07-29 16:08:30 +02:00
Luka Murn	b085aa1db3	Remove uneccesary project_activities HTML pages	2016-07-29 16:06:35 +02:00
Luka Murn	ed2226c14b	Refactor sidebar	2016-07-29 15:58:47 +02:00
Luka Murn	34af50a9d0	Fix breadcrumbs & sidebar so it works	2016-07-29 15:47:41 +02:00
Luka Murn	edafcaeed6	Move route module_archive_project -> module_archive_experiment ... Also add some new routes, move some templates.	2016-07-29 10:25:02 +02:00
Luka Murn	1ad265835b	Move route canvas_project -> canvas_experiment	2016-07-29 10:08:28 +02:00
Luka Murn	0c75423cc0	Add TODO to project overview page	2016-07-29 09:46:26 +02:00
Luka Murn	b64e200b91	Refactor canvas a lot. ... Also refactor localization files concerning canvas.	2016-07-28 16:41:10 +02:00
zmagod	e95f518964	refactor canvas_controller, experiments_controller	2016-07-28 16:01:53 +02:00
zmagod	352944fc33	added new/edit experiment modals	2016-07-28 14:44:44 +02:00
Luka Murn	1953e295b6	Hotfix for search results bug	2016-07-28 13:29:26 +02:00
zmagod	9d23cfd940	fixed experiment routes	2016-07-28 11:30:34 +02:00
zmagod	c11932b45b	fixed layout	2016-07-28 11:00:56 +02:00
zmagod	d16c0fe706	fixed edit canvas	2016-07-28 10:09:05 +02:00
zmagod	54c4051906	added canvas under experiments	2016-07-28 09:01:44 +02:00
zmagod	a17106b883	added experiments controller and fixed sidebar	2016-07-27 16:18:26 +02:00
Zmago Devetak	c869db2506	Merge pull request #35 from ZmagoD/zd_SCI_40 ... Edit canvas controller to work with experiments	2016-07-27 12:11:19 +02:00
zmagod	485d93f8b9	refactor canvas permissions	2016-07-27 11:35:07 +02:00
zmagod	5c7501a273	added experiments canvas labels in localization file and fixed canvas views	2016-07-26 14:21:59 +02:00
zmagod	0a84ecdfc1	edit canvas controller to work with experiment	2016-07-26 14:02:06 +02:00
Jure Grabnar	77ed1c5fd3	Change invalid references to project in search and shorten lines.	2016-07-26 12:59:37 +02:00
Jure Grabnar	80621c9b6b	Add experiment text to all searches related to experiment	2016-07-26 12:26:48 +02:00
Jure Grabnar	3be562bdf6	Add experiment to search results	2016-07-26 12:26:48 +02:00
Jure Grabnar	6d26203796	Add missing target var to result searches	2016-07-26 12:26:48 +02:00
Jure Grabnar	5283027da1	Add missing target var to searches.	2016-07-26 12:26:48 +02:00
Luka Murn	076b67620f	Migration GitLab -> GitHub	2016-07-21 13:11:15 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00