44 commits

Author	SHA1	Message	Date
Mojca Lorber	089ec64398	fix experiment card look on Matejs request	2019-01-28 16:59:40 +01:00
mlorb	7fdef4d3ec	Change experiment cards look and feel	2019-01-18 15:57:44 +01:00
mz3944	4d460d14ea	Merge pull request #1378 from mz3944/mz-SCI-2861 ... All users in smart annotation have removed in brackets [SCI-2861]	2018-11-20 21:22:23 +01:00
Matej Zrimšek	c144d599fc	Fix user smart annotation showing as if the user is removed from team [SCI-2861]	2018-11-19 08:02:25 +01:00
Oleksii Kriuchykhin	3fd687161f	Remove unused variables from activities controller [SCI-2778]	2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin	537de596a7	Merge latest master [SCI-2778]	2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin	e89d60785f	Fix dates on activities and experiments [SCI-2778]	2018-11-12 10:26:48 +01:00
Zanz2	22a565a684	Made fixes according to review	2018-09-14 13:07:09 +02:00
Zanz2	2d1d4c78bc	Merge branch 'master' into zz_in_app_tooltips_help_sci2662	2018-08-21 11:27:01 +02:00
Zanz2	8c492e1491	started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute	2018-08-17 16:03:49 +02:00
Oleksii Kriuchykhin	6669beaf0e	Change icons throughout the rest of application [SCI-2445]	2018-07-27 15:27:08 +02:00
zmagod	43a60b632a	adds datahook to experiment card [fixes SCI-2373]	2018-06-06 17:28:04 +02:00
Matej Zrimšek	854333b0e6	Grouped permissions for experiment with canaid gem (WIP).	2018-02-14 14:19:00 +01:00
Oleksii Kriuchykhin	917c2cf28e	Fix experiment workflow image update indicator [SCI-1872]	2017-12-22 13:12:52 +01: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
Oleksii Kriuchykhin	310d8c1920	Refactor smart annotation/auto_link/simple_format rendering [SCI-940]	2017-01-25 17:18:19 +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	1b2fa78e42	adds user preview to user smart annotation [fixes SCI-832]	2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin	d05c16b0ba	Added auto_link wrapper with custom sanitization [SCI-102]	2017-01-11 17:02:17 +01:00
zmagod	89e8946a47	expand smart annotation	2017-01-10 14:14:21 +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
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
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
Oleksii Kriuchykhin	411ee4ee77	Fixes issue with unneeded sort icon [fixes SCI-430]	2016-09-20 11:30:11 +02:00
zmagod	eb39eedfdf	[fixes SCI-398] again	2016-08-31 08:46:51 +02:00
zmagod	d886d05ccb	Merge branch 'zd_SCI_338'	2016-08-26 16:32:49 +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
zmagod	dbdbff12eb	add experiment level tutorial step [fixes SCI-338]	2016-08-24 19:03:58 +02:00
zmagod	9393a96302	adds edit workflow link if no workflow [fixes SCI-374]	2016-08-24 14:10:50 +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
zmagod	27d77bc73f	added new permission for dropdown actions	2016-08-24 10:56:30 +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
zmagod	0429816154	deleted commented code	2016-08-23 16:21:11 +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	d38f29d207	set ajax loading of experiments images [fixes SCI-349]	2016-08-22 11:29:19 +02:00
zmagod	cac5033eba	set ajax for workflow img	2016-08-19 15:36:12 +02:00
Jure Grabnar	555ed05ae6	Refactor/DRY dropdown actions code for experiment	2016-08-12 10:18:35 +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
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
zmagod	1a56396eb5	add workflow image to project overview page [fixes SCI-41]	2016-08-08 16:02:17 +02:00
zmagod	a4ec558596	start to implement project overview page	2016-08-04 12:57:33 +02:00