1937 commits

Author	SHA1	Message	Date
Alex Kriuchykhin	792e6f2eb9	Merge pull request #2263 from okriuchykhin/ok_SCI_4142 ... Implement SSO with Azure AD [SCI-4142]	2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin	1aa334fdaa	Merge branch 'develop' into release-1-17-8	2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin	ff4ef818fb	Implement SSO with Azure AD [SCI-4142]	2019-12-10 17:24:53 +01:00
aignatov-bio	5ba8e6507e	Merge branch 'release-1-17-8' into ai-sci-fix-comment-error	2019-12-10 10:36:30 +01:00
aignatov-bio	63edd3e877	Remove edit initialization from view mode	2019-12-06 13:26:47 +01:00
Oleksii Kriuchykhin	7a89cae56f	Fix TinyMCE images and avatars for export all [SCI-4107]	2019-12-05 13:27:17 +01:00
Oleksii Kriuchykhin	03667f619f	Merge branch 'release-1-17-7' into develop	2019-12-05 13:03:39 +01:00
aignatov-bio	010a44650c	Fix task activity page	2019-12-02 16:04:50 +01:00
Alex Kriuchykhin	fbf1a5b6e2	Merge pull request #2239 from okriuchykhin/ok_SCI_4098 ... Refactor Azure configuration and connected accounts [SCI-4098]	2019-11-29 11:30:33 +01:00
Oleksii Kriuchykhin	6c7f45fc20	Add simplified view for sign-in form [SCI-4098]	2019-11-28 17:00:43 +01:00
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
Miha Mencin	13191f1a72	Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user ... Sci 4058 disable inventory delition for normal user	2019-11-28 14:31:32 +01:00
Oleksii Kriuchykhin	f5abb7c767	Add connected accounts section to settings [SCI-4106]	2019-11-27 23:16:25 +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
Miha Mencin	a328c4ad56	fix CR comments	2019-11-25 17:40:29 +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	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	e99fe2dbda	Update css for global activties page	2019-11-25 11:09:37 +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	96523ae131	Update CSS for team preferences and enable autosave	2019-11-22 10:46:44 +01:00
aignatov-bio	c712e4e48c	Fix due date moda	2019-11-21 13:05:36 +01:00
aignatov-bio	f2ed3198d5	Add due date autosave field	2019-11-21 12:14:43 +01:00
Miha Mencin	04a6645cfc	Separate view/edit/modify permissions SCI-4058	2019-11-20 17:12:47 +01:00
aignatov-bio	56ae32323c	Add autosave for protocol keywords and user preferences	2019-11-20 14:57:53 +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
Anton Ignatov	b1c32d9a30	Improve dropdown and side panel	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
Anton Ignatov	7b855f54ac	Finish main part of selectors	2019-11-18 13:59:54 +01:00
Anton Ignatov	f832cfbbd4	Added tags	2019-11-18 13:59:54 +01:00
aignatov-bio	b1f9e7f1ca	Fix global activities jsonb field [SCI-3830] (#2030) ... * Fix global activities jsonb field * Fix tests	2019-11-18 13:59:54 +01:00
aignatov-bio	3eb6f5695b	Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004 ... Add auto-save feature to text fields [SCI-4004]	2019-11-18 09:11:10 +01:00
aignatov-bio	b9a34fa809	Fix placeholder for authors	2019-11-15 16:23:48 +01:00
aignatov-bio	19f5f9de67	Disable autocomplete for textarea field	2019-11-12 14:44:33 +01:00
aignatov-bio	a9690482d1	Add autosave feature to text fields	2019-11-12 11:26:18 +01:00
Mojca Lorber	16eddc0ad0	Save on click away, inline editing	2019-11-03 14:59:30 +01:00
Alex Kriuchykhin	ec66ab8654	Merge pull request #2190 from mlorb/ml-sci-4023 ... Small improvements in the avatar settings [SCI-4023]	2019-10-30 16:02:24 +01:00
Mojca Lorber	7b86a3932a	Additional avatar small fixes	2019-10-30 15:23:14 +01:00
aignatov-bio	717b70f75b	Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties ... Fix avatars in comments and activities [SCI-3995]	2019-10-29 14:11:39 +01:00
Mojca Lorber	a0873cb16d	Small improvements in the avatar settings	2019-10-29 13:21:22 +01:00
Alex Kriuchykhin	5524598d53	Merge pull request #2172 from biosistemika/release_1_17_3 ... Merge release 1.17.3 to master	2019-10-22 12:45:02 +02:00
aignatov-bio	9950a23188	Replace base64 avatars with url	2019-10-22 12:27:13 +02:00
Oleksii Kriuchykhin	53402c9ce1	Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]	2019-10-17 13:30:14 +02:00
aignatov-bio	54627faeb3	Fix tests	2019-10-11 11:46:51 +02:00
aignatov-bio	521a367960	Add predefined avatars	2019-10-11 11:46:51 +02:00
aignatov-bio	1f43f35073	First modal	2019-10-11 11:46:51 +02:00