82 commits

Author	SHA1	Message	Date
aignatov-bio	2de2ead723	Refactor avatar image appearance across Scinote [SCI-3482] (#1787) ... * Refactor avatar appearance across Scinote	2019-05-21 15:19:44 +02:00
aignatov-bio	d959769b65	Fix experiment and step title (#1779)	2019-05-20 11:20:08 +02:00
Anton Ignatov	259b75a6ba	Merge branch 'master' into features/marvinjs-integration	2019-05-16 09:28:48 +02:00
aignatov-bio	24e30867da	Add smart annotation to comments [SCI-3458] (#1768) ... * Add smart annotation to comments	2019-05-15 14:59:15 +02:00
aignatov-bio	f970eea525	Some gui fixes (#1757)	2019-05-14 09:43:02 +02:00
Oleksii Kriuchykhin	4b1c4bd140	Fix handling of proccessing step attachments [SCI-3381]	2019-05-13 17:12:06 +02:00
aignatov-bio	2010b3ad8f	Fix step comments bugs (#1751)	2019-05-13 09:49:53 +02:00
Anton Ignatov	e5b4adcc25	Merge branch 'master-with-note-section' into features/marvinjs-integration	2019-05-11 20:51:01 +02:00
aignatov-bio	634b58bd6a	Various UX improvements for note section [SCI-3444] (#1742) ... * Various UX improvments for note section	2019-05-11 16:04:28 +02:00
Anton Ignatov	995408e7fc	Fix protocol update error, rollback bootstrap gems and fix step name	2019-05-08 17:18:19 +02:00
Anton Ignatov	dcf94e78e1	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-08 14:03:41 +02:00
Anton Ignatov	88e67a16c2	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
Mojca Lorber	7be151bd2d	Visual fixes for edit/add step on protocol	2019-04-30 14:57:50 +02:00
aignatov-bio	7d197a6f02	Remove gray step headers (#1713)	2019-04-29 14:06:55 +02:00
Anton Ignatov	f80d881847	Fix markup	2019-04-28 19:11:41 +02:00
Anton Ignatov	54731856f0	Finish step chemical attachments	2019-04-27 19:08:40 +02:00
Anton Ignatov	cf4ff41ec6	Add delete feature	2019-04-27 13:51:35 +02:00
Urban Rotnik	3b063348ce	Hide remove icon and show only on attachment hover	2019-04-26 15:51:35 +02:00
Urban Rotnik	88050b9b93	Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable ... Fix for inline editing on Firefox [SCI-3383]	2019-04-26 15:46:37 +02:00
aignatov-bio	57b80280dc	Update attachemnts css (#1700)	2019-04-26 15:20:39 +02:00
Urban Rotnik	8413ed5ab0	Fix for inline editing on Firefox	2019-04-26 14:22:18 +02:00
Anton Ignatov	0779ed598b	Reuse inline editing logic	2019-04-25 11:14:55 +02:00
Urban Rotnik	774521df7a	Changes to comments section in Task Steps	2019-04-23 15:02:58 +02:00
Urban Rotnik	7a2bfc12ce	Remove form_asset partial	2019-04-23 13:50:48 +02:00
Urban Rotnik	ea0368aa11	Attachments update for edit page	2019-04-23 13:50:47 +02:00
Urban Rotnik	ee3dc571e1	Update attachments view, add ordering on FE	2019-04-09 14:17:40 +02:00
Urban Rotnik	26cf8271a1	Change step header, remove vertical line	2019-04-05 10:57:38 +02:00
Miha Mencin	1b19e67c07	Revert "Step header changes, removed vertical line" ... This reverts commit b0f0ded87d.	2019-03-27 10:21:40 +01:00
Urban Rotnik	b0f0ded87d	Step header changes, removed vertical line ... SCI-3134	2019-03-25 17:25:13 +01:00
mlorb	858b95d851	fix align bullet with a file name	2018-05-30 13:58:16 +02:00
mlorb	c4ecfc4d38	Change icons throughout sciNote - navigation, project, task cards	2018-05-22 16:55:58 +02:00
Luka Murn	055298fee8	Initial commit.	2016-02-12 16:52:43 +01:00