1320 commits

Author	SHA1	Message	Date
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	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
zmagod	151dc79a81	adds hook for lock task action	2017-02-21 16:25:50 +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
Mojca Lorber	13d1cc5171	fix entering new smart anotations	2017-01-26 13:50:32 +01:00
zmagod	afd8328e9c	rename ortanizations -> teams	2017-01-25 14:22:06 +01:00
Oleksii Kriuchykhin	ddd8bcf7b0	Prevent double initialization of popup [SCI-855]	2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin	96a9857dec	Add handling of popups in the end of the table [SCI-855]	2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin	fb49ce8be2	Improved tooltip handling in samples datatable [SCI-855]	2017-01-25 13:47:01 +01:00
zmagod	8c035a1981	renames organization in assets	2017-01-25 12:12:27 +01:00
Oleksii Kriuchykhin	365eef506c	Fixes merge conflicts with smart-annotations branch	2017-01-24 15:20:50 +01:00
mlorb	02f314ce60	Merge pull request #443 from mlorb/ml_sci_919_v2 ... Remove table of content and customize link target [SCI-919]	2017-01-24 14:39:47 +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
Mojca Lorber	4dc7998fdd	Remove table of content and customize link target	2017-01-24 13:10:01 +01:00
mlorb	4253e3de2b	Merge pull request #439 from mlorb/ml_sci_919 ... Remove functionalities from rich text formatting [SCI-919]	2017-01-24 11:03:34 +01:00
Matej Zrimšek	b48e48e100	Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913]	2017-01-24 10:56:10 +01:00
Matej Zrimšek	2e041d9e81	Added smart annotations when adding new sample in samples table. [SCI-913]	2017-01-24 10:23:26 +01:00
Mojca Lorber	eb40513ada	remove functionalities from rich text formatting	2017-01-24 09:44:37 +01:00
Oleksii Kriuchykhin	401b37956b	Simplify protocol export start [SCI-742]	2017-01-23 17:43:48 +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
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
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
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
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
Oleksii Kriuchykhin	890c5e3c3d	Add “no results found” message in smart annotation [SCI-886]	2017-01-19 13:42:58 +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
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
Mojca Lorber	dde9854bf1	update protocol import/export and clone	2017-01-18 14:22:19 +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
Oleksii Kriuchykhin	12eb1df69f	Remove previous fix for popups [SCI-855]	2017-01-18 10:59:00 +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
Matej Zrimšek	d3c33c9dca	Refactored smart annotation JS. [SCI-884]	2017-01-17 10:05:41 +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
Matej Zrimšek	2877126dc6	Fixed selected search filter button style. [SCI-884]	2017-01-16 12:52:03 +01:00
mlorb	88cc87d168	Merge pull request #408 from mlorb/ml-sci-847-v2 ... Adjust columns width in samples table header after selecting sample group [SCI-847]	2017-01-16 10:52:00 +01:00
Mojca Lorber	9f1a49847e	fix table header again	2017-01-13 18:54:43 +01:00
Matej Zrimšek	15d7944302	Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889]	2017-01-13 18:51:05 +01:00
Mojca Lorber	5f7e0b2227	adjust columns width in samples table header after selecting sample group	2017-01-13 15:59:47 +01:00
Oleksii Kriuchykhin	a190ef36ff	Extend comment to make more clear [SCI-855]	2017-01-13 12:43:43 +01:00
zmagod	1b2fa78e42	adds user preview to user smart annotation [fixes SCI-832]	2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin	097209bd9d	Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]	2017-01-13 11:34:05 +01:00
zmagod	1840fdb7e5	cleanup js	2017-01-12 09:52:29 +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
okriuchykhin	8d4b2d7373	Merge pull request #399 from okriuchykhin/ok_SCI_811_v2 ... Fix changed sample type and sample group in sample edit [SCI-811]	2017-01-11 11:37:38 +01:00
mlorb	b898c792c4	Merge pull request #395 from mlorb/ml_sci_847 ... Adjust columns width in table header after selecting sample type/group [SCI-847]	2017-01-11 10:43: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
Oleksii Kriuchykhin	a3d9e25feb	Fix changed sample type and sample group in sample edit [SCI-811]	2017-01-10 16:51:51 +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	6efcf49927	working version of dropdown filter	2017-01-10 14:14:21 +01:00
zmagod	53d20df449	added xregexp	2017-01-10 14:14:21 +01:00
zmagod	94262b56ef	prepare data for atwho	2017-01-10 14:14:21 +01:00
Luka Murn	0cf5afa499	Merge pull request #376 from Ducz0r/lm-sci-813-fix ... Fix search on hidden columns in samples table [SCI-813]	2017-01-10 11:27:56 +01:00
Luka Murn	05be1e862f	Update filter after toggling visibility (if neccesary)	2017-01-10 11:26:12 +01:00
okriuchykhin	f8237e025a	Merge pull request #394 from okriuchykhin/ok_SCI_853 ... Fix non removable error messages in samples [SCI-853]	2017-01-10 11:00:01 +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
Mojca Lorber	a0a7f35d44	adjust columns width in table header after selecting sample type/group	2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin	773b00933a	Improve multiple messages handling in samples [SCI-853]	2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin	0fd7688427	Fix hiding of error messages in the samples datatable [SCI-853]	2017-01-09 13:34:23 +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	54ef2be94b	Merge pull request #383 from mz3944/mz-sci-845 ... Fixed samples table all rows un/checking. [SCI-845]	2017-01-09 11:58:44 +01:00
mlorb	006db01b11	Merge pull request #390 from mlorb/ml_sci_850 ... Fix samples info popup error [SCI-850]	2017-01-09 11:38:50 +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
Luka Murn	0ee5b98977	Refactor code a bit, add dismiss button to header	2017-01-07 09:59:52 +01:00
Matej Zrimšek	72df48500d	Fixed samples table all rows un/checking. [SCI-845]	2017-01-06 18:19:20 +01:00
Mojca Lorber	6f7c08fa63	fix samples info popup error	2017-01-06 17:31:17 +01:00
Oleksii Kriuchykhin	89710d8782	Enable image preview for newly uploaded images [SCI-694]	2017-01-06 16:41:24 +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
Luka Murn	7835753d3c	Add atwho-users URL to <body>	2017-01-06 12:48:37 +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
Luka Murn	b614ce714b	Restyle atwho dropdown	2017-01-05 14:06:48 +01:00
Luka Murn	a78bb79618	Temp commit	2017-01-05 12:07:17 +01:00
Luka Murn	eb64162633	Remove Gem dependency, add atwho as regular vendor/js	2017-01-05 12:06:59 +01:00
Luka Murn	09ef3b3ad5	Merge pull request #378 from Ducz0r/lm-sci-802-fix ... Add tooltips to samples column dropdown [SCI-802]	2017-01-04 11:30:04 +01:00
Luka Murn	2c5b27ce81	Change "Update" to "Save" ... Closes SCI-802.	2017-01-04 11:29:34 +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	23e60e0d01	Add Gems for smart annotations (atwho)	2017-01-04 10:51:55 +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	c476faca30	fix hound	2017-01-03 11:04:09 +01:00
Mojca Lorber	e555535dfb	add edit button to protocol preview modal	2017-01-03 10:04:14 +01:00
Oleksii Kriuchykhin	0d01a4b2bd	Remove unneeded function from utils.js [SCI-819]	2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin	4065be9e4e	Fix marking of selected option [SCI-819]	2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin	e22ff6f8bb	Fix an issue with sample editing and type/group dropdowns [SCI-819]	2016-12-30 15:50:43 +01:00
okriuchykhin	2474eac37d	Merge pull request #367 from okriuchykhin/ok_SCI_818 ... Fix sample info popup [SCI-818]	2016-12-30 15:43:28 +01:00
okriuchykhin	e826791429	Merge pull request #365 from okriuchykhin/ok_SCI_807 ... Fix buttons disappear when deleting columns in samples [SCI-807]	2016-12-30 15:43:13 +01:00
okriuchykhin	73478d7b5e	Merge pull request #372 from okriuchykhin/ok_SCI_816 ... Fix flash message display in samples table [SCI-816]	2016-12-30 15:30:14 +01:00
Oleksii Kriuchykhin	e156dbc987	Implement flash message hiding through module pattern [SCI-816]	2016-12-28 14:52:03 +01:00
Luka Murn	2304742d87	Add tooltips to samples column dropdown ... Closes SCI-802.	2016-12-27 08:45:23 +01:00
Luka Murn	b931b20f02	Fix 2 bugs with comments editing ... Closes SCI-820.	2016-12-23 20:41:23 +01:00
Luka Murn	fbc2be890c	Fix search on hidden columns in samples table ... Closes SCI-813.	2016-12-23 19:56:54 +01:00
Luka Murn	87d8fece46	Fix bug on edit/cancel sample group page ... Closes SCI-814.	2016-12-23 12:50:49 +01:00
mlorb	876ce37a96	Merge pull request #366 from mlorb/ml-sci-284 ... Samples - freeze header row and edit button... [SCI-284]	2016-12-23 12:29:41 +01:00
Mojca Lorber	40e3240a99	add content to preview modal	2016-12-22 11:43:11 +01:00
Luka Murn	5beaa26224	Update utils.js ... Closes SCI-811.	2016-12-22 10:03:00 +01:00
Oleksii Kriuchykhin	ee5e0ad455	Fix flash message display in samples table [SCI-816]	2016-12-21 17:26:33 +01:00
Luka Murn	af6bf2aee1	Fix jQuery selector, make it work for new samples	2016-12-21 16:23:09 +01:00
Luka Murn	e52277bdad	Fix sample types & groups when editing sample in samples table ... Closes SCI-811.	2016-12-21 13:15:55 +01:00
Oleksii Kriuchykhin	034976a709	Fix sample info popup [SCI-818]	2016-12-20 17:21:17 +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
Mojca Lorber	ba0214d1ff	staying on same page after saving a sample; fix button disappearance when adding new column	2016-12-20 15:19:31 +01:00
Mojca Lorber	165ec6144c	adjust columns width in table header when editing or adding new sample; and fix horizontal scrolling	2016-12-20 13:41:19 +01:00
Oleksii Kriuchykhin	42f71f4da8	Fix buttons disappear when deleting columns in samples datatable [SCI-807]	2016-12-20 09:49:21 +01:00
Oleksii Kriuchykhin	d2b76d8385	Improved image preview modal [SCI-694]	2016-12-19 17:36:18 +01:00
Mojca Lorber	d1e2354f4e	add scrolling functionality and remove bug with adding new column	2016-12-19 16:59:09 +01:00
zmagod	6f7f6a8b7f	removes dropdown sorting [fixes SCI-811]	2016-12-19 16:41:14 +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	0541253ffa	Added modal for images preview [SCI-694]	2016-12-16 15:53:16 +01:00
Zmago Devetak	90a115fff3	Merge pull request #342 from ZmagoD/zd_SCI_758 ... Generate png preview images for uploaded TIFF images	2016-12-16 15:39:07 +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
Zmago Devetak	c9d38a5454	Merge pull request #359 from ZmagoD/zd_SCI_804 ... disables sorting and columns dropdown when editing or adding new samp…	2016-12-16 12:56:11 +01:00
Zmago Devetak	601594fdb9	Merge pull request #355 from ZmagoD/zd_fix_mozilla_compatibility_issue ... fixes compatibility issue on mozilla firefox	2016-12-16 11:57:18 +01:00
Zmago Devetak	b35744d18e	Merge pull request #360 from ZmagoD/zd_update_gemfile ... updated gemfile	2016-12-16 11:53:05 +01:00
zmagod	897e34a23b	reinitialize highlight.js after ajax call	2016-12-16 11:44:42 +01:00
zmagod	b87246c8c2	cleanup spinner after edit step	2016-12-16 11:10:03 +01:00
Zmago Devetak	ad9b25ba44	Merge pull request #356 from ZmagoD/zd_SCI_803 ... fixes bug with long column names in edit mode [fixes SCI-803]	2016-12-16 11:02:42 +01:00
Zmago Devetak	3d500800cd	Merge pull request #358 from ZmagoD/zd_SCI_805_801 ... removes error message from new type/group form [fixes SCI-805]	2016-12-16 10:54:23 +01:00
zmagod	25671c744a	disables sorting and columns dropdown when editing or adding new sampe [fixes SCI-804]	2016-12-16 09:50:45 +01:00
zmagod	fffa0d91da	removes error message from new type/group form [fixes SCI-805]	2016-12-15 16:17:34 +01:00
zmagod	7c88f3e0aa	fixed empty name error	2016-12-15 15:50:07 +01:00
zmagod	6755ebcbf8	fixes bug with long column names in edit mode [fixes SCI-803]	2016-12-15 15:26:51 +01:00
Zmago Devetak	daee14bed5	Merge pull request #343 from ZmagoD/zd_SCI_780 ... fixed step description links [fixes SCI-780]	2016-12-15 13:12:25 +01:00
zmagod	dc6e9dcbd8	fixes compatibility issue on mozilla firefox	2016-12-15 11:57:17 +01:00
Mojca Lorber	69d164da68	add new column on first position	2016-12-15 11:20:40 +01:00
zmagod	9083f84396	Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_789	2016-12-15 11:03:19 +01:00
zmagod	3e31f114d4	app/assets/javascripts/samples/sample_datatable.js	2016-12-15 10:51:17 +01:00
zmagod	b164886270	fixed error mesage scroll	2016-12-15 10:44:23 +01:00
zmagod	b003d192c3	fixed edit mode	2016-12-15 09:54:38 +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	54fee339f8	cleanup unneeded code	2016-12-15 09:23:38 +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
zmagod	dfd472d37d	fixed column name after edit	2016-12-14 16:47:39 +01:00
zmagod	a9f8239516	fixed edit action	2016-12-14 16:37:44 +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	50c9dd3f59	fixed typo	2016-12-14 14:40:56 +01:00
okriuchykhin	2fd7536039	Merge pull request #352 from okriuchykhin/ok_SCI_793 ... Hide dropdown when user interacts with samples table [SCI-793]	2016-12-14 14:19:38 +01:00
okriuchykhin	6381166eb1	Merge pull request #346 from okriuchykhin/ok_SCI_788 ... Preserve scroll position in the samples columns dropdown when reordering [SCI-788]	2016-12-14 14:19:15 +01:00
Zmago Devetak	ef4ae1abcb	Merge pull request #348 from ZmagoD/zd_SCI_785 ... fixes samples table dropdown edit mode [fixes SCI-785]	2016-12-14 13:37:09 +01:00
zmagod	1ff98bb6df	adds tooltip to samples dropdown and column names	2016-12-14 13:36:10 +01:00
Oleksii Kriuchykhin	9f439cf183	Hide dropdown when user interacts with samples table [SCI-793]	2016-12-13 17:25:01 +01:00
zmagod	d9971b4502	adds error message in samples table dropdown [fixes SCI-789]	2016-12-13 17:08:19 +01:00
Oleksii Kriuchykhin	e414af2fc3	Fix columns ordering when deleting custom fields [SCI-783]	2016-12-13 16:21:17 +01:00
zmagod	fa19bf1de7	fixes samples table dropdown edit mode [fixes SCI-785]	2016-12-13 15:43:31 +01:00
zmagod	2426539715	fixes long names in columns dropdown [fixes SCI-784]	2016-12-13 14:54:37 +01:00
zmagod	c960230bf0	fixes dropdown height bug [fixes SCI-787]	2016-12-13 11:35:50 +01:00
Oleksii Kriuchykhin	de12fac767	Preserve scroll position in the samples coluns dropdown when reordering [SCI_788]	2016-12-13 11:25:35 +01:00
Mojca Lorber	2cfcba0ceb	add protocol preview modal	2016-12-13 10:39:18 +01:00
Zmago Devetak	d54007f69c	Merge pull request #337 from ZmagoD/zd_SCI_740 ... limits max size of all uploaded files at the one time	2016-12-13 09:04:14 +01:00
zmagod	b56913cc87	refactor	2016-12-12 16:21:38 +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
Luka Murn	d30a9780f4	Merge branch 'lm-sci-711-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-711-fix ... Conflicts: app/assets/javascripts/samples/sample_datatable.js	2016-12-12 09:57:37 +01:00
okriuchykhin	420daf3a6a	Merge pull request #344 from okriuchykhin/ok_SCI_779 ... Fix adding new samples columns [SCI-779]	2016-12-12 09:29:27 +01:00
Oleksii Kriuchykhin	435a8d20bb	Fix columns visability and reordering bug [SCI-779]	2016-12-09 17:37:22 +01:00
Matej Zrimšek	54de13de82	Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701]	2016-12-09 17:22:09 +01:00
Matej Zrimšek	0b12c87b09	Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701]	2016-12-09 16:44:50 +01:00
Oleksii Kriuchykhin	460ca067a2	Fix adding new samples columns [SCI-779]	2016-12-09 16:07:41 +01:00
zmagod	e23be6cc0e	fixed step description links [fixes SCI-780]	2016-12-09 15:26:41 +01:00
Oleksii Kriuchykhin	274fd63a41	Initial code commit [SCI-779]	2016-12-09 15:21:26 +01:00
zmagod	8b0dab624d	clear unneeded css, change processing image [fixes SCI-758]	2016-12-09 14:24:20 +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	8a55ef29e4	Remove unused code ... Closes SCI-711.	2016-12-09 13:49:19 +01:00
Luka Murn	1a8b141b95	Add delete custom field functionality	2016-12-09 13:49:19 +01:00
Luka Murn	7e32c13d27	Fix edit & delete functionality so it works with draggable	2016-12-09 13:18:59 +01:00
Luka Murn	754c90b612	Edit functionality now works	2016-12-09 13:18:59 +01:00
Luka Murn	54ebdbb06c	Update edit mode JS & CSS	2016-12-09 13:18:59 +01:00
Luka Murn	da630ac2cb	Make edit, delete buttons clickable & hide them if neccesary	2016-12-09 13:18:59 +01:00
Matej Zrimšek	aea679ec11	Added links for creating new sample type and group when creating new sample. [fixes SCI-701]	2016-12-09 11:39:12 +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
Mojca Lorber	1b2a438ed4	remove fixed columns	2016-12-08 15:24:54 +01:00
zmagod	40fdfef67f	setup delayed_paperclip gem	2016-12-08 15:24:14 +01:00
Mojca Lorber	7d88e247fc	refactoring	2016-12-08 14:41:35 +01:00
zmagod	ac52e643be	cleanup direct upload	2016-12-08 11:26:13 +01:00
Mojca Lorber	5b5342de6f	make first column fixed	2016-12-07 15:02:18 +01:00
zmagod	9f1e436623	limits max size of all uploaded files at the one time [fixes SCI-740]	2016-12-07 09:02:04 +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
Zmago Devetak	49f9e64171	Merge pull request #333 from ZmagoD/zd_SCI_700 ... Managing sample groups tab	2016-12-06 14:51:09 +01:00
zmagod	8ca7151df4	added constant to load_from_file_size_error local	2016-12-06 13:52:07 +01:00
Oleksii Kriuchykhin	e02d780e44	Added Enter key handling and fixed error reporting [SCI-712]	2016-12-06 13:22:26 +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
Mojca Lorber	1bc0ca9e75	fix bug with first time load	2016-12-06 13:14:29 +01:00
zmagod	787b8b1600	fixed new sample type/group form	2016-12-06 12:01:02 +01:00
Mojca Lorber	12088ebfd3	add visibility functionality after refresh	2016-12-06 09:40:28 +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
zmagod	ef2471d3f7	fixes inport eln error message and spinner [fixes SCI-752]	2016-12-05 10:44:58 +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
Zmago Devetak	33adb58950	Merge pull request #328 from ZmagoD/zd_SCI_699 ... Managing sample types tab	2016-11-30 16:14:13 +01:00
Oleksii Kriuchykhin	f51f33ec25	Added sorting functionality to samples colunmns dropdown [SCI-695]	2016-11-30 11:42:05 +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
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
zmagod	72d1dfb15e	cleanup sample_datatable.js	2016-11-28 16:28:22 +01:00
zmagod	9d91d2ce28	adds new samples columns dropdown [fixes SCI-698]	2016-11-25 17:29:30 +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
Matej Zrimšek	1db926101d	Minor refactoring.	2016-11-23 10:48:43 +01:00
Matej Zrimšek	6bc2603157	Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707]	2016-11-23 10:36:09 +01:00
Zmago Devetak	0f3db56a74	Merge pull request #311 from ZmagoD/zd_SCI_716 ... load comments after edit step [fixes SCI-716]	2016-11-23 09:14:57 +01:00
zmagod	8d7285ce7c	load comments after edit step [fixes SCI-716]	2016-11-22 14:39:08 +01:00
Oleksii Kriuchykhin	d7aa155860	Disable keyboard navigation in tutorial [SCI-703]	2016-11-22 14:14:42 +01:00
Oleksii Kriuchykhin	be59b85d3b	Added additional checks for tutorial steps [SCI-703]	2016-11-22 13:55:23 +01:00
Oleksii Kriuchykhin	cc86ff268f	Reload page after exit from tutorial [SCI-703]	2016-11-22 13:49:57 +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
Oleksii Kriuchykhin	d6f5f6b9bf	Changes default behaviour for absolute urls in Quill [SCI-684]	2016-11-21 14:18:08 +01:00
Luka Murn	f5795f5516	Remove unused assets & helpers	2016-11-18 11:30:03 +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	92d990a715	Code for tutorial function steps parameter reformatted. Deleted Git merging line.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	0e97bfc002	Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update.	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
Matej Zrimšek	47c1308ba6	Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	00ed91e856	Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	bfe7c19f93	Refactored and added back button for tutorial for steps 14-15.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	4ee7baabec	Enriched tutorial function description.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	33c96c9eee	Refactored and added back button for tutorial for steps 12-13.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	0687153eb8	Minor tutorial refactoring.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	f4206ea3d0	No warning popup is shown when running tutorial.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	3f8d3d5939	Refactored and added back button for tutorial for steps 6-11.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	74e58b044f	Tutorial refactored using one method, for steps 1-5.	2016-11-17 14:46:04 +01:00
Matej Zrimšek	0d133ff32e	Refactoring and added back buttons for tutorial steps 1-5.	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
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
Oleksii Kriuchykhin	d2e29935cf	Improved tutorial styling [SCI-685]	2016-11-16 15:44:06 +01:00
okriuchykhin	43b85ac5c2	Merge pull request #293 from okriuchykhin/ok_SCI_670 ... Fix project canvas interactivity in the tutorial [SCI-670]	2016-11-16 11:32:13 +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
Oleksii Kriuchykhin	410837e6cf	Fix project canvas interactivity in the tutorial [SCI-670]	2016-11-15 16:53:20 +01:00
Luka Murn	263244ad83	Reload whole page after user is invited from team invite users modal ... Closes SCI-664.	2016-11-15 16:21:32 +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
Mojca Lorber	4d681bb63c	change strip html function	2016-11-11 12:34:57 +01:00
zmagod	59f7bdb54e	hide flash after 5 sec [fixes SCI-660]	2016-11-11 12:30:48 +01:00
Mojca Lorber	3b7af3e66c	fix validation logic	2016-11-11 11:42:16 +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	55f9633d1d	Add jQuery.autosize plugin	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
Luka Murn	0e065026bd	Closes SCI-648	2016-11-10 16:18:17 +01:00
Mojca Lorber	ab0879e8d6	Integrate library with default settings	2016-11-09 13:09:53 +01:00
Luka Murn	b246853117	Code styling (use link_to, %w)	2016-11-08 16:43:25 +01:00
Luka Murn	55d8fea359	Make all comment edit fields textareas	2016-11-08 11:29:55 +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	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
Luka Murn	b4685b0a40	Remove console.log()	2016-10-25 18:13:29 +02:00
Luka Murn	cd360d7279	Fix the save report alert() bug ... Closes SCI-616	2016-10-25 18:12:29 +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
zmagod	49d3879642	fixes padding on mobile, added separator on team switch dropdown, focus search input	2016-10-21 11:46:59 +02:00
okriuchykhin	f876ade05e	Merge pull request #236 from okriuchykhin/ok_SCI_557 ... Fixes issue with new comments and date separator SCI-557	2016-10-21 10:29:46 +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
Oleksii Kriuchykhin	0c1ff06f21	Fixes issue with new comments and date separator SCI-557	2016-10-20 22:33:15 +02:00
mlorb	fa4f3fb0a0	Merge pull request #220 from mlorb/ml_sci_462 ... fix multiplication of edit comment fields [SCI-462]	2016-10-20 15:14:31 +02:00
Oleksii Kriuchykhin	347216183f	Fixes different color of buttons in notifications settings [SCI-590]	2016-10-20 14:17:07 +02:00
zmagod	f21c9e394f	adds new team button to team switch dropdown [fixes SCI-586]	2016-10-20 13:47:41 +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	557957c857	fixed issue with mozilla browsers	2016-10-17 15:21:19 +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
Mojca Lorber	177c4b5918	fix multiplication of edit comment fields	2016-10-17 12:59:51 +02:00
Matej Zrimšek	f2cd9890dd	Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.	2016-10-17 11:57:47 +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	05acf5a725	Replaced all Ruby constants instances in JS to be called from JS.	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
Oleksii Kriuchykhin	c6fb57318f	Added use of constants in JS [SCI-530]	2016-10-13 13:06:11 +02:00
Oleksii Kriuchykhin	37cff75013	Fixes issue with comments options menu [SCI-530]	2016-10-13 12:07:41 +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
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
Oleksii Kriuchykhin	5399033fce	Added user settings for email notifications [SCI-443]	2016-10-11 16:43:17 +02:00
zmagod	42a30576e3	removed introductory popup [fixes SCI-534]	2016-10-11 08:33:50 +02:00
Jure Grabnar	1f67aec258	Prevent destroying protocols when file is edited ... SCI-552 #close	2016-10-06 16:13:42 +02:00
Luka Murn	5c80c8a817	Add "no notifications" to dropdown & notifications index page	2016-10-05 16:58:21 +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	868ffd03d6	JS code improvement [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
Zmago Devetak	f3708bcac0	Merge pull request #191 from ZmagoD/zd_SCI_469_ver2 ... Comments date duplication	2016-10-05 15:47:42 +02:00
zmagod	b0f6b1f4d0	fixed comments action on project page	2016-10-05 15:39:54 +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
zmagod	bca3d19562	fixed comment options dropdown position	2016-10-05 15:26:11 +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
okriuchykhin	bfa7e57bd8	Merge pull request #168 from okriuchykhin/ok_SCI-463 ... Fixes issue with unexpected notification windows [fixes SCI-463]	2016-10-05 14:45:23 +02:00
zmagod	f9d956bbca	fix notifications number on [fixes SCI-531]	2016-10-05 11:50:57 +02:00
zmagod	d90f17d1eb	clean comments date duplication [fixes SCI-469]	2016-10-05 08:42:32 +02:00
zmagod	a68e7abc57	first run notification settings	2016-10-04 15:52:48 +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	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
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
Jure Grabnar	f727289935	Add lock check for editing result	2016-10-03 13:43:35 +02:00
zmagod	77df0bc82c	cleans more comment link	2016-10-03 12:34:16 +02:00
Mojca Lorber	093fbd6b8e	fixes hound again	2016-10-03 10:40:32 +02:00
Mojca Lorber	2041f2a09d	fixes hound	2016-10-03 10:15:46 +02:00
Mojca Lorber	053cd8ed84	removes handler	2016-10-03 10:12:13 +02:00
zmagod	b9bc2f17c8	fixing hound	2016-10-03 08:27:13 +02:00
zmagod	2ee02ec472	mark all seen notifications	2016-10-03 08:20:23 +02:00
Luka Murn	c83342d9f0	Merge pull request #173 from okriuchykhin/ok_SCI-484 ... Fix issue with duplicate error messages in experiments modal [SCI-484]	2016-09-30 08:24:51 +02:00
zmagod	e1a1b93d44	fixed migrations	2016-09-29 14:49:58 +02:00
Mojca Lorber	f4345f3aef	fixes hound	2016-09-28 16:09:39 +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
zmagod	dad0d3868b	fixing hound	2016-09-27 17:31:37 +02:00
zmagod	402a77526a	cleaned console.log	2016-09-27 16:22:09 +02:00
zmagod	2235778110	fixed project and task comments + fixed date issue	2016-09-27 16:19:31 +02:00
zmagod	0d322eba13	fixed hound	2016-09-27 11:03:10 +02:00
zmagod	4903cb970c	removed comments helper	2016-09-27 10:47:18 +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	1cdfde827f	fixes protocol and results comments	2016-09-27 09:26:25 +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
Oleksii Kriuchykhin	8a3a9451e9	Fix issue with duplicate error messages in experiments modal [SCI-484]	2016-09-26 12:58:22 +02:00
Oleksii Kriuchykhin	db1e24202a	Minor code cleanup [fixes SCI-463]	2016-09-26 09:08:38 +02:00
Mojca Lorber	c2b742374f	adding popup sample info	2016-09-23 17:45:02 +02:00
Oleksii Kriuchykhin	2c144aa2f3	Fix issue with unexpected notification windows appearing after report editor exit [fixes SCI-463]	2016-09-23 11:56:13 +02:00
Zmago Devetak	2b678998d3	Merge pull request #166 from ZmagoD/zd_SCI_471 ... fixes load comments [fixes SCI-471]	2016-09-23 09:17:27 +02:00
zmagod	4f2df691ba	add error validations	2016-09-23 08:34:39 +02:00
zmagod	6143b257d0	fixes edit modal [fixes SCI-467]	2016-09-23 08:32:46 +02:00
Matej Zrimšek	0317872bc0	Added check if no comments are present for file result, which caused JS error.	2016-09-22 18:12:35 +02:00
mz3944	cde7f3805f	Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2 ... Added missing validation for protocol description.	2016-09-22 17:36:18 +02:00
Matej Zrimšek	13e886f7a9	Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408]	2016-09-22 17:35:23 +02:00
okriuchykhin	087ee08976	Merge pull request #164 from okriuchykhin/ok_SCI-400 ... Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]	2016-09-22 17:01:58 +02:00
okriuchykhin	729cbef27b	Merge pull request #156 from okriuchykhin/ok_SCI-459 ... Fixes issue with too many " | " signs in error message [fixes SCI-459]	2016-09-22 16:12:17 +02:00
zmagod	303cb4308a	fixes load comments [fixes SCI-471]	2016-09-22 13:46:27 +02:00
Oleksii Kriuchykhin	b334b037f8	Fixes issue with old data in modal fields [fixes SCI-400]	2016-09-22 10:54:03 +02:00
Matej Zrimšek	c614843044	Minor refactoring with hound alert fixes.	2016-09-21 19:48:18 +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
Matej Zrimšek	c6a23aab98	Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408]	2016-09-21 19:37:36 +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	2bfe8f0636	fixing hound	2016-09-21 08:16:23 +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	0ca65aeca5	fixed step comment sorting	2016-09-20 13:31:50 +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	3f0a2c7dfc	Fixes issue with too many " | " signs in error message [fixes SCI-459]	2016-09-19 13:53:24 +02:00
Matej Zrimšek	c2f0106993	Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]	2016-09-16 15:56:44 +02:00
zmagod	938aa32190	js tweaks	2016-09-16 15:22:24 +02:00
zmagod	635f6b92d6	fixed comments display	2016-09-16 11:55:10 +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
Zmago Devetak	01656c1018	Merge pull request #153 from ZmagoD/zd_SCI_448 ... Wrong name of experiment and task - gets undefined as prefix	2016-09-15 15:00:34 +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
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	386cedda71	fixes hound again	2016-09-14 11:34:24 +02:00
Mojca Lorber	aba5305cd6	fixes hound	2016-09-14 11:24:19 +02:00
zmagod	c4fabdb67a	clean unneeded Observer configurations	2016-09-14 11:16:42 +02:00
zmagod	e1d871dcdb	clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448]	2016-09-14 11:11:35 +02:00
Mojca Lorber	a9029e0928	fixes responsiveness on mobile phone for sample view	2016-09-14 11:08:40 +02:00
zmagod	65383f1824	fixes sidebar expanded elements when adding new experiments [fixes SCI-342]	2016-09-13 13:09:57 +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	5c88bdeeae	Add formulas for readonly results tables	2016-09-13 09:44:17 +02:00
Jure Grabnar	e096f936f9	Add formulas to results	2016-09-13 09:44:17 +02:00
Matej Zrimšek	af8ab3e081	Fixed step's checklist items editing (items not multiplying and new item insertion always at bottom) [fixes SCI-427]. Improved step/result comment GUI [SCI-446].	2016-09-12 16:55:46 +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
Matej Zrimšek	6eca3661bf	Some JS error refactoring and accordingly updated error rendering when experiment description is too long.	2016-09-08 12:43:31 +02:00
Mojca Lorber	4c66ca6f80	fixes navbar size when resizing window	2016-09-08 09:17:58 +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	daa144ce7c	added missing bracket	2016-09-06 11:57:03 +02:00
zmagod	856d226946	fixed move experiment form error duplication	2016-09-06 11:48:56 +02:00
zmagod	a5a24c7610	clear unused variable	2016-09-06 11:46:28 +02:00
zmagod	b672d85405	fixed error message duplication	2016-09-06 11:46:28 +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
Zmago Devetak	1a19753df9	Merge pull request #128 from ZmagoD/zd_SCI_105 ... Trim long words in reports [fixes SCI-105]	2016-09-06 10:10:06 +02:00
zmagod	a7b6135b2f	cleared console.log	2016-09-06 10:08:32 +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
Luka Murn	1d8600b39f	Fix bug when inviting existing users onto teams ... Closes SCI-228	2016-09-05 14:52:56 +02:00
mz3944	50e0c26e89	Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399 ... Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]	2016-09-05 11:49:04 +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
zmagod	28fa00c30c	trim long words in reports [fixes SCI-105]	2016-09-01 15:45:39 +02:00
zmagod	ac7ac95da8	[fixes SCI-332]	2016-09-01 10:38:20 +02:00
Matej Zrimšek	4fdf478426	Minor refactoring.	2016-08-31 17:57:06 +02:00
Matej Zrimšek	828eebeb16	Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]	2016-08-31 17:21:17 +02:00
zmagod	55ba2de41f	fixes object duplication	2016-08-31 16:34:08 +02:00
zmagod	fabfa83171	introdutory popup cookie	2016-08-31 15:18:21 +02:00
zmagod	e8f971829a	added project to session storage	2016-08-31 15:13:17 +02:00
Luka Murn	5cb79f6282	Fix the default parameters in JS ... This was causing major issues in IE.	2016-08-31 14:04:45 +02:00
zmagod	b05c3df4d3	adds toggle id only to elements with modules	2016-08-31 10:25:40 +02:00
zmagod	21f84bacb6	set sidebar collapsed elements	2016-08-31 08:24:59 +02:00
jbargu	2cd5d85d68	Merge pull request #120 from jbargu/jg_SCI_328_move_experiment_reconnect ... When moving a task, it should connect the source and destination	2016-08-30 18:01:38 +02:00
mlorb	905acfd43d	Merge pull request #109 from mlorb/ml_sci_286 ... fixes notification when adding new sample [SCI-286]	2016-08-30 17:54:45 +02:00
Mojca Lorber	dd8e5d5e12	fixes hound	2016-08-30 17:12:26 +02:00
Mojca Lorber	1b1e6daa21	fixes notification disappearance and error notifications	2016-08-30 16:55:59 +02:00
Jure Grabnar	9a82e7d72b	Connect tasks on moving ... SCI-328 #close	2016-08-30 15:57:27 +02:00
mlorb	8fc29248b3	Merge pull request #119 from mlorb/ml_sci_396 ... fixes missing experiment name in side bar [SCI-396]	2016-08-30 15:05:04 +02:00
Zmago Devetak	11b314fa20	Merge pull request #107 from ZmagoD/zd_bug_fix ... fixes new task button after tutorial ends	2016-08-30 15:04:11 +02:00
Mojca Lorber	52f228725a	fixes hound	2016-08-30 14:04:47 +02:00
Mojca Lorber	aeda6f77d2	fixes missing experiment name in side bar	2016-08-30 13:51:16 +02:00
Luka Murn	c6e575bd2a	Merge pull request #115 from Ducz0r/lm-deleting-comments-fix ... Fix for deleting comments	2016-08-30 13:15:35 +02:00
Luka Murn	77ec5bcff9	Reposition comment dropdowns horizontally if needed ... Closes SCI-258	2016-08-30 11:39:50 +02:00
Luka Murn	4ee4c6caba	Remove JS validator from step comments	2016-08-30 11:06:30 +02:00
zmagod	4b6567e488	fixed workflowimg link	2016-08-30 11:03:33 +02:00
zmagod	6f1c4df942	fixed new task button in canvas	2016-08-30 10:48:28 +02:00
zmagod	57c1707e81	fixes secondary navigation [fixes SCI-338]	2016-08-30 09:53:56 +02:00
zmagod	d33bb50519	disabled secondary navigation in samples tutorial	2016-08-30 08:57:05 +02:00
zmagod	5518d1cd1e	fixed 16 step of tutorial	2016-08-30 08:52:44 +02:00
Mojca Lorber	53cdbc2638	fixes notification when adding new sample	2016-08-29 13:45:54 +02:00
zmagod	5af9d10c6a	fixes new task button after tutorial ends	2016-08-29 11:46:45 +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	b0bd92e3f4	fixed edit action	2016-08-26 09:17:55 +02:00
Matej Zrimšek	782d384e26	Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step).	2016-08-25 22:26:53 +02:00
Matej Zrimšek	04d9163ff6	Paperclip file spoofing corrected/modified.	2016-08-25 18:57:06 +02:00
zmagod	99976722a8	uncomment js file	2016-08-25 18:49:49 +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
mlorb	b1218cb3d6	Merge pull request #59 from biosistemika/ml_sci_244 ... fixes tutorial bug of inappropriate window [SCI-244]	2016-08-25 17:16:45 +02:00
Luka Murn	b533b0aca6	Fix another minor bug	2016-08-25 17:15:53 +02:00
Luka Murn	7cd94e8b0d	Fix a minor bug on canvas	2016-08-25 17:09:55 +02:00
Luka Murn	9cd99fc532	Display "no comments" if you delete the last comment	2016-08-25 17:01:30 +02:00
zmagod	7a47ff6bc5	fixed new task error	2016-08-25 15:30:32 +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	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
zmagod	f515366d91	fixes workflowing after updating description, fixes canvas bug	2016-08-25 09:11:42 +02:00
zmagod	92bb3dda99	hide last next button	2016-08-25 08:46:11 +02:00
zmagod	dbdbff12eb	add experiment level tutorial step [fixes SCI-338]	2016-08-24 19:03:58 +02:00
mlorb	2d90ad1a65	Merge pull request #88 from mlorb/ml_sci_362 ... fixes tile size in edit canvas [SCI-362]	2016-08-24 17:07:11 +02:00
Mojca Lorber	d04df349d5	fixes medium and small zoom	2016-08-24 14:18:12 +02:00
zmagod	9393a96302	adds edit workflow link if no workflow [fixes SCI-374]	2016-08-24 14:10:50 +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	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	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	65049692ea	Merge pull request #78 from ZmagoD/zd_SCI_349 ... updating thumbnail	2016-08-23 16:22:07 +02:00
Mojca Lorber	ac68db97b9	fixes tile size in edit canvas	2016-08-23 13:33:10 +02:00
Jure Grabnar	027193f937	Add links for moving module groups	2016-08-23 10:09:25 +02:00
Jure Grabnar	358f2b1c47	Add moving for newly created modules	2016-08-23 10:00:34 +02:00
zmagod	03a3759cf5	fixes project overview style and add no description link [fixes SCI-360]	2016-08-23 08:52:53 +02:00
Jure Grabnar	667b7671a6	Add connections for moved workflows	2016-08-22 17:26:21 +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	d38f29d207	set ajax loading of experiments images [fixes SCI-349]	2016-08-22 11:29:19 +02:00
mlorb	ed1cd193ac	Merge pull request #77 from mlorb/ml_sci_357 ... fixes warning messages when loading a new protocol that is linked with repository [SCI-357]	2016-08-22 08:56:36 +02:00
Jure Grabnar	5bb99adb25	Add frontend logic for moving workflows from canvas	2016-08-19 17:11:17 +02:00
zmagod	b86e67a0d6	refactor initProjectExperiment	2016-08-19 16:38:34 +02:00
Mojca Lorber	fb081be682	fixes warning messages when loading a new protocol that is linked with repository	2016-08-19 16:03:10 +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
Mojca Lorber	51e0d53b12	remove code duplication	2016-08-19 13:08:35 +02:00
Mojca Lorber	571f5b60f3	fixes notifications appearance and disappearance and content adjustment	2016-08-19 10:48:43 +02:00
Mojca Lorber	5c77167388	update buttons	2016-08-18 16:47:16 +02:00
Mojca Lorber	5695842fe3	fixes notifications when creating sample types and groups	2016-08-18 16:05:15 +02:00
zmagod	072f816286	refactor restore_after_tutorial function	2016-08-18 08:55:40 +02:00
zmagod	f2ee5d73a0	fixed project tutorial bug	2016-08-18 08:53:34 +02:00
mlorb	36d24523b4	Merge pull request #61 from biosistemika/ml_sci_291 ... fixes dissapearance of sample type/group when editing samlpe or adding new sample [SCI-291]	2016-08-18 08:25:31 +02:00
Matej Zrimšek	e4a6a3944e	Added deleting of files on S3 server when editing/removing a file. Some refactoring.	2016-08-17 18:13:35 +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	c87ba5b45c	Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.	2016-08-17 18:10:32 +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	b70f49f4e0	Some additional refinements.	2016-08-17 18:00:04 +02:00
Matej Zrimšek	86880f0299	Additional changes, refactoring and improvements.	2016-08-17 17:57:54 +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	77f75fdeb6	Delete module from canvas when moving	2016-08-17 15:46:30 +02:00
Jure Grabnar	0cdea0b51a	Add modal for moving task on canvas	2016-08-17 15:46:30 +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	4293f9c267	Merge branch 'zd_SCI_271' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_271	2016-08-17 09:58:29 +02:00
zmagod	7abc8f3a90	Merge branch 'master' into experiment-level	2016-08-17 09:28:35 +02:00
zmagod	76dd4bc90a	fixed protocol status bar [fixes SCI-318]	2016-08-16 10:47:23 +02:00
Mojca Lorber	7dc0c3672a	fixes dissapearance of sample type/group when adding/editing new sample	2016-08-16 10:17:29 +02:00
Jure Grabnar	c16eed5e63	Add missing dropdown_actions.js	2016-08-16 09:48:19 +02:00
zmagod	5e647f62d5	changed import label [fixes SCI-317]	2016-08-16 09:34:04 +02:00
zmagod	852fe499fb	clean up linked protocol	2016-08-12 16:31:40 +02:00
Mojca Lorber	e6f205368b	fixes tutorial bug of inappropriate window	2016-08-12 11:33:27 +02:00
Jure Grabnar	555ed05ae6	Refactor/DRY dropdown actions code for experiment	2016-08-12 10:18:35 +02:00
zmagod	701c26a2dd	fixed canvas edit and samples tutorial [fixes: SCI-271]	2016-08-11 16:21:55 +02:00
zmagod	a128815122	fixed tutorial tasks on canvas	2016-08-11 16:06:51 +02:00
zmagod	2e1d81a985	fixed project archive in tutorial	2016-08-11 12:40:16 +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
scibb	696075bf0f	smaller grid steps set. In addition enddpoint bug was fixed ... SCI 170, SCI 292'	2016-08-08 15:18:38 +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
Jure Grabnar	cafec6a1b4	Fix controls on experiment contents ... Also fix bug with adjencent elements not updating controls. Fixes SCI-35.	2016-08-04 16:05:03 +02:00
zmagod	a4ec558596	start to implement project overview page	2016-08-04 12:57:33 +02:00
Jure Grabnar	da2a06c999	Fix global sort to work with experiments	2016-08-03 14:59:53 +02:00
Jure Grabnar	acc41dae40	Add experiment content report dialog ... Adding still has to be implemented	2016-08-03 12:52:51 +02:00
zmagod	caa80642c0	[fixes SCI-304], [fixes SCI-37]	2016-08-03 09:34: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	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