6717 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
aignatov-bio	990d8e1c3a	Merge pull request #2218 from aignatov-bio/ai-sci-4088-remove-rte-from-team-description ... Replace RTE with simple textarea [SCI-4088]	2019-11-28 14:45:06 +01:00
aignatov-bio	3bd4700e67	Merge pull request #2234 from aignatov-bio/ai-sci-4110-check-permission-due-date ... Fix tag edit mode [SCI-4110]	2019-11-28 14:33:17 +01:00
aignatov-bio	06a11a4a49	Improve time zone and date format interaction at preference page	2019-11-27 15:14:40 +01:00
aignatov-bio	e161ebc056	Fix tests	2019-11-27 14:52:03 +01:00
aignatov-bio	68284c10da	Add task description and task protocol description activities	2019-11-27 14:37:53 +01:00
aignatov-bio	a87fc24251	UI activtiies fixes	2019-11-27 14:04:59 +01:00
aignatov-bio	3d9351c537	Update filter logic for activities	2019-11-27 13:13:19 +01:00
aignatov-bio	3322676373	Replace RTE with simple textarea	2019-11-27 12:37:33 +01:00
aignatov-bio	75f29d7b04	Fix tag edit mode	2019-11-27 12:34:54 +01:00
Alex Kriuchykhin	111056a032	Merge pull request #2224 from okriuchykhin/ok_SCI_4112 ... Fix adding experiment contents to report [SCI-4112]	2019-11-26 09:50:28 +01:00
aignatov-bio	8f2eaaacf9	Merge pull request #2229 from aignatov-bio/ai-sci-4111-fix-css-on-activity-page ... Update css for global activities page [SCI-4111]	2019-11-25 14:08:33 +01:00
aignatov-bio	ad137b47df	Merge pull request #2230 from aignatov-bio/ai-sci-4097-fix-dropdown-event-after-back-action ... Fix dropdown event after click browser back action [SCI-4097]	2019-11-25 13:58:04 +01:00
aignatov-bio	d732b2f1a6	Merge pull request #2228 from aignatov-bio/ai-sci-4090-fix-task-tags ... Add strict order to module tags in modal [SCI-4090]	2019-11-25 13:55:33 +01:00
aignatov-bio	4a641ac03a	Merge pull request #2227 from aignatov-bio/ai-sci-4110-update-due-date-autosave-for-tags ... Fix permission check and due date clear [SCI-4110]	2019-11-25 13:55:20 +01:00
aignatov-bio	993424d08e	Merge pull request #2226 from aignatov-bio/ai-sci-4086-fix-team-name-after-update ... Fix name update and path to team [SCI-4086]	2019-11-25 13:55:09 +01:00
aignatov-bio	30e78a0b3d	Merge pull request #2225 from aignatov-bio/ai-sci-4089-add-arrow-control-and-tag-select-on-enter ... Add arrows control for dropdown [SCI-4089]	2019-11-25 13:54:45 +01:00
aignatov-bio	179dea085f	Fix dropdown event after click browser back action	2019-11-25 11:28:11 +01:00
aignatov-bio	e99fe2dbda	Update css for global activties page	2019-11-25 11:09:37 +01:00
aignatov-bio	5100ab4d08	Add strict order to module tags in modal	2019-11-25 10:15:06 +01:00
aignatov-bio	fae8b252a6	Fix markup	2019-11-24 21:11:32 +01:00
aignatov-bio	e76b4ca26f	Fix permission check and due date clear	2019-11-24 21:06:34 +01:00
aignatov-bio	7fa753ca81	Fix name update and path to team	2019-11-23 23:20:38 +01:00
aignatov-bio	84a9d764e0	Add arrows controll for dropdown	2019-11-23 21:09:34 +01:00
Oleksii Kriuchykhin	8f94c85b7a	Fix adding experimaent contents to report [SCI-4112]	2019-11-22 14:57:59 +01:00
aignatov-bio	33a4cb93c7	Merge pull request #2222 from aignatov-bio/ai-sci-update-structure-to-team-settings ... Update CSS for team preferences and enable draft restore	2019-11-22 10:51:11 +01:00
aignatov-bio	96523ae131	Update CSS for team preferences and enable autosave	2019-11-22 10:46:44 +01:00
aignatov-bio	2e30f50ae8	Merge pull request #2221 from aignatov-bio/ai-sci-3976-add-autosave-other-fields ... Add autosave for protocol keywords, user preferences and due date [SCI-3976]	2019-11-21 13:13:10 +01:00
aignatov-bio	c712e4e48c	Fix due date moda	2019-11-21 13:05:36 +01:00
aignatov-bio	0b04ca4012	Fix markup	2019-11-21 12:19:47 +01:00
aignatov-bio	f2ed3198d5	Add due date autosave field	2019-11-21 12:14:43 +01:00
Alex Kriuchykhin	aaef56e82b	Merge pull request #2219 from okriuchykhin/ok_SCI_4071 ... Improve handling of file links for local storage [SCI-4071]	2019-11-20 15:08:21 +01:00
aignatov-bio	56ae32323c	Add autosave for protocol keywords and user preferences	2019-11-20 14:57:53 +01:00
Oleksii Kriuchykhin	46ee43ea8b	Improve handling of file links for local storage [SCI-4071]	2019-11-19 15:35:31 +01:00
Urban Rotnik	0dc1daa7c6	Add gem Down, File size validation before and during download	2019-11-18 14:28:19 +01:00
aignatov-bio	413100778f	Merge pull request #2215 from biosistemika/features/global-activities-v2 ... Features/global activities v2	2019-11-18 14:19:55 +01:00
aignatov-bio	0801df6f9c	Fix structure.sql	2019-11-18 13:59:55 +01:00
aignatov-bio	f428bc3921	Remove schema.rb	2019-11-18 13:59:55 +01:00
aignatov-bio	32d99f676c	Fix markup	2019-11-18 13:59:55 +01:00
aignatov-bio	264493a322	Finish removing Select2 library	2019-11-18 13:59:55 +01:00
aignatov-bio	e7ad7ae969	New tags drop down	2019-11-18 13:59:55 +01:00
aignatov-bio	8fd4b46416	Fix migration conflict	2019-11-18 13:59:55 +01:00
aignatov-bio	cb5baa3d13	Fix migration	2019-11-18 13:59:54 +01:00
aignatov-bio	5964a1b1f4	Fix shadows	2019-11-18 13:59:54 +01:00
Anton Ignatov	0ed3d84407	Fix styling	2019-11-18 13:59:54 +01:00
Anton Ignatov	b1c32d9a30	Improve dropdown and side panel	2019-11-18 13:59:54 +01:00
Anton Ignatov	163a17d6d9	Fix tablet view	2019-11-18 13:59:54 +01:00
Anton Ignatov	5b8e1fedf1	Fix markup	2019-11-18 13:59:54 +01:00
Anton Ignatov	7117b767f4	Fix commnets to PR	2019-11-18 13:59:54 +01:00
Anton Ignatov	17e457c686	Finished global activities refactoring	2019-11-18 13:59:54 +01:00
Anton Ignatov	fc70ce24f8	Refactor side filters for global activities	2019-11-18 13:59:54 +01:00